Skip to content
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

Fix transparency for top-level shared attribute in Display #438

Merged
merged 5 commits into from
Jan 18, 2025
+329 −29
Merged

Fix transparency for top-level shared attribute in Display #438

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
720768e
Showcase
tyranron Jan 16, 2025
5240755
Introduce fix
tyranron Jan 16, 2025
8cda016
Mention in CHANGELOG
tyranron Jan 16, 2025
2a558bb
Make Clippy happy
tyranron Jan 16, 2025
0b7d929
Add tests for mixed case too
tyranron Jan 16, 2025
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
Prev Previous commit
Add tests for mixed case too
@tyranron
tyranron committed Jan 16, 2025
commit 0b7d9298fdca466c7473765f23e6bd0e6fabcaf7
150 changes: 150 additions & 0 deletions tests/display.rs
View file
Original file line number Diff line number Diff line change
@@ -2758,6 +2758,156 @@ mod generic {
format!("{:018p}", &a),
);
}

mod mixed {
use super::*;

#[derive(Display)]
#[display("{_variant}")]
enum EnumDisplay<A, B> {
A(A),
#[display("{_0}")]
B(B),
}

#[derive(Display)]
#[display("{_variant}")]
enum EnumBinary<A, B, C, D> {
#[display("{_0:b}")]
A(A, C),
#[display("{:b}", b)]
B { b: B, d: D },
}

#[derive(Display)]
#[display("{_variant}")]
enum EnumOctal<A, B, C, D> {
#[display("{_1:o}")]
A(A, C),
#[display("{:o}", d)]
B { b: B, d: D },
}

#[derive(Display)]
#[display("{_variant}")]
enum EnumLowerHex<A, B> {
#[display("{_0:x}")]
A(A),
#[display("{:x}", field)]
B { field: B },
}

#[derive(Display)]
#[display("{_variant}")]
enum EnumUpperHex<A, B> {
#[display("{_0:X}")]
A(A),
#[display("{:X}", field)]
B { field: B },
}

#[derive(Display)]
#[display("{_variant}")]
enum EnumLowerExp<A, B> {
#[display("{:e}", _0)]
A(A),
#[display("{field:e}")]
B { field: B },
}

#[derive(Display)]
#[display("{_variant}")]
enum EnumUpperExp<A, B> {
#[display("{:E}", _0)]
A(A),
#[display("{field:E}")]
B { field: B },
}

#[derive(Display)]
#[display("{_variant}")]
enum EnumPointer<A, B> {
#[display("{_0:p}")]
A(A),
#[display("{field:p}")]
B { field: B },
}

#[test]
fn assert() {
assert_eq!(
format!("{:03}", EnumDisplay::<i8, u8>::A(7)),
"007",
);
assert_eq!(
format!("{:03}", EnumDisplay::<i8, u8>::B(8)),
"008",
);
assert_eq!(
format!("{:07}", EnumBinary::<_, i8, _, ()>::A(7, ())),
"0000111",
);
assert_eq!(
format!(
"{:07}",
EnumBinary::<i8, _, (), _>::B { b: 8, d: () },
),
"0001000",
);
assert_eq!(
format!("{:03}", EnumOctal::<_, (), _, i8>::A((), 9)),
"011",
);
assert_eq!(
format!(
"{:03}",
EnumOctal::<(), _, i8, _>::B { b: (), d: 10 }
),
"012",
);
assert_eq!(
format!("{:03}", EnumLowerHex::<_, i8>::A(42)),
"02a",
);
assert_eq!(
format!("{:03}", EnumLowerHex::<i8, _>::B { field: 43 }),
"02b",
);
assert_eq!(
format!("{:03}", EnumUpperHex::<_, i8>::A(42)),
"02A",
);
assert_eq!(
format!("{:03}", EnumUpperHex::<i8, _>::B { field: 43 }),
"02B",
);
assert_eq!(
format!("{:07}", EnumLowerExp::<_, i8>::A(42.0)),
"004.2e1",
);
assert_eq!(
format!("{:07}", EnumLowerExp::<i8, _>::B { field: 43.0 }),
"004.3e1",
);
assert_eq!(
format!("{:07}", EnumUpperExp::<_, i8>::A(42.0)),
"004.2E1",
);
assert_eq!(
format!("{:07}", EnumUpperExp::<i8, _>::B { field: 43.0 }),
"004.3E1",
);
let (a, b) = (42, 7);
assert_eq!(
format!("{:018}", EnumPointer::<_, &i8>::A(&b)),
format!("{:018p}", &b),
);
assert_eq!(
format!("{:018}", EnumPointer::<&i8, _>::B { field: &a }),
format!("{:018p}", &a),
);
}
}
}
}