bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Ensure code= in #[suggestion(...)] is only set once

Browse source
This commit is contained in:
Xiretza 2022-09-10 14:28:12 +02:00
parent adcc55d622
commit 2e72387fd0
3 changed files with 23 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -476,7 +476,7 @@ impl DiagnosticDeriveBuilder {
match nested_name {
"code" => {
let formatted_str = self.build_format(&s.value(), s.span());
code = Some(formatted_str);
code.set_once((formatted_str, span));
}
"applicability" => {
applicability = match applicability {
@ -524,7 +524,7 @@ impl DiagnosticDeriveBuilder {
let msg = msg.unwrap_or_else(|| parse_quote! { _subdiag::suggestion });
let msg = quote! { rustc_errors::fluent::#msg };
let code = code.unwrap_or_else(|| quote! { String::new() });
let code = code.value().unwrap_or_else(|| quote! { String::new() });
Ok(quote! { #diag.#method(#span_field, #msg, #code, #applicability); })
}