Skip to content

Commit 7e2b876

Browse files
committed
Avoid ident concatenation in macro.
AFAIK it isn't currently possible to do this. It is also more in line with other tests in the surrounding modules.
1 parent acc4e56 commit 7e2b876

File tree

1 file changed

+15
-14
lines changed

1 file changed

+15
-14
lines changed

core/tests/num/wrapping.rs

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ macro_rules! wrapping_assignment {
2626
}
2727

2828
macro_rules! wrapping_test {
29-
($type:ty, $min:expr, $max:expr) => {
29+
($fn_name:ident, $type:ty, $min:expr, $max:expr) => {
3030
#[test]
31-
fn wrapping_$type() {
31+
fn $fn_name() {
3232
let zero: Wrapping<$type> = Wrapping(0);
3333
let one: Wrapping<$type> = Wrapping(1);
3434
let min: Wrapping<$type> = Wrapping($min);
@@ -60,23 +60,24 @@ macro_rules! wrapping_test {
6060
};
6161
}
6262

63-
wrapping_test!(i8, i8::MIN, i8::MAX);
64-
wrapping_test!(i16, i16::MIN, i16::MAX);
65-
wrapping_test!(i32, i32::MIN, i32::MAX);
66-
wrapping_test!(i64, i64::MIN, i64::MAX);
63+
wrapping_test!(test_wrapping_i8, i8, i8::MIN, i8::MAX);
64+
wrapping_test!(test_wrapping_i16, i16, i16::MIN, i16::MAX);
65+
wrapping_test!(test_wrapping_i32, i32, i32::MIN, i32::MAX);
66+
wrapping_test!(test_wrapping_i64, i64, i64::MIN, i64::MAX);
6767
#[cfg(not(target_os = "emscripten"))]
68-
wrapping_test!(i128, i128::MIN, i128::MAX);
69-
wrapping_test!(isize, isize::MIN, isize::MAX);
70-
wrapping_test!(u8, u8::MIN, u8::MAX);
71-
wrapping_test!(u16, u16::MIN, u16::MAX);
72-
wrapping_test!(u32, u32::MIN, u32::MAX);
73-
wrapping_test!(u64, u64::MIN, u64::MAX);
68+
wrapping_test!(test_wrapping_i128, i128, i128::MIN, i128::MAX);
69+
wrapping_test!(test_wrapping_isize, isize, isize::MIN, isize::MAX);
70+
wrapping_test!(test_wrapping_u8, u8, u8::MIN, u8::MAX);
71+
wrapping_test!(test_wrapping_u16, u16, u16::MIN, u16::MAX);
72+
wrapping_test!(test_wrapping_u32, u32, u32::MIN, u32::MAX);
73+
wrapping_test!(test_wrapping_u64, u64, u64::MIN, u64::MAX);
7474
#[cfg(not(target_os = "emscripten"))]
75-
wrapping_test!(u128, u128::MIN, u128::MAX);
76-
wrapping_test!(usize, usize::MIN, usize::MAX);
75+
wrapping_test!(test_wrapping_u128, u128, u128::MIN, u128::MAX);
76+
wrapping_test!(test_wrapping_usize, usize, usize::MIN, usize::MAX);
7777

7878
// Don't warn about overflowing ops on 32-bit platforms
7979
#[cfg_attr(target_pointer_width = "32", allow(const_err))]
80+
#[test]
8081
fn wrapping_int_api() {
8182
assert_eq!(i8::MAX.wrapping_add(1), i8::MIN);
8283
assert_eq!(i16::MAX.wrapping_add(1), i16::MIN);

0 commit comments

Comments
 (0)