nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-25 16:24:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups in SessionDiagnostic derive

Browse Source
This commit is contained in:
Xiretza 2022-09-10 14:27:42 +02:00
parent 8ab71ab59f
commit adcc55d622
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
compiler/rustc_macros/src/diagnostics/diagnostic_builder.rs
View File

@ -155,7 +155,7 @@ impl DiagnosticDeriveBuilder {
} else { } else {
Ident::new(name, attr.span()) Ident::new(name, attr.span())
}; };
return Ok(quote! { #diag.#fn_name(rustc_errors::fluent::_subdiag::#fn_name); }); return Ok(self.add_subdiagnostic(&fn_name, parse_quote! { _subdiag::#fn_name }));
} }
_ => throw_invalid_attr!(attr, &meta), _ => throw_invalid_attr!(attr, &meta),
}; };
@ -449,20 +449,18 @@ impl DiagnosticDeriveBuilder {
let (span_field, mut applicability) = self.span_and_applicability_of_ty(info)?; let (span_field, mut applicability) = self.span_and_applicability_of_ty(info)?;
let mut msg = None;
let mut code = None; let mut code = None;
let mut nested_iter = nested.into_iter().peekable(); let mut nested_iter = nested.into_iter().peekable();
if let Some(nested_attr) = nested_iter.peek() { let msg = if let Some(NestedMeta::Meta(Meta::Path(path))) = nested_iter.peek() {
if let NestedMeta::Meta(Meta::Path(path)) = nested_attr { let path = path.clone();
msg = Some(path.clone()); // Move the iterator forward if a path was found (don't otherwise so that
} // code/applicability can be found or an error emitted).
nested_iter.next();
Some(path)
} else {
None
}; };
// Move the iterator forward if a path was found (don't otherwise so that
// code/applicability can be found or an error emitted).
if msg.is_some() {
let _ = nested_iter.next();
}
for nested_attr in nested_iter { for nested_attr in nested_iter {
let meta = match nested_attr { let meta = match nested_attr {