Skip to content

Commit 00c5f8a

Browse files
chorman0773chorman0773
committed
Fix unbounded_shifts tests
1 parent 28e2c6a commit 00c5f8a

File tree

2 files changed

+22
-13
lines changed

2 files changed

+22
-13
lines changed

Diff for: ‎coretests/tests/num/int_macros.rs

+10-11
Original file line numberDiff line numberDiff line change
@@ -479,24 +479,23 @@ macro_rules! int_module {
479479
}
480480
}
481481

482-
const SHIFT_AMOUNT_OVERFLOW: $T = <$T>::BITS;
483-
const SHIFT_AMOUNT_OVERFLOW2: $T = <$T>::BITS + 3;
484-
const SHIFT_AMOUNT_OVERFLOW3: $T = <$T>::BITS << 2;
485-
486-
487-
const SHIFT_AMOUNT_TEST_ONE: $T = <$T>::BITS >> 1;
488-
const SHIFT_AMOUNT_TEST_TWO: $T = <$T>::BITS >> 3;
489-
const SHIFT_AMOUNT_TEST_THREE: $T = (<$T>::BITS >> 1) - 1;
490-
const SHIFT_AMOUNT_TEST_FOUR: $T = <$T>::BITS - 1;
482+
// test_unbounded_sh* constants
483+
const SHIFT_AMOUNT_OVERFLOW: u32 = <$T>::BITS;
484+
const SHIFT_AMOUNT_OVERFLOW2: u32 = <$T>::BITS + 3;
485+
const SHIFT_AMOUNT_OVERFLOW3: u32 = <$T>::BITS << 2;
491486

487+
const SHIFT_AMOUNT_TEST_ONE: u32 = <$T>::BITS >> 1;
488+
const SHIFT_AMOUNT_TEST_TWO: u32 = <$T>::BITS >> 3;
489+
const SHIFT_AMOUNT_TEST_THREE: u32 = (<$T>::BITS >> 1) - 1;
490+
const SHIFT_AMOUNT_TEST_FOUR: u32 = <$T>::BITS - 1;
492491

