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

Merge pull request #358 from dtolnay/conflict

Browse source 
Further deconflict macro-generated format var names with user-provided ones
This commit is contained in:
David Tolnay 2024-11-04 22:11:33 -05:00 • committed by GitHub
commit e1fa5190b4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
impl/src/fmt.rs
View file

@ -78,7 +78,7 @@ impl Display<'_> {
} }
_ => continue, _ => continue,
}; };
let formatvar = match &member { let mut formatvar = match &member {
MemberUnraw::Unnamed(index) => IdentUnraw::new(format_ident!("__field{}", index)), MemberUnraw::Unnamed(index) => IdentUnraw::new(format_ident!("__field{}", index)),
MemberUnraw::Named(ident) => { MemberUnraw::Named(ident) => {
if user_named_args.contains(ident) || ident == "_" { if user_named_args.contains(ident) || ident == "_" {
@ -89,6 +89,9 @@ impl Display<'_> {
IdentUnraw::new(format_ident!("__field_{}", ident.to_string())) IdentUnraw::new(format_ident!("__field_{}", ident.to_string()))
} }
}; };
while user_named_args.contains(&formatvar) {
formatvar = IdentUnraw::new(format_ident!("_{}", formatvar.to_string()));
}
out += &formatvar.to_string(); out += &formatvar.to_string();
if !macro_named_args.insert(member.clone()) { if !macro_named_args.insert(member.clone()) {
// Already added to scope by a previous use. // Already added to scope by a previous use.