diff options
| author | Nicholas Nethercote <n.nethercote@gmail.com> | 2023-12-18 10:35:29 +1100 |
|---|---|---|
| committer | Nicholas Nethercote <n.nethercote@gmail.com> | 2023-12-18 16:06:22 +1100 |
| commit | 7b8644e5cf7e43796b7dec7832b5c97df9e5cb15 (patch) | |
| tree | 48b5f2deb8f28108bcfc1f0da872e8eb2ab31fd5 /compiler/rustc_macros/src/diagnostics/diagnostic_builder.rs | |
| parent | f7125f1f66c70b1eb9f0b6ecd2021f32bedcdb62 (diff) | |
| download | rust-7b8644e5cf7e43796b7dec7832b5c97df9e5cb15.tar.gz rust-7b8644e5cf7e43796b7dec7832b5c97df9e5cb15.zip | |
Rename `DiagnosticDeriveKind::Diagnostic::handler` as `DiagnosticDeriveKind::Diagnostic::dcx`.
Diffstat (limited to 'compiler/rustc_macros/src/diagnostics/diagnostic_builder.rs')
| -rw-r--r-- | compiler/rustc_macros/src/diagnostics/diagnostic_builder.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/rustc_macros/src/diagnostics/diagnostic_builder.rs b/compiler/rustc_macros/src/diagnostics/diagnostic_builder.rs index 2755a161d91..9676e04fb75 100644 --- a/compiler/rustc_macros/src/diagnostics/diagnostic_builder.rs +++ b/compiler/rustc_macros/src/diagnostics/diagnostic_builder.rs @@ -19,7 +19,7 @@ use super::utils::SubdiagnosticVariant; /// What kind of diagnostic is being derived - a fatal/error/warning or a lint? #[derive(Clone, PartialEq, Eq)] pub(crate) enum DiagnosticDeriveKind { - Diagnostic { handler: syn::Ident }, + Diagnostic { dcx: syn::Ident }, LintDiagnostic, } @@ -348,11 +348,11 @@ impl<'a> DiagnosticDeriveVariantBuilder<'a> { } (Meta::Path(_), "subdiagnostic") => { if FieldInnerTy::from_type(&info.binding.ast().ty).will_iterate() { - let DiagnosticDeriveKind::Diagnostic { handler } = &self.parent.kind else { + let DiagnosticDeriveKind::Diagnostic { dcx } = &self.parent.kind else { // No eager translation for lints. return Ok(quote! { #diag.subdiagnostic(#binding); }); }; - return Ok(quote! { #diag.eager_subdiagnostic(#handler, #binding); }); + return Ok(quote! { #diag.eager_subdiagnostic(#dcx, #binding); }); } else { return Ok(quote! { #diag.subdiagnostic(#binding); }); } @@ -377,7 +377,7 @@ impl<'a> DiagnosticDeriveVariantBuilder<'a> { } let handler = match &self.parent.kind { - DiagnosticDeriveKind::Diagnostic { handler } => handler, + DiagnosticDeriveKind::Diagnostic { dcx } => dcx, DiagnosticDeriveKind::LintDiagnostic => { throw_invalid_attr!(attr, |diag| { diag.help("eager subdiagnostics are not supported on lints") |
