Skip to content

Commit 787edff

Browse files
chorman0773gitbot
chorman0773
authored and
gitbot
committed
Fix unbounded_shifts tests
1 parent 5dc8d55 commit 787edff

File tree

2 files changed

+22
-13
lines changed

2 files changed

+22
-13
lines changed

‎coretests/tests/num/int_macros.rs

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -513,24 +513,23 @@ macro_rules! int_module {
513513
}
514514
}
515515

516-
const SHIFT_AMOUNT_OVERFLOW: $T = <$T>::BITS;
517-
const SHIFT_AMOUNT_OVERFLOW2: $T = <$T>::BITS + 3;
518-
const SHIFT_AMOUNT_OVERFLOW3: $T = <$T>::BITS << 2;
519-
520-
521-
const SHIFT_AMOUNT_TEST_ONE: $T = <$T>::BITS >> 1;
522-
const SHIFT_AMOUNT_TEST_TWO: $T = <$T>::BITS >> 3;
523-
const SHIFT_AMOUNT_TEST_THREE: $T = (<$T>::BITS >> 1) - 1;
524-
const SHIFT_AMOUNT_TEST_FOUR: $T = <$T>::BITS - 1;
516+
// test_unbounded_sh* constants
517+
const SHIFT_AMOUNT_OVERFLOW: u32 = <$T>::BITS;
518+
const SHIFT_AMOUNT_OVERFLOW2: u32 = <$T>::BITS + 3;
519+
const SHIFT_AMOUNT_OVERFLOW3: u32 = <$T>::BITS << 2;
525520

521+
const SHIFT_AMOUNT_TEST_ONE: u32 = <$T>::BITS >> 1;
522+
const SHIFT_AMOUNT_TEST_TWO: u32 = <$T>::BITS >> 3;
523+
const SHIFT_AMOUNT_TEST_THREE: u32 = (<$T>::BITS >> 1) - 1;
524+
const SHIFT_AMOUNT_TEST_FOUR: u32 = <$T>::BITS - 1;
526525

