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 #379 from dtolnay/binding

Browse source 
Emit rebinding only for interpolations that refer to a field
This commit is contained in:
David Tolnay 2024-11-08 13:25:40 -05:00 • committed by GitHub
commit 5dfd2cc112
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 25 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

36
impl/src/fmt.rs
View file

@ -60,15 +60,10 @@ impl Display<'_> {
return Err(Error::new_spanned(first_unnamed, msg));
}
}
let member = match int.parse::<u32>() {
match int.parse::<u32>() {
Ok(index) => MemberUnraw::Unnamed(Index { index, span }),
Err(_) => return Ok(()),
};
if !member_index.contains_key(&member) {
out += int;
continue;
}
member
}
'a'..='z' | 'A'..='Z' | '_' => {
if read.starts_with("r#") {
@ -90,15 +85,6 @@ impl Display<'_> {
}
_ => continue,
};
let mut formatvar = IdentUnraw::new(match &member {
MemberUnraw::Unnamed(index) => format_ident!("__field{}", index),
MemberUnraw::Named(ident) => format_ident!("__field_{}", ident.to_string()),
});
while user_named_args.contains(&formatvar) {
formatvar = IdentUnraw::new(format_ident!("_{}", formatvar.to_string()));
}
out += &formatvar.to_string();
let local = formatvar.to_local();
let mut binding_value = ToTokens::into_token_stream(match &member {
MemberUnraw::Unnamed(index) => format_ident!("_{}", index),
MemberUnraw::Named(ident) => ident.to_local(),
@ -118,17 +104,27 @@ impl Display<'_> {
Some('E') => Trait::UpperExp,
Some(_) => Trait::Display,
None => {
if member_index.contains_key(&member) {
has_bonus_display = true;
binding_value.extend(quote_spanned!(span=> .as_display()));
}
has_bonus_display = true;
binding_value.extend(quote_spanned!(span=> .as_display()));
Trait::Display
}
};
infinite_recursive |= member == *"self" && bound == Trait::Display;
if let Some(&field) = member_index.get(&member) {
implied_bounds.insert((field, bound));
} else {
out += &member.to_string();
continue;
}
infinite_recursive |= member == *"self" && bound == Trait::Display;
let mut formatvar = IdentUnraw::new(match &member {
MemberUnraw::Unnamed(index) => format_ident!("__field{}", index),
MemberUnraw::Named(ident) => format_ident!("__field_{}", ident.to_string()),
});
while user_named_args.contains(&formatvar) {
formatvar = IdentUnraw::new(format_ident!("_{}", formatvar.to_string()));
}
out += &formatvar.to_string();
let local = formatvar.to_local();
if macro_named_args.insert(member) {
bindings.push((local, binding_value));
} else {

9
impl/src/unraw.rs
View file

@ -89,6 +89,15 @@ impl MemberUnraw {
}
}
impl Display for MemberUnraw {
fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
match self {
MemberUnraw::Named(this) => Display::fmt(this, formatter),
MemberUnraw::Unnamed(this) => Display::fmt(&this.index, formatter),
}
}
}
impl Eq for MemberUnraw {}
impl PartialEq for MemberUnraw {