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

Merge pull request #376 from dtolnay/check

Browse source 
Check invalid Named member references before producing MemberUnraw
This commit is contained in:
David Tolnay 2024-11-08 12:34:19 -05:00 • committed by GitHub
commit f728f123fd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
impl/src/fmt.rs
View file

@ -73,19 +73,25 @@ impl Display<'_> {
if read.starts_with("r#") {
continue;
}
let ident = Ident::new(take_ident(&mut read), span);
MemberUnraw::Named(IdentUnraw::new(ident))
let repr = take_ident(&mut read);
if repr == "_" {
// Invalid. Let rustc produce the diagnostic.
out += repr;
continue;
}
let ident = IdentUnraw::new(Ident::new(repr, span));
if user_named_args.contains(&ident) {
// Refers to a named argument written by the user, not to field.
out += repr;
continue;
}
MemberUnraw::Named(ident)
}
_ => continue,
};
let mut formatvar = match &member {
MemberUnraw::Unnamed(index) => IdentUnraw::new(format_ident!("__field{}", index)),
MemberUnraw::Named(ident) => {
if user_named_args.contains(ident) || ident == "_" {
// Refers to a named argument written by the user, not to field.
out += &ident.to_string();
continue;
}
IdentUnraw::new(format_ident!("__field_{}", ident.to_string()))
}
};