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

fix and bless ui tests 1/2

Browse source
This commit is contained in:
Deadbeef 2023-04-03 14:36:50 +00:00
parent af74ef8993
commit fc01b4b63c
5 changed files with 289 additions and 272 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -214,10 +214,15 @@ impl<'a> DiagnosticDeriveVariantBuilder<'a> {
if path.is_ident("code") {
self.code.set_once((), path.span().unwrap());
let code = nested.parse::<TokenStream>()?;
let code = nested.parse::<syn::LitStr>()?;
tokens.extend(quote! {
#diag.code(rustc_errors::DiagnosticId::Error(#code.to_string()));
});
} else {
span_err(path.span().unwrap(), "unknown argument").note("only the `code` parameter is valid after the slug").emit();
// consume the buffer so we don't have syntax errors from syn
let _ = nested.parse::<TokenStream>();
}
Ok(())
})?;

13
compiler/rustc_macros/src/diagnostics/utils.rs
View file

@ -716,6 +716,9 @@ impl SubdiagnosticKind {
}
}
let mut has_errors = false;
let input = nested.input;
match (nested_name, &mut kind) {
("code", SubdiagnosticKind::Suggestion { code_field, .. }) => {
let code_init = build_suggestion_code(
@ -734,6 +737,7 @@ impl SubdiagnosticKind {
let value = get_string!();
let value = Applicability::from_str(&value.value()).unwrap_or_else(|()| {
span_err(value.span().unwrap(), "invalid applicability").emit();
has_errors = true;
Applicability::Unspecified
});
applicability.set_once(value, span);
@ -749,6 +753,7 @@ impl SubdiagnosticKind {
span_err(value.span().unwrap(), "invalid suggestion style")
.help("valid styles are `normal`, `short`, `hidden`, `verbose` and `tool-only`")
.emit();
has_errors = true;
SuggestionKind::Normal
});
@ -762,17 +767,25 @@ impl SubdiagnosticKind {
"only `style`, `code` and `applicability` are valid nested attributes",
)
.emit();
has_errors = true;
}
(_, SubdiagnosticKind::MultipartSuggestion { .. }) => {
span_err(path_span, "invalid nested attribute")
.help("only `style` and `applicability` are valid nested attributes")
.emit();
has_errors = true;
}
_ => {
span_err(path_span, "invalid nested attribute").emit();
has_errors = true;
}
}
if has_errors {
// Consume the rest of the input to avoid spamming errors
let _ = input.parse::<TokenStream>();
}
Ok(())
})?;