Merge pull request #80 from hacspec/dependabot/cargo/rand-0.8

Update rand requirement from 0.7 to 0.8
hacspec · Apr 1, 2021 · fc35ed8 · fc35ed8
2 parents 3a210db + 01c1248
commit fc35ed8
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 14 deletions.
diff --git a/examples-unsafe/Cargo.toml b/examples-unsafe/Cargo.toml
@@ -20,7 +20,7 @@ serde = {version = "1.0", features = ["derive"]}
 rayon = "1.3.0"
 hacspec-dev = { path = "../utils/dev" }
 criterion = "^0.3"
-rand = "^0.7"
+rand = "^0.8"
 
 [[bench]]
 name = "benchmarks"

diff --git a/lib/Cargo.toml b/lib/Cargo.toml
@@ -19,4 +19,4 @@ hacspec-attributes = { path = "../utils/attributes",  optional = true, version =
 use_attributes = ["hacspec-attributes", "hacspec-attributes/print_attributes"]
 
 [dev-dependencies]
-rand = "0.7"
+rand = "0.8"
diff --git a/lib/tests/test_util.rs b/lib/tests/test_util.rs
@@ -3,7 +3,7 @@
 
 use hacspec_lib::prelude::*;
 
-use rand::{AsByteSliceMut, Rng};
+use rand::{Fill, Rng};
 
 pub(crate) fn get_expected(op: &'static str, a: &String, b: &String) -> String {
     let expected = std::process::Command::new("python")
@@ -25,7 +25,7 @@ pub(crate) fn random_hex_string(len: usize) -> String {
     let mut res = "".to_string();
     let mut rng = rand::thread_rng();
     for _ in 0..len {
-        res.push(HEX_CHARS[rng.gen_range(0, HEX_CHARS.len())]);
+        res.push(HEX_CHARS[rng.gen_range(0..HEX_CHARS.len())]);
     }
     res = res.trim_start_matches('0').to_string();
     if res.len() == 0 {
@@ -44,7 +44,7 @@ pub(crate) fn get_random_numbers<T: Integer>() -> (String, T, String, T) {
     (a, a_t, b, b_t)
 }
 
-pub(crate) fn random_bytes<A: Default + AsByteSliceMut>() -> A {
+pub(crate) fn random_bytes<A: Default + Fill>() -> A {
     let mut out = A::default();
     rand::thread_rng().fill(&mut out);
     out

diff --git a/utils/dev/Cargo.toml b/utils/dev/Cargo.toml
@@ -9,7 +9,7 @@ repository = "https://github.com/hacspec/hacspec"
 [dependencies]
 hacspec-lib = { path = "../../lib", version = "0.1.0-beta.1" }
 
-rand = "0.7"
+rand = "0.8"
 num = "0.4"
 serde_json = "1.0"
 serde = {version = "1.0", features = ["derive"]}
diff --git a/utils/dev/src/rand.rs b/utils/dev/src/rand.rs
@@ -1,7 +1,7 @@
 use hacspec_lib::prelude::*;
 use rand::{
     distributions::uniform::SampleBorrow, distributions::uniform::SampleUniform,
-    distributions::Distribution, distributions::Standard, AsByteSliceMut, Rng,
+    distributions::Distribution, distributions::Standard, Fill, Rng,
 };
 
 /// Random public integer
@@ -13,12 +13,11 @@ where
 }
 
 /// Random public integer in range `[min, max)`
-pub fn random_public_integer_range<T, U>(min: U, max: U) -> T
+pub fn random_public_integer_range<U>(min: U, max: U) -> U
 where
-    U: SampleBorrow<T> + Sized,
-    T: SampleUniform,
+    U: SampleBorrow<U> + Sized + SampleUniform + PartialOrd,
 {
-    rand::thread_rng().gen_range(min, max)
+    rand::thread_rng().gen_range(min..max)
 }
 
 /// Random public byte
@@ -33,7 +32,7 @@ pub fn random_byte() -> U8 {
 }
 
 /// Random array
-pub fn random_bytes<A: Default + AsByteSliceMut>() -> A {
+pub fn random_bytes<A: Default + Fill>() -> A {
     let mut out = A::default();
     rand::thread_rng().fill(&mut out);
     out

diff --git a/utils/evercrypt-provider/Cargo.toml b/utils/evercrypt-provider/Cargo.toml
@@ -15,4 +15,4 @@ aead = "0.3"
 [dev-dependencies]
 serde_json = "1.0"
 serde = {version = "1.0", features = ["derive"]}
-rand = "0.7"
+rand = "0.8"
diff --git a/utils/rc-bench/Cargo.toml b/utils/rc-bench/Cargo.toml
@@ -11,7 +11,7 @@ evercrypt-provider = { path = "../evercrypt-provider" }
 hacspec-provider = { path = "../../provider" }
 chacha20poly1305 = "0.7"
 criterion = "^0.3"
-rand = "^0.7"
+rand = "^0.8"
 
 [[bench]]
 name = "benchmarks"