Merge #155

155: Minor cleanups r=cuviper a=cuviper



Co-authored-by: Josh Stone <cuviper@gmail.com>

Author: bors[bot]

src/bigint.rs

@@ -20,9 +20,6 @@ use core::str::{self, FromStr};
 use core::{i128, u128};
 use core::{i64, u64};
 
-#[cfg(feature = "serde")]
-use serde;
-
 use num_integer::{Integer, Roots};
 use num_traits::{
     CheckedAdd, CheckedDiv, CheckedMul, CheckedSub, FromPrimitive, Num, One, Pow, PrimInt, Signed,
@@ -158,18 +155,6 @@ impl Arbitrary for BigInt {
     }
 }
 
-/// Return the magnitude of a `BigInt`.
-#[cfg(feature = "rand")]
-pub(crate) fn magnitude(i: &BigInt) -> &BigUint {
-    &i.data
-}
-
-/// Return the owned magnitude of a `BigInt`.
-#[cfg(feature = "rand")]
-pub(crate) fn into_magnitude(i: BigInt) -> BigUint {
-    i.data
-}
-
 impl hash::Hash for BigInt {
     #[inline]
     fn hash<H: hash::Hasher>(&self, state: &mut H) {

src/bigrand.rs

@@ -7,7 +7,6 @@ use crate::BigInt;
 use crate::BigUint;
 use crate::Sign::*;
 
-use crate::bigint::{into_magnitude, magnitude};
 use crate::biguint::biguint_from_vec;
 
 use num_integer::Integer;
@@ -132,12 +131,12 @@ impl<R: Rng + ?Sized> RandBigInt for R {
     fn gen_bigint_range(&mut self, lbound: &BigInt, ubound: &BigInt) -> BigInt {
         assert!(*lbound < *ubound);
         if lbound.is_zero() {
-            BigInt::from(self.gen_biguint_below(magnitude(&ubound)))
+            BigInt::from(self.gen_biguint_below(ubound.magnitude()))
         } else if ubound.is_zero() {
-            lbound + BigInt::from(self.gen_biguint_below(magnitude(&lbound)))
+            lbound + BigInt::from(self.gen_biguint_below(lbound.magnitude()))
         } else {
             let delta = ubound - lbound;
-            lbound + BigInt::from(self.gen_biguint_below(magnitude(&delta)))
+            lbound + BigInt::from(self.gen_biguint_below(delta.magnitude()))
         }
     }
 }
@@ -218,7 +217,7 @@ impl UniformSampler for UniformBigInt {
         let high = high_b.borrow();
         assert!(low < high);
         UniformBigInt {
-            len: into_magnitude(high - low),
+            len: (high - low).into_parts().1,
             base: low.clone(),
         }
     }

src/biguint.rs

@@ -18,9 +18,6 @@ use core::str::{self, FromStr};
 use core::{f32, f64};
 use core::{u32, u64, u8};
 
-#[cfg(feature = "serde")]
-use serde;
-
 use num_integer::{Integer, Roots};
 use num_traits::float::FloatCore;
 use num_traits::{