Skip to content

Commit 3880fc7

Browse files
committed
Revert "Add comments. Fix spacing"
This reverts commit dce9e83.
1 parent dce9e83 commit 3880fc7

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

library/core/src/num/mod.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -1591,9 +1591,6 @@ from_str_radix_size_impl! { i64 isize, u64 usize }
15911591
mod verify {
15921592
use super::*;
15931593

1594-
// Verify `unchecked_{add, sub, mul}`
1595-
// However, `unchecked_mul` harnesses have bad performance, so
1596-
// recommend to use generate_unchecked_mul_harness! to set input limits
15971594
macro_rules! generate_unchecked_math_harness {
15981595
($type:ty, $method:ident, $harness_name:ident) => {
15991596
#[kani::proof_for_contract($type::$method)]
@@ -1608,15 +1605,14 @@ mod verify {
16081605
}
16091606
}
16101607

1611-
// Improve unchecked_mul performance for {32, 64, 128}-bit integer types
1612-
// by adding upper and lower limits for inputs
16131608
macro_rules! generate_unchecked_mul_harness {
16141609
($type:ty, $method:ident, $harness_name:ident, $min:expr, $max:expr) => {
16151610
#[kani::proof_for_contract($type::$method)]
16161611
pub fn $harness_name() {
1617-
let num1: $type = kani::any::<$type>();
1618-
let num2: $type = kani::any::<$type>();
1619-
1612+
let num1: $type = kani::any();
1613+
let num2: $type = kani::any();
1614+
1615+
// Limit the values of num1 and num2 to the specified range for multiplication
16201616
kani::assume(num1 >= $min && num1 <= $max);
16211617
kani::assume(num2 >= $min && num2 <= $max);
16221618

@@ -1626,8 +1622,8 @@ mod verify {
16261622
}
16271623
}
16281624
}
1625+
16291626

1630-
// Verify `unchecked_{shl, shr}`
16311627
macro_rules! generate_unchecked_shift_harness {
16321628
($type:ty, $method:ident, $harness_name:ident) => {
16331629
#[kani::proof_for_contract($type::$method)]
@@ -1641,6 +1637,7 @@ mod verify {
16411637
}
16421638
}
16431639
}
1640+
16441641

16451642
macro_rules! generate_unchecked_neg_harness {
16461643
($type:ty, $method:ident, $harness_name:ident) => {
@@ -1702,6 +1699,7 @@ mod verify {
17021699
generate_unchecked_mul_harness!(u128, unchecked_mul, checked_unchecked_mul_u128, 0u128, 1_000_000_000_000_000u128);
17031700
generate_unchecked_mul_harness!(usize, unchecked_mul, checked_unchecked_mul_usize, 0usize, 100_000usize);
17041701

1702+
17051703
// unchecked_shr proofs
17061704
//
17071705
// Target types:
@@ -1724,4 +1722,6 @@ mod verify {
17241722
generate_unchecked_shift_harness!(u64, unchecked_shr, checked_unchecked_shr_u64);
17251723
generate_unchecked_shift_harness!(u128, unchecked_shr, checked_unchecked_shr_u128);
17261724
generate_unchecked_shift_harness!(usize, unchecked_shr, checked_unchecked_shr_usize);
1725+
}
1726+
}
17271727
}

0 commit comments

Comments
 (0)