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

Fix miscounting fields when from and backtrace are same field

Browse source
This commit is contained in:
David Tolnay 2021-12-18 11:41:04 -08:00
parent 8602ca3dd2
commit c4d7c2b135
No known key found for this signature in database
GPG key ID: F9BA143B95FF6D82
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
impl/src/valid.rs
View file

@ -180,7 +180,11 @@ fn check_field_attrs(fields: &[Field]) -> Result<()> {
} }
} }
if let Some(from_field) = from_field { if let Some(from_field) = from_field {
if fields.len() > 1 + has_backtrace as usize { let max_expected_fields = match backtrace_field {
Some(backtrace_field) => 1 + !same_member(from_field, backtrace_field) as usize,
None => 1 + has_backtrace as usize,
};
if fields.len() > max_expected_fields {
return Err(Error::new_spanned( return Err(Error::new_spanned(
from_field.attrs.from, from_field.attrs.from,
"deriving From requires no fields other than source and backtrace", "deriving From requires no fields other than source and backtrace",

6
tests/ui/from-backtrace-backtrace.stderr
View file

@ -1,5 +1,5 @@
error[E0063]: missing field `1` in initializer of `Error` error: deriving From requires no fields other than source and backtrace
--> tests/ui/from-backtrace-backtrace.rs:10:12 --> tests/ui/from-backtrace-backtrace.rs:10:18
| |
10 | pub struct Error(#[from] #[backtrace] std::io::Error, Backtrace); 10 | pub struct Error(#[from] #[backtrace] std::io::Error, Backtrace);
| ^^^^^ missing `1` | ^^^^^^^