Commitdf72e47

committed

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

1 parentd819876 commitdf72e47Copy full SHA for df72e47

File tree

-0

lines changed

-0

lines changed

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -269,6 +269,7 @@ impl DiagnosticDeriveVariantBuilder {`
`269`	`269`	`let field_binding =&binding_info.binding;`
`270`	`270`
`271`	`271`	`let inner_ty =FieldInnerTy::from_type(&field.ty);`
	`272`	`+letmut seen_label =false;`
`272`	`273`
`273`	`274`	`field`
`274`	`275`	`.attrs`
`@@ -280,6 +281,14 @@ impl DiagnosticDeriveVariantBuilder {`
`280`	`281`	`}`
`281`	`282`
`282`	`283`	`let name = attr.path().segments.last().unwrap().ident.to_string();`
	`284`	`+`
	`285`	`+if name =="primary_span" && seen_label{`
	`286`	+span_err(attr.span().unwrap(),format!("`#[primary_span]` must be placed before labels, since it overwrites the span of the diagnostic")).emit();
	`287`	`+}`
	`288`	`+if name =="label"{`
	`289`	`+ seen_label =true;`
	`290`	`+}`
	`291`	`+`
`283`	`292`	`let needs_clone =`
`284`	`293`	`name =="primary_span" &&matches!(inner_ty,FieldInnerTy::Vec(_));`
`285`	`294`	`let(binding, needs_destructure) =if needs_clone{`

Comments

(0)