493492
test_runtime_and_compiletime! {
494493
fn test_unbounded_shl() {
495494
// <$T>::MIN
496495
assert_eq_const_safe!(<$T>::unbounded_shl(<$T>::MIN, SHIFT_AMOUNT_TEST_ONE), (<$T>::MIN << SHIFT_AMOUNT_TEST_ONE));
497496
assert_eq_const_safe!(<$T>::unbounded_shl(<$T>::MIN, SHIFT_AMOUNT_TEST_TWO), (<$T>::MIN << SHIFT_AMOUNT_TEST_TWO));
498497
assert_eq_const_safe!(<$T>::unbounded_shl(<$T>::MIN, SHIFT_AMOUNT_TEST_THREE), (<$T>::MIN << SHIFT_AMOUNT_TEST_THREE));
499-
assert_eq_const_safe!(<$T>::unbounded_shl(<$T>::MIN, SHIFT_AMOUN_TEST_FOUR), (<$T>::MIN << SHIFT_AMOUN_TEST_FOUR));
498+
assert_eq_const_safe!(<$T>::unbounded_shl(<$T>::MIN, SHIFT_AMOUNT_TEST_FOUR), (<$T>::MIN << SHIFT_AMOUNT_TEST_FOUR));
500499
assert_eq_const_safe!(<$T>::unbounded_shl(<$T>::MIN, 1), (<$T>::MIN << 1));
501500
assert_eq_const_safe!(<$T>::unbounded_shl(<$T>::MIN, 3), (<$T>::MIN << 3));
502501
assert_eq_const_safe!(<$T>::unbounded_shl(<$T>::MIN, 5), (<$T>::MIN << 5));
@@ -572,7 +571,7 @@ macro_rules! int_module {
572571
assert_eq_const_safe!(<$T>::unbounded_shr(<$T>::MIN, SHIFT_AMOUNT_TEST_ONE), (<$T>::MIN >> SHIFT_AMOUNT_TEST_ONE));
573572
assert_eq_const_safe!(<$T>::unbounded_shr(<$T>::MIN, SHIFT_AMOUNT_TEST_TWO), (<$T>::MIN >> SHIFT_AMOUNT_TEST_TWO));
574573
assert_eq_const_safe!(<$T>::unbounded_shr(<$T>::MIN, SHIFT_AMOUNT_TEST_THREE), (<$T>::MIN >> SHIFT_AMOUNT_TEST_THREE));
575-
assert_eq_const_safe!(<$T>::unbounded_shr(<$T>::MIN, SHIFT_AMOUN_TEST_FOUR), (<$T>::MIN >> SHIFT_AMOUN_TEST_FOUR));
574+
assert_eq_const_safe!(<$T>::unbounded_shr(<$T>::MIN, SHIFT_AMOUNT_TEST_FOUR), (<$T>::MIN >> SHIFT_AMOUNT_TEST_FOUR));
576575
assert_eq_const_safe!(<$T>::unbounded_shr(<$T>::MIN, 1), (<$T>::MIN >> 1));
577576
assert_eq_const_safe!(<$T>::unbounded_shr(<$T>::MIN, 3), (<$T>::MIN >> 3));
578577
assert_eq_const_safe!(<$T>::unbounded_shr(<$T>::MIN, 5), (<$T>::MIN >> 5));

Diff for: ‎coretests/tests/num/uint_macros.rs

+12-2
Original file line numberDiff line numberDiff line change
@@ -318,13 +318,23 @@ macro_rules! uint_module {
318318
}
319319
}
320320

321+
// test_unbounded_sh* constants
322+
const SHIFT_AMOUNT_OVERFLOW: u32 = <$T>::BITS;
323+
const SHIFT_AMOUNT_OVERFLOW2: u32 = <$T>::BITS + 3;
324+
const SHIFT_AMOUNT_OVERFLOW3: u32 = <$T>::BITS << 2;
325+
326+
const SHIFT_AMOUNT_TEST_ONE: u32 = <$T>::BITS >> 1;
327+
const SHIFT_AMOUNT_TEST_TWO: u32 = <$T>::BITS >> 3;
328+
const SHIFT_AMOUNT_TEST_THREE: u32 = (<$T>::BITS >> 1) - 1;
329+
const SHIFT_AMOUNT_TEST_FOUR: u32 = <$T>::BITS - 1;
330+
321331
test_runtime_and_compiletime! {
322332
fn test_unbounded_shl() {
323333
// <$T>::MIN
324334
assert_eq_const_safe!(<$T>::unbounded_shl(<$T>::MIN, SHIFT_AMOUNT_TEST_ONE), (<$T>::MIN << SHIFT_AMOUNT_TEST_ONE));
325335
assert_eq_const_safe!(<$T>::unbounded_shl(<$T>::MIN, SHIFT_AMOUNT_TEST_TWO), (<$T>::MIN << SHIFT_AMOUNT_TEST_TWO));
326336
assert_eq_const_safe!(<$T>::unbounded_shl(<$T>::MIN, SHIFT_AMOUNT_TEST_THREE), (<$T>::MIN << SHIFT_AMOUNT_TEST_THREE));
327-
assert_eq_const_safe!(<$T>::unbounded_shl(<$T>::MIN, SHIFT_AMOUN_TEST_FOUR), (<$T>::MIN << SHIFT_AMOUN_TEST_FOUR));
337+
assert_eq_const_safe!(<$T>::unbounded_shl(<$T>::MIN, SHIFT_AMOUNT_TEST_FOUR), (<$T>::MIN << SHIFT_AMOUNT_TEST_FOUR));
328338
assert_eq_const_safe!(<$T>::unbounded_shl(<$T>::MIN, 1), (<$T>::MIN << 1));
329339
assert_eq_const_safe!(<$T>::unbounded_shl(<$T>::MIN, 3), (<$T>::MIN << 3));
330340
assert_eq_const_safe!(<$T>::unbounded_shl(<$T>::MIN, 5), (<$T>::MIN << 5));
@@ -400,7 +410,7 @@ macro_rules! uint_module {
400410
assert_eq_const_safe!(<$T>::unbounded_shr(<$T>::MIN, SHIFT_AMOUNT_TEST_ONE), (<$T>::MIN >> SHIFT_AMOUNT_TEST_ONE));
401411
assert_eq_const_safe!(<$T>::unbounded_shr(<$T>::MIN, SHIFT_AMOUNT_TEST_TWO), (<$T>::MIN >> SHIFT_AMOUNT_TEST_TWO));
402412
assert_eq_const_safe!(<$T>::unbounded_shr(<$T>::MIN, SHIFT_AMOUNT_TEST_THREE), (<$T>::MIN >> SHIFT_AMOUNT_TEST_THREE));
403-
assert_eq_const_safe!(<$T>::unbounded_shr(<$T>::MIN, SHIFT_AMOUN_TEST_FOUR), (<$T>::MIN >> SHIFT_AMOUN_TEST_FOUR));
413+
assert_eq_const_safe!(<$T>::unbounded_shr(<$T>::MIN, SHIFT_AMOUNT_TEST_FOUR), (<$T>::MIN >> SHIFT_AMOUNT_TEST_FOUR));
404414
assert_eq_const_safe!(<$T>::unbounded_shr(<$T>::MIN, 1), (<$T>::MIN >> 1));
405415
assert_eq_const_safe!(<$T>::unbounded_shr(<$T>::MIN, 3), (<$T>::MIN >> 3));
406416
assert_eq_const_safe!(<$T>::unbounded_shr(<$T>::MIN, 5), (<$T>::MIN >> 5));

0 commit comments

Comments
 (0)