bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Rename DiagnosticDeriveKind::Diagnostic::handler as DiagnosticDeriveKind::Diagnostic::dcx.

Browse source
This commit is contained in:
Nicholas Nethercote 2023-12-18 10:35:29 +11:00
parent f7125f1f66
commit 7b8644e5cf
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
compiler/rustc_macros/src/diagnostics/diagnostic.rs
View file

@ -17,11 +17,11 @@ pub(crate) struct DiagnosticDerive<'a> {
}
impl<'a> DiagnosticDerive<'a> {
pub(crate) fn new(diag: syn::Ident, handler: syn::Ident, structure: Structure<'a>) -> Self {
pub(crate) fn new(diag: syn::Ident, dcx: syn::Ident, structure: Structure<'a>) -> Self {
Self {
builder: DiagnosticDeriveBuilder {
diag,
kind: DiagnosticDeriveKind::Diagnostic { handler },
kind: DiagnosticDeriveKind::Diagnostic { dcx },
},
structure,
}
@ -36,7 +36,7 @@ impl<'a> DiagnosticDerive<'a> {
let body = builder.body(variant);
let diag = &builder.parent.diag;
let DiagnosticDeriveKind::Diagnostic { handler } = &builder.parent.kind else {
let DiagnosticDeriveKind::Diagnostic { dcx } = &builder.parent.kind else {
unreachable!()
};
let init = match builder.slug.value_ref() {
@ -62,7 +62,7 @@ impl<'a> DiagnosticDerive<'a> {
Some(slug) => {
slugs.borrow_mut().push(slug.clone());
quote! {
let mut #diag = #handler.struct_diagnostic(crate::fluent_generated::#slug);
let mut #diag = #dcx.struct_diagnostic(crate::fluent_generated::#slug);
}
}
};
@ -77,7 +77,7 @@ impl<'a> DiagnosticDerive<'a> {
}
});
let DiagnosticDeriveKind::Diagnostic { handler } = &builder.kind else { unreachable!() };
let DiagnosticDeriveKind::Diagnostic { dcx } = &builder.kind else { unreachable!() };
let mut imp = structure.gen_impl(quote! {
gen impl<'__diagnostic_handler_sess, G>
@ -89,7 +89,7 @@ impl<'a> DiagnosticDerive<'a> {
#[track_caller]
fn into_diagnostic(
self,
#handler: &'__diagnostic_handler_sess rustc_errors::DiagCtxt
#dcx: &'__diagnostic_handler_sess rustc_errors::DiagCtxt
) -> rustc_errors::DiagnosticBuilder<'__diagnostic_handler_sess, G> {
use rustc_errors::IntoDiagnosticArg;
#implementation