Migrate ff, group, pairing, and bellman to rand 0.6

Cargo.toml

@@ -15,13 +15,13 @@ homepage = "https://github.com/ebfull/pairing"
 repository = "https://github.com/ebfull/pairing"
 
 [dependencies]
-rand_core = "0.3"
+rand_core = "0.4"
 byteorder = "1"
 ff = { path = "../ff", features = ["derive"] }
 group = { path = "../group" }
 
 [dev-dependencies]
-rand = "0.5"
+rand_xorshift = "0.1"
 
 [features]
 unstable-features = ["expose-arith"]

src/bls12_381/fq.rs

@@ -1173,7 +1173,9 @@ fn test_neg_one() {
 }
 
 #[cfg(test)]
-use rand::{SeedableRng, XorShiftRng};
+use rand_core::SeedableRng;
+#[cfg(test)]
+use rand_xorshift::XorShiftRng;
 
 #[test]
 fn test_fq_repr_ordering() {

src/bls12_381/fq12.rs

@@ -147,7 +147,9 @@ impl Field for Fq12 {
 }
 
 #[cfg(test)]
-use rand::{SeedableRng, XorShiftRng};
+use rand_core::SeedableRng;
+#[cfg(test)]
+use rand_xorshift::XorShiftRng;
 
 #[test]
 fn test_fq12_mul_by_014() {

src/bls12_381/fq2.rs

@@ -877,7 +877,9 @@ fn test_fq2_legendre() {
 }
 
 #[cfg(test)]
-use rand::{SeedableRng, XorShiftRng};
+use rand_core::SeedableRng;
+#[cfg(test)]
+use rand_xorshift::XorShiftRng;
 
 #[test]
 fn test_fq2_mul_nonresidue() {

src/bls12_381/fq6.rs

@@ -301,7 +301,9 @@ impl Field for Fq6 {
 }
 
 #[cfg(test)]
-use rand::{SeedableRng, XorShiftRng};
+use rand_core::SeedableRng;
+#[cfg(test)]
+use rand_xorshift::XorShiftRng;
 
 #[test]
 fn test_fq6_mul_nonresidue() {

src/bls12_381/fr.rs

@@ -6,7 +6,9 @@ use ff::{Field, PrimeField, PrimeFieldDecodingError, PrimeFieldRepr};
 pub struct Fr(FrRepr);
 
 #[cfg(test)]
-use rand::{SeedableRng, XorShiftRng};
+use rand_core::SeedableRng;
+#[cfg(test)]
+use rand_xorshift::XorShiftRng;
 
 #[test]
 fn test_fr_repr_ordering() {

src/lib.rs

@@ -17,7 +17,7 @@ extern crate group;
 extern crate rand_core;
 
 #[cfg(test)]
-extern crate rand;
+extern crate rand_xorshift;
 
 #[cfg(test)]
 pub mod tests;

src/tests/engine.rs

@@ -1,5 +1,6 @@
 use group::{CurveAffine, CurveProjective};
-use rand::{SeedableRng, XorShiftRng};
+use rand_core::SeedableRng;
+use rand_xorshift::XorShiftRng;
 
 use {Engine, Field, PairingCurveAffine, PrimeField};
 

src/tests/field.rs

@@ -1,5 +1,6 @@
 use ff::{Field, LegendreSymbol, PrimeField, SqrtField};
-use rand::{Rng, SeedableRng, XorShiftRng};
+use rand_core::{RngCore, SeedableRng};
+use rand_xorshift::XorShiftRng;
 
 pub fn random_frobenius_tests<F: Field, C: AsRef<[u64]>>(characteristic: C, maxpower: usize) {
     let mut rng = XorShiftRng::from_seed([
@@ -121,7 +122,7 @@ pub fn from_str_tests<F: PrimeField>() {
         ]);
 
         for _ in 0..1000 {
-            let n: u64 = rng.gen();
+            let n = rng.next_u64();
 
             let a = F::from_str(&format!("{}", n)).unwrap();
             let b = F::from_repr(n.into()).unwrap();
@@ -136,7 +137,7 @@ pub fn from_str_tests<F: PrimeField>() {
     assert!(F::from_str("00000000000").is_none());
 }
 
-fn random_multiplication_tests<F: Field, R: Rng>(rng: &mut R) {
+fn random_multiplication_tests<F: Field, R: RngCore>(rng: &mut R) {
     for _ in 0..10000 {
         let a = F::random(rng);
         let b = F::random(rng);
@@ -159,7 +160,7 @@ fn random_multiplication_tests<F: Field, R: Rng>(rng: &mut R) {
     }
 }
 
-fn random_addition_tests<F: Field, R: Rng>(rng: &mut R) {
+fn random_addition_tests<F: Field, R: RngCore>(rng: &mut R) {
     for _ in 0..10000 {
         let a = F::random(rng);
         let b = F::random(rng);
@@ -182,7 +183,7 @@ fn random_addition_tests<F: Field, R: Rng>(rng: &mut R) {
     }
 }
 
-fn random_subtraction_tests<F: Field, R: Rng>(rng: &mut R) {
+fn random_subtraction_tests<F: Field, R: RngCore>(rng: &mut R) {
     for _ in 0..10000 {
         let b = F::random(rng);
         let a = F::random(rng);
@@ -200,7 +201,7 @@ fn random_subtraction_tests<F: Field, R: Rng>(rng: &mut R) {
     }
 }
 
-fn random_negation_tests<F: Field, R: Rng>(rng: &mut R) {
+fn random_negation_tests<F: Field, R: RngCore>(rng: &mut R) {
     for _ in 0..10000 {
         let a = F::random(rng);
         let mut b = a;
@@ -211,7 +212,7 @@ fn random_negation_tests<F: Field, R: Rng>(rng: &mut R) {
     }
 }
 
-fn random_doubling_tests<F: Field, R: Rng>(rng: &mut R) {
+fn random_doubling_tests<F: Field, R: RngCore>(rng: &mut R) {
     for _ in 0..10000 {
         let mut a = F::random(rng);
         let mut b = a;
@@ -222,7 +223,7 @@ fn random_doubling_tests<F: Field, R: Rng>(rng: &mut R) {
     }
 }
 
-fn random_squaring_tests<F: Field, R: Rng>(rng: &mut R) {
+fn random_squaring_tests<F: Field, R: RngCore>(rng: &mut R) {
     for _ in 0..10000 {
         let mut a = F::random(rng);
         let mut b = a;
@@ -233,7 +234,7 @@ fn random_squaring_tests<F: Field, R: Rng>(rng: &mut R) {
     }
 }
 
-fn random_inversion_tests<F: Field, R: Rng>(rng: &mut R) {
+fn random_inversion_tests<F: Field, R: RngCore>(rng: &mut R) {
     assert!(F::zero().inverse().is_none());
 
     for _ in 0..10000 {
@@ -245,7 +246,7 @@ fn random_inversion_tests<F: Field, R: Rng>(rng: &mut R) {
     }
 }
 
-fn random_expansion_tests<F: Field, R: Rng>(rng: &mut R) {
+fn random_expansion_tests<F: Field, R: RngCore>(rng: &mut R) {
     for _ in 0..10000 {
         // Compare (a + b)(c + d) and (a*c + b*c + a*d + b*d)
 

src/tests/repr.rs

@@ -1,5 +1,6 @@
 use ff::{PrimeField, PrimeFieldRepr};
-use rand::{SeedableRng, XorShiftRng};
+use rand_core::SeedableRng;
+use rand_xorshift::XorShiftRng;
 
 pub fn random_repr_tests<P: PrimeField>() {
     random_encoding_tests::<P>();