mirrors/thiserror
1
0
Fork 0
mirror of https://github.com/dtolnay/thiserror.git synced 2025-04-04 13:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #363 from dtolnay/joinspan

Browse source 
Try joining a span for #[source] and #[from]
This commit is contained in:
David Tolnay 2024-11-05 00:17:58 -05:00 • committed by GitHub
commit b7f7bfdd40
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
impl/src/attr.rs
View file

@ -75,9 +75,12 @@ pub fn get(input: &[Attribute]) -> Result<Attrs> {
if attrs.source.is_some() { if attrs.source.is_some() {
return Err(Error::new_spanned(attr, "duplicate #[source] attribute")); 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 { attrs.source = Some(Source {
original: attr, original: attr,
span: attr.path().get_ident().unwrap().span(), span,
}); });
} else if attr.path().is_ident("backtrace") { } else if attr.path().is_ident("backtrace") {
attr.meta.require_path_only()?; attr.meta.require_path_only()?;
@ -96,9 +99,12 @@ pub fn get(input: &[Attribute]) -> Result<Attrs> {
if attrs.from.is_some() { if attrs.from.is_some() {
return Err(Error::new_spanned(attr, "duplicate #[from] attribute")); 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 { attrs.from = Some(From {
original: attr, original: attr,
span: attr.path().get_ident().unwrap().span(), span,
}); });
} }
} }

4
tests/ui/source-enum-unnamed-field-not-error.stderr
View file

@ -1,11 +1,11 @@
error[E0599]: the method `as_dyn_error` exists for reference `&NotError`, but its trait bounds were not satisfied 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; 4 | pub struct NotError;
| ------------------- doesn't satisfy `NotError: AsDynError<'_>` or `NotError: std::error::Error` | ------------------- doesn't satisfy `NotError: AsDynError<'_>` or `NotError: std::error::Error`
... ...
9 | Broken(#[source] NotError), 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: = note: the following trait bounds were not satisfied:
`NotError: std::error::Error` `NotError: std::error::Error`

4
tests/ui/source-struct-unnamed-field-not-error.stderr
View file

@ -1,11 +1,11 @@
error[E0599]: the method `as_dyn_error` exists for struct `NotError`, but its trait bounds were not satisfied 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; 4 | struct NotError;
| --------------- method `as_dyn_error` not found for this struct because it doesn't satisfy `NotError: AsDynError<'_>` or `NotError: std::error::Error` | --------------- 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); 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: = note: the following trait bounds were not satisfied:
`NotError: std::error::Error` `NotError: std::error::Error`