diff options
| author | bors <bors@rust-lang.org> | 2023-12-16 05:35:12 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-12-16 05:35:12 +0000 |
| commit | 1c6a06183a1452c2772db370b572e38bac9c5d86 (patch) | |
| tree | a01f49fd3923307062aa105cc5b563f99f443fb5 /compiler/rustc_errors/src | |
| parent | 5c927ab99946c312eed65f28aea15d2a035441f0 (diff) | |
| parent | c5a3d98cc6fe818148506d3e7aaabd512f8969ef (diff) | |
| download | rust-1c6a06183a1452c2772db370b572e38bac9c5d86.tar.gz rust-1c6a06183a1452c2772db370b572e38bac9c5d86.zip | |
Auto merge of #119009 - workingjubilee:rollup-ytexy6j, r=workingjubilee
Rollup of 6 pull requests Successful merges: - #118523 (Add ASCII whitespace trimming functions to `&str`) - #118851 ([std] Add xcoff in object's feature list) - #118989 (Simplify lint decorator derive too) - #118993 (use `if cfg!` instead of `#[cfg]`) - #119003 (NFC: do not clone types that are copy) - #119004 (NFC don't convert types to identical types) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_errors/src')
| -rw-r--r-- | compiler/rustc_errors/src/diagnostic.rs | 5 | ||||
| -rw-r--r-- | compiler/rustc_errors/src/emitter.rs | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/compiler/rustc_errors/src/diagnostic.rs b/compiler/rustc_errors/src/diagnostic.rs index 4fb63d67e78..403e0ec7950 100644 --- a/compiler/rustc_errors/src/diagnostic.rs +++ b/compiler/rustc_errors/src/diagnostic.rs @@ -91,10 +91,7 @@ where #[rustc_diagnostic_item = "DecorateLint"] pub trait DecorateLint<'a, G: EmissionGuarantee> { /// Decorate and emit a lint. - fn decorate_lint<'b>( - self, - diag: &'b mut DiagnosticBuilder<'a, G>, - ) -> &'b mut DiagnosticBuilder<'a, G>; + fn decorate_lint<'b>(self, diag: &'b mut DiagnosticBuilder<'a, G>); fn msg(&self) -> DiagnosticMessage; } diff --git a/compiler/rustc_errors/src/emitter.rs b/compiler/rustc_errors/src/emitter.rs index 379883a0c18..ec37240e394 100644 --- a/compiler/rustc_errors/src/emitter.rs +++ b/compiler/rustc_errors/src/emitter.rs @@ -2677,10 +2677,7 @@ fn from_stderr(color: ColorConfig) -> Destination { /// On Windows, BRIGHT_BLUE is hard to read on black. Use cyan instead. /// /// See #36178. -#[cfg(windows)] -const BRIGHT_BLUE: Color = Color::Cyan; -#[cfg(not(windows))] -const BRIGHT_BLUE: Color = Color::Blue; +const BRIGHT_BLUE: Color = if cfg!(windows) { Color::Cyan } else { Color::Blue }; impl Style { fn color_spec(&self, lvl: Level) -> ColorSpec { |