diff options
| author | Mark Rousskov <mark.simulacrum@gmail.com> | 2022-11-01 08:45:58 -0400 |
|---|---|---|
| committer | Mark Rousskov <mark.simulacrum@gmail.com> | 2022-11-06 17:21:21 -0500 |
| commit | 40290505fb0aab2ad673a0caa840fc87a1790338 (patch) | |
| tree | 86d0e81ecf64c3888d952911535de8f05e324b16 /compiler/rustc_errors/src | |
| parent | 137d5913ec0ce17e0f48ea53182e9e9c9d2c837d (diff) | |
| download | rust-40290505fb0aab2ad673a0caa840fc87a1790338.tar.gz rust-40290505fb0aab2ad673a0caa840fc87a1790338.zip | |
cfg-step code
Diffstat (limited to 'compiler/rustc_errors/src')
| -rw-r--r-- | compiler/rustc_errors/src/diagnostic.rs | 3 | ||||
| -rw-r--r-- | compiler/rustc_errors/src/diagnostic_builder.rs | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/compiler/rustc_errors/src/diagnostic.rs b/compiler/rustc_errors/src/diagnostic.rs index 45c017df918..073ccfe061d 100644 --- a/compiler/rustc_errors/src/diagnostic.rs +++ b/compiler/rustc_errors/src/diagnostic.rs @@ -55,8 +55,7 @@ impl<'source> Into<FluentValue<'source>> for DiagnosticArgValue<'source> { /// Trait implemented by error types. This should not be implemented manually. Instead, use /// `#[derive(Subdiagnostic)]` -- see [rustc_macros::Subdiagnostic]. -#[cfg_attr(bootstrap, rustc_diagnostic_item = "AddSubdiagnostic")] -#[cfg_attr(not(bootstrap), rustc_diagnostic_item = "AddToDiagnostic")] +#[rustc_diagnostic_item = "AddToDiagnostic"] pub trait AddToDiagnostic where Self: Sized, diff --git a/compiler/rustc_errors/src/diagnostic_builder.rs b/compiler/rustc_errors/src/diagnostic_builder.rs index ecf8570e81f..1e1dcb04d70 100644 --- a/compiler/rustc_errors/src/diagnostic_builder.rs +++ b/compiler/rustc_errors/src/diagnostic_builder.rs @@ -16,8 +16,7 @@ use std::thread::panicking; /// Trait implemented by error types. This should not be implemented manually. Instead, use /// `#[derive(Diagnostic)]` -- see [rustc_macros::Diagnostic]. -#[cfg_attr(bootstrap, rustc_diagnostic_item = "SessionDiagnostic")] -#[cfg_attr(not(bootstrap), rustc_diagnostic_item = "IntoDiagnostic")] +#[rustc_diagnostic_item = "IntoDiagnostic"] pub trait IntoDiagnostic<'a, T: EmissionGuarantee = ErrorGuaranteed> { /// Write out as a diagnostic out of `Handler`. #[must_use] |