From 093fce980f79e6720fd0bf5fa0b93fe1000f69ec Mon Sep 17 00:00:00 2001 From: Jens Reidel Date: Tue, 5 Jan 2021 19:00:28 +0100 Subject: [PATCH 1/4] Bump rand to 0.8 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 76c374cc..ffebdb4c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -47,7 +47,7 @@ features = ["i128"] [dependencies.rand] optional = true -version = "0.7" +version = "0.8" default-features = false [dependencies.serde] From 28176b444aaee3031a66c1baf4bdf2f46c4e83aa Mon Sep 17 00:00:00 2001 From: Jens Reidel Date: Tue, 5 Jan 2021 22:57:41 +0100 Subject: [PATCH 2/4] Fix big_rand ci --- ci/big_rand/Cargo.toml | 8 ++++---- ci/big_rand/src/lib.rs | 4 ++-- ci/big_rand/src/torture.rs | 9 ++++++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/ci/big_rand/Cargo.toml b/ci/big_rand/Cargo.toml index 199c022e..33dd20bc 100644 --- a/ci/big_rand/Cargo.toml +++ b/ci/big_rand/Cargo.toml @@ -6,9 +6,9 @@ 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"] @@ -16,4 +16,4 @@ path = "../.." [dependencies.rand] features = ["small_rng"] -version = "0.7" +version = "0.8" diff --git a/ci/big_rand/src/lib.rs b/ci/big_rand/src/lib.rs index 1bea5750..69728777 100644 --- a/ci/big_rand/src/lib.rs +++ b/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 { diff --git a/ci/big_rand/src/torture.rs b/ci/big_rand/src/torture.rs index 746128de..eac8c222 100644 --- a/ci/big_rand/src/torture.rs +++ b/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); From 63a89672f6e76f9eceddc968c685bb51514aa1dd Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Thu, 4 Mar 2021 19:31:03 -0800 Subject: [PATCH 3/4] Update for rand's MSRV 1.36 --- .github/workflows/ci.yaml | 3 +-- README.md | 4 ++-- bors.toml | 1 - ci/rustup.sh | 2 +- ci/test_full.sh | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 9a1eab14..c6680623 100644 --- a/.github/workflows/ci.yaml +++ b/.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 diff --git a/README.md b/README.md index d9df19bc..3311b7a8 100644 --- a/README.md +++ b/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 diff --git a/bors.toml b/bors.toml index 5ef58889..1a5421b0 100644 --- a/bors.toml +++ b/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)", diff --git a/ci/rustup.sh b/ci/rustup.sh index ad98c34a..ef75c700 100755 --- a/ci/rustup.sh +++ b/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 diff --git a/ci/test_full.sh b/ci/test_full.sh index 3b3b472d..c3e2785f 100755 --- a/ci/test_full.sh +++ b/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[*]}" From 46aa21283a76c076f36c41bba82c8c35b68cf460 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Thu, 4 Mar 2021 19:31:29 -0800 Subject: [PATCH 4/4] Bump to 0.4.0-pre --- Cargo.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index ffebdb4c..c7947220 100644 --- a/Cargo.toml +++ b/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/*"]