Merge commit '183a64b08e9dc7067f78624ec161371f1829623e' into ff-traits

git-subtree-dir: pairing
git-subtree-split: 183a64b08e

pairing/src/tests/curve.rs

@@ -1,6 +1,7 @@
+use ff::Field;
 use rand::{Rand, Rng, SeedableRng, XorShiftRng};
 
-use {CurveAffine, CurveProjective, EncodedPoint, Field};
+use {CurveAffine, CurveProjective, EncodedPoint};
 
 pub fn curve_tests<G: CurveProjective>() {
     let mut rng = XorShiftRng::from_seed([0x5dbe6259, 0x8d313d76, 0x3237db17, 0xe5bc0654]);
@@ -66,8 +67,8 @@ pub fn curve_tests<G: CurveProjective>() {
 }
 
 fn random_wnaf_tests<G: CurveProjective>() {
+    use ff::PrimeField;
     use wnaf::*;
-    use PrimeField;
 
     let mut rng = XorShiftRng::from_seed([0x5dbe6259, 0x8d313d76, 0x3237db17, 0xe5bc0654]);
 

pairing/src/tests/field.rs

@@ -1,5 +1,5 @@
+use ff::{Field, LegendreSymbol, PrimeField, SqrtField};
 use rand::{Rng, SeedableRng, XorShiftRng};
-use {Field, LegendreSymbol, PrimeField, SqrtField};
 
 pub fn random_frobenius_tests<F: Field, C: AsRef<[u64]>>(characteristic: C, maxpower: usize) {
     let mut rng = XorShiftRng::from_seed([0x5dbe6259, 0x8d313d76, 0x3237db17, 0xe5bc0654]);

pairing/src/tests/repr.rs

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