From 01dbfb3eb264135c432cef223848416f90dac290 Mon Sep 17 00:00:00 2001 From: codehorseman Date: Wed, 16 Mar 2022 20:12:30 +0800 Subject: resolve the conflict in compiler/rustc_session/src/parse.rs Signed-off-by: codehorseman --- compiler/rustc_session/src/options.rs | 2 +- compiler/rustc_session/src/parse.rs | 2 +- compiler/rustc_session/src/utils.rs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'compiler/rustc_session/src') diff --git a/compiler/rustc_session/src/options.rs b/compiler/rustc_session/src/options.rs index a6506dbad16..14420909f50 100644 --- a/compiler/rustc_session/src/options.rs +++ b/compiler/rustc_session/src/options.rs @@ -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 [UNTRACKED], diff --git a/compiler/rustc_session/src/parse.rs b/compiler/rustc_session/src/parse.rs index 707c609d8bf..36bbccf1b90 100644 --- a/compiler/rustc_session/src/parse.rs +++ b/compiler/rustc_session/src/parse.rs @@ -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); } diff --git a/compiler/rustc_session/src/utils.rs b/compiler/rustc_session/src/utils.rs index 1a044e677a0..a33f94013d2 100644 --- a/compiler/rustc_session/src/utils.rs +++ b/compiler/rustc_session/src/utils.rs @@ -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, }, /// 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, }, /// The library kind wasn't specified, `Dylib` is currently used as a default. -- cgit 1.4.1-3-g733a5