Merge branch 'master' into boxed-uintlike-coverage

Author: xuganyu96

src/traits.rs

@@ -135,9 +135,16 @@ pub trait Zero: ConstantTimeEq + Sized {
     /// # Returns
     ///
     /// If zero, returns `Choice(1)`. Otherwise, returns `Choice(0)`.
+    #[inline]
     fn is_zero(&self) -> Choice {
         self.ct_eq(&Self::zero())
     }
+
+    /// Set `self` to its additive identity, i.e. `Self::zero`.
+    #[inline]
+    fn set_zero(&mut self) {
+        *self = Zero::zero();
+    }
 }
 
 /// Trait for associating a constant representing zero.
@@ -149,6 +156,7 @@ pub trait ZeroConstant: Zero {
 }
 
 impl<T: ZeroConstant> Zero for T {
+    #[inline(always)]
     fn zero() -> T {
         Self::ZERO
     }

src/uint/boxed.rs

@@ -237,13 +237,8 @@ impl BoxedUint {
         limbs.into()
     }
 
-    /// Set the value of `self` to zero in-place.
-    pub(crate) fn set_to_zero(&mut self) {
-        self.limbs.as_mut().fill(Limb::ZERO)
-    }
-
     /// Set the value of `self` to zero in-place if `choice` is truthy.
-    pub(crate) fn conditional_set_to_zero(&mut self, choice: Choice) {
+    pub(crate) fn conditional_set_zero(&mut self, choice: Choice) {
         let nlimbs = self.nlimbs();
         let limbs = self.limbs.as_mut();
         for i in 0..nlimbs {
@@ -408,6 +403,10 @@ impl Zero for BoxedUint {
     fn is_zero(&self) -> Choice {
         self.is_zero()
     }
+
+    fn set_zero(&mut self) {
+        self.limbs.as_mut().fill(Limb::ZERO)
+    }
 }
 
 #[cfg(feature = "zeroize")]

src/uint/boxed/shl.rs

@@ -20,15 +20,15 @@ impl BoxedUint {
 
         for i in 0..shift_bits {
             let bit = Choice::from(((shift >> i) & 1) as u8);
-            temp.set_to_zero();
+            temp.set_zero();
             // Will not overflow by construction
             result
                 .shl_vartime_into(&mut temp, 1 << i)
                 .expect("shift within range");
             result.conditional_assign(&temp, bit);
         }
 
-        result.conditional_set_to_zero(overflow);
+        result.conditional_set_zero(overflow);
 
         (result, overflow)
     }

src/uint/boxed/shr.rs

@@ -20,15 +20,15 @@ impl BoxedUint {
 
         for i in 0..shift_bits {
             let bit = Choice::from(((shift >> i) & 1) as u8);
-            temp.set_to_zero();
+            temp.set_zero();
             // Will not overflow by construction
             result
                 .shr_vartime_into(&mut temp, 1 << i)
                 .expect("shift within range");
             result.conditional_assign(&temp, bit);
         }
 
-        result.conditional_set_to_zero(overflow);
+        result.conditional_set_zero(overflow);
 
         (result, overflow)
     }