527526
test_runtime_and_compiletime! {
528527
fn test_unbounded_shl() {
529528
// <$T>::MIN
530529
assert_eq_const_safe!(<$T>::unbounded_shl(<$T>::MIN, SHIFT_AMOUNT_TEST_ONE), (<$T>::MIN << SHIFT_AMOUNT_TEST_ONE));
531530
assert_eq_const_safe!(<$T>::unbounded_shl(<$T>::MIN, SHIFT_AMOUNT_TEST_TWO), (<$T>::MIN << SHIFT_AMOUNT_TEST_TWO));
532531
assert_eq_const_safe!(<$T>::unbounded_shl(<$T>::MIN, SHIFT_AMOUNT_TEST_THREE), (<$T>::MIN << SHIFT_AMOUNT_TEST_THREE));
533-
assert_eq_const_safe!(<$T>::unbounded_shl(<$T>::MIN, SHIFT_AMOUN_TEST_FOUR), (<$T>::MIN << SHIFT_AMOUN_TEST_FOUR));
532+
assert_eq_const_safe!(<$T>::unbounded_shl(<$T>::MIN, SHIFT_AMOUNT_TEST_FOUR), (<$T>::MIN << SHIFT_AMOUNT_TEST_FOUR));
534533
assert_eq_const_safe!(<$T>::unbounded_shl(<$T>::MIN, 1), (<$T>::MIN << 1));
535534
assert_eq_const_safe!(<$T>::unbounded_shl(<$T>::MIN, 3), (<$T>::MIN << 3));
536535
assert_eq_const_safe!(<$T>::unbounded_shl(<$T>::MIN, 5), (<$T>::MIN << 5));
@@ -606,7 +605,7 @@ macro_rules! int_module {
606605
assert_eq_const_safe!(<$T>::unbounded_shr(<$T>::MIN, SHIFT_AMOUNT_TEST_ONE), (<$T>::MIN >> SHIFT_AMOUNT_TEST_ONE));
607606
assert_eq_const_safe!(<$T>::unbounded_shr(<$T>::MIN, SHIFT_AMOUNT_TEST_TWO), (<$T>::MIN >> SHIFT_AMOUNT_TEST_TWO));
608607
assert_eq_const_safe!(<$T>::unbounded_shr(<$T>::MIN, SHIFT_AMOUNT_TEST_THREE), (<$T>::MIN >> SHIFT_AMOUNT_TEST_THREE));
609-
assert_eq_const_safe!(<$T>::unbounded_shr(<$T>::MIN, SHIFT_AMOUN_TEST_FOUR), (<$T>::MIN >> SHIFT_AMOUN_TEST_FOUR));
608+
assert_eq_const_safe!(<$T>::unbounded_shr(<$T>::MIN, SHIFT_AMOUNT_TEST_FOUR), (<$T>::MIN >> SHIFT_AMOUNT_TEST_FOUR));
610609
assert_eq_const_safe!(<$T>::unbounded_shr(<$T>::MIN, 1), (<$T>::MIN >> 1));
611610
assert_eq_const_safe!(<$T>::unbounded_shr(<$T>::MIN, 3), (<$T>::MIN >> 3));
612611
assert_eq_const_safe!(<$T>::unbounded_shr(<$T>::MIN, 5), (<$T>::MIN >> 5));

‎coretests/tests/num/uint_macros.rs

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,13 +352,23 @@ macro_rules! uint_module {
352352
}
353353
}
354354

355+
// test_unbounded_sh* constants
356+
const SHIFT_AMOUNT_OVERFLOW: u32 = <$T>::BITS;
357+
const SHIFT_AMOUNT_OVERFLOW2: u32 = <$T>::BITS + 3;
358+
const SHIFT_AMOUNT_OVERFLOW3: u32 = <$T>::BITS << 2;
359+
360+
const SHIFT_AMOUNT_TEST_ONE: u32 = <$T>::BITS >> 1;
361+
const SHIFT_AMOUNT_TEST_TWO: u32 = <$T>::BITS >> 3;
362+
const SHIFT_AMOUNT_TEST_THREE: u32 = (<$T>::BITS >> 1) - 1;
363+
const SHIFT_AMOUNT_TEST_FOUR: u32 = <$T>::BITS - 1;
364+
355365
test_runtime_and_compiletime! {
356366
fn test_unbounded_shl() {
357367
// <$T>::MIN
358368
assert_eq_const_safe!(<$T>::unbounded_shl(<$T>::MIN, SHIFT_AMOUNT_TEST_ONE), (<$T>::MIN << SHIFT_AMOUNT_TEST_ONE));
359369
assert_eq_const_safe!(<$T>::unbounded_shl(<$T>::MIN, SHIFT_AMOUNT_TEST_TWO), (<$T>::MIN << SHIFT_AMOUNT_TEST_TWO));
360370
assert_eq_const_safe!(<$T>::unbounded_shl(<$T>::MIN, SHIFT_AMOUNT_TEST_THREE), (<$T>::MIN << SHIFT_AMOUNT_TEST_THREE));
361-
assert_eq_const_safe!(<$T>::unbounded_shl(<$T>::MIN, SHIFT_AMOUN_TEST_FOUR), (<$T>::MIN << SHIFT_AMOUN_TEST_FOUR));
371+
assert_eq_const_safe!(<$T>::unbounded_shl(<$T>::MIN, SHIFT_AMOUNT_TEST_FOUR), (<$T>::MIN << SHIFT_AMOUNT_TEST_FOUR));
362372
assert_eq_const_safe!(<$T>::unbounded_shl(<$T>::MIN, 1), (<$T>::MIN << 1));
363373
assert_eq_const_safe!(<$T>::unbounded_shl(<$T>::MIN, 3), (<$T>::MIN << 3));
364374
assert_eq_const_safe!(<$T>::unbounded_shl(<$T>::MIN, 5), (<$T>::MIN << 5));
@@ -434,7 +444,7 @@ macro_rules! uint_module {
434444
assert_eq_const_safe!(<$T>::unbounded_shr(<$T>::MIN, SHIFT_AMOUNT_TEST_ONE), (<$T>::MIN >> SHIFT_AMOUNT_TEST_ONE));
435445
assert_eq_const_safe!(<$T>::unbounded_shr(<$T>::MIN, SHIFT_AMOUNT_TEST_TWO), (<$T>::MIN >> SHIFT_AMOUNT_TEST_TWO));
436446
assert_eq_const_safe!(<$T>::unbounded_shr(<$T>::MIN, SHIFT_AMOUNT_TEST_THREE), (<$T>::MIN >> SHIFT_AMOUNT_TEST_THREE));
437-
assert_eq_const_safe!(<$T>::unbounded_shr(<$T>::MIN, SHIFT_AMOUN_TEST_FOUR), (<$T>::MIN >> SHIFT_AMOUN_TEST_FOUR));
447+
assert_eq_const_safe!(<$T>::unbounded_shr(<$T>::MIN, SHIFT_AMOUNT_TEST_FOUR), (<$T>::MIN >> SHIFT_AMOUNT_TEST_FOUR));
438448
assert_eq_const_safe!(<$T>::unbounded_shr(<$T>::MIN, 1), (<$T>::MIN >> 1));
439449
assert_eq_const_safe!(<$T>::unbounded_shr(<$T>::MIN, 3), (<$T>::MIN >> 3));
440450
assert_eq_const_safe!(<$T>::unbounded_shr(<$T>::MIN, 5), (<$T>::MIN >> 5));

0 commit comments

Comments
 (0)