Merge #185

185: Bump rand to 0.8 r=cuviper a=Gelbpunkt

This updates rand to 0.8, which is required when working with a 0.8 version in the package since the version needs to match for the trait.

Co-authored-by: Jens Reidel <adrian@travitia.xyz>
Co-authored-by: Josh Stone <cuviper@gmail.com>

.github/workflows/ci.yaml

@@ -14,9 +14,8 @@ jobs:
       matrix:
         rust: [
           1.31.0, # 2018!
-          1.32.0, # rand
           1.34.0, # quickcheck, has_try_from
-          1.36.0, # alloc
+          1.36.0, # alloc, rand
           stable,
           beta,
           nightly

Cargo.toml

@@ -8,7 +8,8 @@ categories = [ "algorithms", "data-structures", "science" ]
 license = "MIT OR Apache-2.0"
 name = "num-bigint"
 repository = "https://github.com/rust-num/num-bigint"
-version = "0.3.2"
+version = "0.4.0-pre"
+publish = false
 readme = "README.md"
 build = "build.rs"
 exclude = ["/bors.toml", "/ci/*", "/.github/*"]
@@ -47,7 +48,7 @@ features = ["i128"]
 
 [dependencies.rand]
 optional = true
-version = "0.7"
+version = "0.8"
 default-features = false
 
 [dependencies.serde]

README.md

@@ -29,12 +29,12 @@ if your compiler is not new enough.
 feature is enabled. To enable it include rand as
 
 ```toml
-rand = "0.7"
+rand = "0.8"
 num-bigint = { version = "0.3", features = ["rand"] }
 ```
 
 Note that you must use the version of `rand` that `num-bigint` is compatible
-with: `0.7`.
+with: `0.8`.
 
 ## Releases
 

bors.toml

@@ -1,6 +1,5 @@
 status = [
   "Test (1.31.0)",
-  "Test (1.32.0)",
   "Test (1.34.0)",
   "Test (1.36.0)",
   "Test (stable)",

ci/big_rand/Cargo.toml

@@ -6,14 +6,14 @@ edition = "2018"
 
 [dependencies]
 num-traits = "0.2.11"
-rand_chacha = "0.2"
-rand_isaac = "0.2"
-rand_xorshift = "0.2"
+rand_chacha = "0.3"
+rand_isaac = "0.3"
+rand_xorshift = "0.3"
 
 [dependencies.num-bigint]
 features = ["rand"]
 path = "../.."
 
 [dependencies.rand]
 features = ["small_rng"]
-version = "0.7"
+version = "0.8"

ci/big_rand/src/lib.rs

@@ -11,7 +11,7 @@ mod torture;
 mod biguint {
     use num_bigint::{BigUint, RandBigInt, RandomBits};
     use num_traits::Zero;
-    use rand::distributions::Uniform;
+    use rand::distributions::{Distribution, Uniform};
     use rand::thread_rng;
     use rand::{Rng, SeedableRng};
 
@@ -192,7 +192,7 @@ mod biguint {
 
         let mut rng = thread_rng();
         let bit_range = Uniform::new(0, 2048);
-        let sample_bits: Vec<_> = rng.sample_iter(&bit_range).take(100).collect();
+        let sample_bits: Vec<_> = bit_range.sample_iter(&mut rng).take(100).collect();
         for bits in sample_bits {
             let x = rng.gen_biguint(bits);
             for n in 2..11 {

ci/big_rand/src/torture.rs

@@ -4,7 +4,10 @@ use rand::prelude::*;
 use rand::rngs::SmallRng;
 
 fn get_rng() -> SmallRng {
-    let seed = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16];
+    let seed = [
+        1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+        26, 27, 28, 29, 30, 31, 32,
+    ];
     SmallRng::from_seed(seed)
 }
 
@@ -14,8 +17,8 @@ fn test_mul_divide_torture_count(count: usize) {
 
     for _ in 0..count {
         // Test with numbers of random sizes:
-        let xbits = rng.gen_range(0, bits_max);
-        let ybits = rng.gen_range(0, bits_max);
+        let xbits = rng.gen_range(0..bits_max);
+        let ybits = rng.gen_range(0..bits_max);
 
         let x = rng.gen_biguint(xbits);
         let y = rng.gen_biguint(ybits);

ci/rustup.sh

@@ -5,6 +5,6 @@
 set -ex
 
 ci=$(dirname $0)
-for version in 1.31.0 1.32.0 1.34.0 1.36.0 stable beta nightly; do
+for version in 1.31.0 1.34.0 1.36.0 stable beta nightly; do
     rustup run "$version" "$ci/test_full.sh"
 done

ci/test_full.sh

@@ -28,8 +28,8 @@ if ! check_version $MSRV ; then
 fi
 
 STD_FEATURES=(serde)
-check_version 1.32 && STD_FEATURES+=(rand)
 check_version 1.34 && STD_FEATURES+=(quickcheck)
+check_version 1.36 && STD_FEATURES+=(rand)
 check_version 1.36 && NO_STD_FEATURES=(serde rand)
 check_version 1.40 && STD_FEATURES+=(arbitrary)
 echo "Testing supported features: ${STD_FEATURES[*]}"