dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make sure that labels are defined after the primary span in diagnostics

This commit is contained in:
Michael Goulet 2024-07-10 18:55:45 -04:00
parent d81987661a
commit df72e478b0
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -269,6 +269,7 @@ impl DiagnosticDeriveVariantBuilder {
let field_binding = &binding_info.binding;
let inner_ty = FieldInnerTy::from_type(&field.ty);
let mut seen_label = false;
field
.attrs
@ -280,6 +281,14 @@ impl DiagnosticDeriveVariantBuilder {
}
let name = attr.path().segments.last().unwrap().ident.to_string();
if name == "primary_span" && seen_label {
span_err(attr.span().unwrap(), format!("`#[primary_span]` must be placed before labels, since it overwrites the span of the diagnostic")).emit();
}
if name == "label" {
seen_label = true;
}
let needs_clone =
name == "primary_span" && matches!(inner_ty, FieldInnerTy::Vec(_));
let (binding, needs_destructure) = if needs_clone {