Merge commit '3d41ee5abaa4888ff3607689aba007be8856816d' into ff-traits

git-subtree-dir: pairing git-subtree-split: 3d41ee5aba
2019-01-06 09:19:29 +00:00
parent 9f7e5fa3ce 3d41ee5aba
commit 794cf79db2
12 changed files with 44 additions and 813 deletions
--- a/pairing/benches/bls12_381/mod.rs
+++ b/pairing/benches/bls12_381/mod.rs
@@ -7,7 +7,7 @@ mod fr;
 use rand::{Rand, SeedableRng, XorShiftRng};

 use pairing::bls12_381::*;
-use pairing::{CurveAffine, Engine};
+use pairing::{Engine, PairingCurveAffine};

 #[bench]
 fn bench_pairing_g1_preparation(b: &mut ::test::Bencher) {