Skip to content

Commit 797cb95

Browse files
Fix to libstd test
1 parent 247b739 commit 797cb95

File tree

1 file changed

+44
-42
lines changed

1 file changed

+44
-42
lines changed

library/core/tests/num/wrapping.rs

Lines changed: 44 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
// run-pass
2-
3-
use std::num::Wrapping;
1+
use core::num::Wrapping;
42

53
macro_rules! wrapping_operation {
64
($result:expr, $lhs:ident $op:tt $rhs:expr) => {
@@ -29,49 +27,53 @@ macro_rules! wrapping_assignment {
2927

3028
macro_rules! wrapping_test {
3129
($type:ty, $min:expr, $max:expr) => {
32-
let zero: Wrapping<$type> = Wrapping(0);
33-
let one: Wrapping<$type> = Wrapping(1);
34-
let min: Wrapping<$type> = Wrapping($min);
35-
let max: Wrapping<$type> = Wrapping($max);
30+
#[test]
31+
fn wrapping_$type() {
32+
let zero: Wrapping<$type> = Wrapping(0);
33+
let one: Wrapping<$type> = Wrapping(1);
34+
let min: Wrapping<$type> = Wrapping($min);
35+
let max: Wrapping<$type> = Wrapping($max);
3636

37-
wrapping_operation!(min, max + one);
38-
wrapping_assignment!(min, max += one);
39-
wrapping_operation!(max, min - one);
40-
wrapping_assignment!(max, min -= one);
41-
wrapping_operation!(max, max * one);
42-
wrapping_assignment!(max, max *= one);
43-
wrapping_operation!(max, max / one);
44-
wrapping_assignment!(max, max /= one);
45-
wrapping_operation!(zero, max % one);
46-
wrapping_assignment!(zero, max %= one);
47-
wrapping_operation!(zero, zero & max);
48-
wrapping_assignment!(zero, zero &= max);
49-
wrapping_operation!(max, zero | max);
50-
wrapping_assignment!(max, zero |= max);
51-
wrapping_operation!(zero, max ^ max);
52-
wrapping_assignment!(zero, max ^= max);
53-
wrapping_operation!(zero, zero << 1usize);
54-
wrapping_assignment!(zero, zero <<= 1usize);
55-
wrapping_operation!(zero, zero >> 1usize);
56-
wrapping_assignment!(zero, zero >>= 1usize);
57-
wrapping_operation!(zero, -zero);
58-
wrapping_operation!(max, !min);
37+
wrapping_operation!(min, max + one);
38+
wrapping_assignment!(min, max += one);
39+
wrapping_operation!(max, min - one);
40+
wrapping_assignment!(max, min -= one);
41+
wrapping_operation!(max, max * one);
42+
wrapping_assignment!(max, max *= one);
43+
wrapping_operation!(max, max / one);
44+
wrapping_assignment!(max, max /= one);
45+
wrapping_operation!(zero, max % one);
46+
wrapping_assignment!(zero, max %= one);
47+
wrapping_operation!(zero, zero & max);
48+
wrapping_assignment!(zero, zero &= max);
49+
wrapping_operation!(max, zero | max);
50+
wrapping_assignment!(max, zero |= max);
51+
wrapping_operation!(zero, max ^ max);
52+
wrapping_assignment!(zero, max ^= max);
53+
wrapping_operation!(zero, zero << 1usize);
54+
wrapping_assignment!(zero, zero <<= 1usize);
55+
wrapping_operation!(zero, zero >> 1usize);
56+
wrapping_assignment!(zero, zero >>= 1usize);
57+
wrapping_operation!(zero, -zero);
58+
wrapping_operation!(max, !min);
59+
}
5960
};
6061
}
6162

62-
fn main() {
63-
wrapping_test!(i8, std::i8::MIN, std::i8::MAX);
64-
wrapping_test!(i16, std::i16::MIN, std::i16::MAX);
65-
wrapping_test!(i32, std::i32::MIN, std::i32::MAX);
66-
wrapping_test!(i64, std::i64::MIN, std::i64::MAX);
63+
#[cfg(tests)]
64+
mod tests {
65+
wrapping_test!(i8, i8::MIN, i8::MAX);
66+
wrapping_test!(i16, i16::MIN, i16::MAX);
67+
wrapping_test!(i32, i32::MIN, i32::MAX);
68+
wrapping_test!(i64, i64::MIN, i64::MAX);
6769
#[cfg(not(target_os = "emscripten"))]
68-
wrapping_test!(i128, std::i128::MIN, std::i128::MAX);
69-
wrapping_test!(isize, std::isize::MIN, std::isize::MAX);
70-
wrapping_test!(u8, std::u8::MIN, std::u8::MAX);
71-
wrapping_test!(u16, std::u16::MIN, std::u16::MAX);
72-
wrapping_test!(u32, std::u32::MIN, std::u32::MAX);
73-
wrapping_test!(u64, std::u64::MIN, std::u64::MAX);
70+
wrapping_test!(i128, i128::MIN, i128::MAX);
71+
wrapping_test!(isize, isize::MIN, isize::MAX);
72+
wrapping_test!(u8, u8::MIN, u8::MAX);
73+
wrapping_test!(u16, u16::MIN, u16::MAX);
74+
wrapping_test!(u32, u32::MIN, u32::MAX);
75+
wrapping_test!(u64, u64::MIN, u64::MAX);
7476
#[cfg(not(target_os = "emscripten"))]
75-
wrapping_test!(u128, std::u128::MIN, std::u128::MAX);
76-
wrapping_test!(usize, std::usize::MIN, std::usize::MAX);
77+
wrapping_test!(u128, u128::MIN, u128::MAX);
78+
wrapping_test!(usize, usize::MIN, usize::MAX);
7779
}

0 commit comments

Comments
 (0)