From b49f6472995af55a0017ca9d07769ab81da53231 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Tue, 5 Nov 2024 00:13:52 -0500 Subject: [PATCH] Try joining a span for #[source] and #[from] --- impl/src/attr.rs | 10 ++++++++-- tests/ui/source-enum-unnamed-field-not-error.stderr | 4 ++-- tests/ui/source-struct-unnamed-field-not-error.stderr | 4 ++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/impl/src/attr.rs b/impl/src/attr.rs index db618b4..2fc04af 100644 --- a/impl/src/attr.rs +++ b/impl/src/attr.rs @@ -75,9 +75,12 @@ pub fn get(input: &[Attribute]) -> Result { if attrs.source.is_some() { return Err(Error::new_spanned(attr, "duplicate #[source] attribute")); } + let span = (attr.pound_token.span) + .join(attr.bracket_token.span.join()) + .unwrap_or(attr.path().get_ident().unwrap().span()); attrs.source = Some(Source { original: attr, - span: attr.path().get_ident().unwrap().span(), + span, }); } else if attr.path().is_ident("backtrace") { attr.meta.require_path_only()?; @@ -96,9 +99,12 @@ pub fn get(input: &[Attribute]) -> Result { if attrs.from.is_some() { return Err(Error::new_spanned(attr, "duplicate #[from] attribute")); } + let span = (attr.pound_token.span) + .join(attr.bracket_token.span.join()) + .unwrap_or(attr.path().get_ident().unwrap().span()); attrs.from = Some(From { original: attr, - span: attr.path().get_ident().unwrap().span(), + span, }); } } diff --git a/tests/ui/source-enum-unnamed-field-not-error.stderr b/tests/ui/source-enum-unnamed-field-not-error.stderr index a1fe2b5..dc97a4b 100644 --- a/tests/ui/source-enum-unnamed-field-not-error.stderr +++ b/tests/ui/source-enum-unnamed-field-not-error.stderr @@ -1,11 +1,11 @@ error[E0599]: the method `as_dyn_error` exists for reference `&NotError`, but its trait bounds were not satisfied - --> tests/ui/source-enum-unnamed-field-not-error.rs:9:14 + --> tests/ui/source-enum-unnamed-field-not-error.rs:9:12 | 4 | pub struct NotError; | ------------------- doesn't satisfy `NotError: AsDynError<'_>` or `NotError: std::error::Error` ... 9 | Broken(#[source] NotError), - | ^^^^^^ method cannot be called on `&NotError` due to unsatisfied trait bounds + | ^^^^^^^^^ method cannot be called on `&NotError` due to unsatisfied trait bounds | = note: the following trait bounds were not satisfied: `NotError: std::error::Error` diff --git a/tests/ui/source-struct-unnamed-field-not-error.stderr b/tests/ui/source-struct-unnamed-field-not-error.stderr index 2022ea6..1f5350b 100644 --- a/tests/ui/source-struct-unnamed-field-not-error.stderr +++ b/tests/ui/source-struct-unnamed-field-not-error.stderr @@ -1,11 +1,11 @@ error[E0599]: the method `as_dyn_error` exists for struct `NotError`, but its trait bounds were not satisfied - --> tests/ui/source-struct-unnamed-field-not-error.rs:8:26 + --> tests/ui/source-struct-unnamed-field-not-error.rs:8:24 | 4 | struct NotError; | --------------- method `as_dyn_error` not found for this struct because it doesn't satisfy `NotError: AsDynError<'_>` or `NotError: std::error::Error` ... 8 | pub struct ErrorStruct(#[source] NotError); - | ^^^^^^ method cannot be called on `NotError` due to unsatisfied trait bounds + | ^^^^^^^^^ method cannot be called on `NotError` due to unsatisfied trait bounds | = note: the following trait bounds were not satisfied: `NotError: std::error::Error`