bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Support eager subdiagnostics again

Browse source
This commit is contained in:
mejrs 2023-01-09 00:00:41 +01:00 • committed by David Tolnay
parent ef4046e4f3
commit 7aff210ead
No known key found for this signature in database
GPG key ID: F9BA143B95FF6D82
4 changed files with 29 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

24
compiler/rustc_macros/src/diagnostics/diagnostic_builder.rs
View file

@ -382,10 +382,26 @@ impl<'a> DiagnosticDeriveVariantBuilder<'a> {
return Ok(quote! { #diag.subdiagnostic(#binding); });
}
}
(Meta::List(_), "subdiagnostic") => {
throw_invalid_attr!(attr, &meta, |diag| {
diag.help("`subdiagnostic` does not support nested attributes")
})
(Meta::List(MetaList { ref nested, .. }), "subdiagnostic") => {
if nested.len() == 1
&& let Some(NestedMeta::Meta(Meta::Path(path))) = nested.first()
&& path.is_ident("eager") {
let handler = match &self.parent.kind {
DiagnosticDeriveKind::Diagnostic { handler } => handler,
DiagnosticDeriveKind::LintDiagnostic => {
throw_invalid_attr!(attr, &meta, |diag| {
diag.help("eager subdiagnostics are not supported on lints")
})
}
};
return Ok(quote! { #diag.eager_subdiagnostic(#handler, #binding); });
} else {
throw_invalid_attr!(attr, &meta, |diag| {
diag.help(
"`eager` is the only supported nested attribute for `subdiagnostic`",
)
})
}
}
_ => (),
}

1
compiler/rustc_macros/src/lib.rs
View file

@ -1,5 +1,6 @@
#![feature(allow_internal_unstable)]
#![feature(if_let_guard)]
#![feature(let_chains)]
#![feature(never_type)]
#![feature(proc_macro_diagnostic)]
#![feature(proc_macro_span)]