Skip to content

Support generic types that need multiple bounds #377

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dtolnay merged 2 commits into from
Nov 8, 2024
Merged

Support generic types that need multiple bounds #377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb8d3a7
Add test using generic type with multiple bounds
dtolnay Nov 8, 2024
5948ee6
Support generic types that need multiple bounds
dtolnay Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions impl/src/fmt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,6 @@ impl Display<'_> {
formatvar = IdentUnraw::new(format_ident!("_{}", formatvar.to_string()));
}
out += &formatvar.to_string();
if !macro_named_args.insert(member.clone()) {
// Already added to scope by a previous use.
continue;
}
let local = formatvar.to_local();
let mut binding_value = ToTokens::into_token_stream(match &member {
MemberUnraw::Unnamed(index) => format_ident!("_{}", index),
Expand Down Expand Up @@ -142,7 +138,11 @@ impl Display<'_> {
}
);
}
bindings.push((local, binding_value));
if macro_named_args.insert(member) {
bindings.push((local, binding_value));
} else {
// Already added to bindings by a previous use.
}
}

out += read;
Expand Down
12 changes: 12 additions & 0 deletions tests/test_generics.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,3 +172,15 @@ fn test_no_bound_on_named_fmt() {
let error = Error { thing: DebugOnly };
assert_eq!(error.to_string(), "...");
}

#[test]
fn test_multiple_bound() {
#[derive(Error, Debug)]
#[error("0x{thing:x} 0x{thing:X}")]
pub struct Error<T> {
thing: T,
}

let error = Error { thing: 0xFFi32 };
assert_eq!(error.to_string(), "0xff 0xFF");
}