bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

resolve the conflict in compiler/rustc_session/src/parse.rs

Browse source 
Signed-off-by: codehorseman <cricis@yeah.net>
This commit is contained in:
codehorseman 2022-03-16 20:12:30 +08:00
parent d8e564715e
commit 01dbfb3eb2
59 changed files with 86 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_session/src/options.rs
View file

@ -223,7 +223,7 @@ top_level_options!(
/// `true` if we're emitting a JSON blob containing the unused externs
json_unused_externs: bool [UNTRACKED],
/// `true` if we're emitting a JSON job containg a future-incompat report for lints
/// `true` if we're emitting a JSON job containing a future-incompat report for lints
json_future_incompat: bool [TRACKED],
pretty: Option<PpMode> [UNTRACKED],

2
compiler/rustc_session/src/parse.rs
View file

@ -69,7 +69,7 @@ pub struct SymbolGallery {
impl SymbolGallery {
/// Insert a symbol and its span into symbol gallery.
/// If the symbol has occurred before, ignore the new occurrance.
/// If the symbol has occurred before, ignore the new occurrence.
pub fn insert(&self, symbol: Symbol, span: Span) {
self.symbols.lock().entry(symbol).or_insert(span);
}

4
compiler/rustc_session/src/utils.rs
View file

@ -29,14 +29,14 @@ pub enum NativeLibKind {
/// Dynamic library (e.g. `libfoo.so` on Linux)
/// or an import library corresponding to a dynamic library (e.g. `foo.lib` on Windows/MSVC).
Dylib {
/// Whether the dynamic library will be linked only if it satifies some undefined symbols
/// Whether the dynamic library will be linked only if it satisfies some undefined symbols
as_needed: Option<bool>,
},
/// Dynamic library (e.g. `foo.dll` on Windows) without a corresponding import library.
RawDylib,
/// A macOS-specific kind of dynamic libraries.
Framework {
/// Whether the framework will be linked only if it satifies some undefined symbols
/// Whether the framework will be linked only if it satisfies some undefined symbols
as_needed: Option<bool>,
},
/// The library kind wasn't specified, `Dylib` is currently used as a default.