From d9a128888fed78009d7bee1dbb846974348f8a76 Mon Sep 17 00:00:00 2001 From: Eirik Ogilvie-Wigley Date: Tue, 20 Aug 2019 17:07:40 -0600 Subject: [PATCH] cargo fix --edition for pairing --- src/bls12_381/ec.rs | 8 ++++---- src/bls12_381/fq.rs | 10 +++++----- src/bls12_381/fq12.rs | 4 ++-- src/bls12_381/fq2.rs | 6 +++--- src/bls12_381/fq6.rs | 4 ++-- src/bls12_381/fr.rs | 10 +++++----- src/bls12_381/mod.rs | 2 +- src/bls12_381/tests/mod.rs | 2 +- src/lib.rs | 2 +- src/tests/engine.rs | 2 +- 10 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/bls12_381/ec.rs b/src/bls12_381/ec.rs index 9a78e37d6..3fc2b43a1 100644 --- a/src/bls12_381/ec.rs +++ b/src/bls12_381/ec.rs @@ -626,7 +626,7 @@ pub mod g1 { use group::{CurveAffine, CurveProjective, EncodedPoint, GroupDecodingError}; use rand_core::RngCore; use std::fmt; - use {Engine, PairingCurveAffine}; + use crate::{Engine, PairingCurveAffine}; curve_impl!( "G1", @@ -934,7 +934,7 @@ pub mod g1 { #[test] fn g1_generator() { - use SqrtField; + use crate::SqrtField; let mut x = Fq::zero(); let mut i = 0; @@ -1295,7 +1295,7 @@ pub mod g2 { use group::{CurveAffine, CurveProjective, EncodedPoint, GroupDecodingError}; use rand_core::RngCore; use std::fmt; - use {Engine, PairingCurveAffine}; + use crate::{Engine, PairingCurveAffine}; curve_impl!( "G2", @@ -1640,7 +1640,7 @@ pub mod g2 { #[test] fn g2_generator() { - use SqrtField; + use crate::SqrtField; let mut x = Fq2::zero(); let mut i = 0; diff --git a/src/bls12_381/fq.rs b/src/bls12_381/fq.rs index d27254569..08135e3c1 100644 --- a/src/bls12_381/fq.rs +++ b/src/bls12_381/fq.rs @@ -2225,10 +2225,10 @@ fn test_fq_root_of_unity() { #[test] fn fq_field_tests() { - ::tests::field::random_field_tests::(); - ::tests::field::random_sqrt_tests::(); - ::tests::field::random_frobenius_tests::(Fq::char(), 13); - ::tests::field::from_str_tests::(); + crate::tests::field::random_field_tests::(); + crate::tests::field::random_sqrt_tests::(); + crate::tests::field::random_frobenius_tests::(Fq::char(), 13); + crate::tests::field::from_str_tests::(); } #[test] @@ -2244,7 +2244,7 @@ fn test_fq_ordering() { #[test] fn fq_repr_tests() { - ::tests::repr::random_repr_tests::(); + crate::tests::repr::random_repr_tests::(); } #[test] diff --git a/src/bls12_381/fq12.rs b/src/bls12_381/fq12.rs index dcfdef14f..097b6926c 100644 --- a/src/bls12_381/fq12.rs +++ b/src/bls12_381/fq12.rs @@ -187,6 +187,6 @@ fn test_fq12_mul_by_014() { fn fq12_field_tests() { use ff::PrimeField; - ::tests::field::random_field_tests::(); - ::tests::field::random_frobenius_tests::(super::fq::Fq::char(), 13); + crate::tests::field::random_field_tests::(); + crate::tests::field::random_frobenius_tests::(super::fq::Fq::char(), 13); } diff --git a/src/bls12_381/fq2.rs b/src/bls12_381/fq2.rs index 781828055..3587d7350 100644 --- a/src/bls12_381/fq2.rs +++ b/src/bls12_381/fq2.rs @@ -958,7 +958,7 @@ fn test_fq2_mul_nonresidue() { fn fq2_field_tests() { use ff::PrimeField; - ::tests::field::random_field_tests::(); - ::tests::field::random_sqrt_tests::(); - ::tests::field::random_frobenius_tests::(super::fq::Fq::char(), 13); + crate::tests::field::random_field_tests::(); + crate::tests::field::random_sqrt_tests::(); + crate::tests::field::random_frobenius_tests::(super::fq::Fq::char(), 13); } diff --git a/src/bls12_381/fq6.rs b/src/bls12_381/fq6.rs index b85c95d15..0f434ff84 100644 --- a/src/bls12_381/fq6.rs +++ b/src/bls12_381/fq6.rs @@ -378,6 +378,6 @@ fn test_fq6_mul_by_01() { fn fq6_field_tests() { use ff::PrimeField; - ::tests::field::random_field_tests::(); - ::tests::field::random_frobenius_tests::(super::fq::Fq::char(), 13); + crate::tests::field::random_field_tests::(); + crate::tests::field::random_frobenius_tests::(super::fq::Fq::char(), 13); } diff --git a/src/bls12_381/fr.rs b/src/bls12_381/fr.rs index 018e67a6e..76f3ffe07 100644 --- a/src/bls12_381/fr.rs +++ b/src/bls12_381/fr.rs @@ -1015,13 +1015,13 @@ fn test_fr_root_of_unity() { #[test] fn fr_field_tests() { - ::tests::field::random_field_tests::(); - ::tests::field::random_sqrt_tests::(); - ::tests::field::random_frobenius_tests::(Fr::char(), 13); - ::tests::field::from_str_tests::(); + crate::tests::field::random_field_tests::(); + crate::tests::field::random_sqrt_tests::(); + crate::tests::field::random_frobenius_tests::(Fr::char(), 13); + crate::tests::field::from_str_tests::(); } #[test] fn fr_repr_tests() { - ::tests::repr::random_repr_tests::(); + crate::tests::repr::random_repr_tests::(); } diff --git a/src/bls12_381/mod.rs b/src/bls12_381/mod.rs index deb6ffc6c..8fc6bbdfd 100644 --- a/src/bls12_381/mod.rs +++ b/src/bls12_381/mod.rs @@ -366,5 +366,5 @@ impl G2Prepared { #[test] fn bls12_engine_tests() { - ::tests::engine::engine_tests::(); + crate::tests::engine::engine_tests::(); } diff --git a/src/bls12_381/tests/mod.rs b/src/bls12_381/tests/mod.rs index b5b75a330..636fcfef7 100644 --- a/src/bls12_381/tests/mod.rs +++ b/src/bls12_381/tests/mod.rs @@ -2,7 +2,7 @@ use ff::PrimeFieldRepr; use group::{CurveAffine, CurveProjective, EncodedPoint, GroupDecodingError}; use super::*; -use *; +use crate::*; #[test] fn test_pairing_result_against_relic() { diff --git a/src/lib.rs b/src/lib.rs index 952185c74..4e1110719 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -87,7 +87,7 @@ pub trait Engine: ScalarEngine { >; /// Perform final exponentiation of the result of a miller loop. - fn final_exponentiation(&Self::Fqk) -> Option; + fn final_exponentiation(_: &Self::Fqk) -> Option; /// Performs a complete pairing operation `(p, q)`. fn pairing(p: G1, q: G2) -> Self::Fqk diff --git a/src/tests/engine.rs b/src/tests/engine.rs index fc74f1bbe..b6ae50edb 100644 --- a/src/tests/engine.rs +++ b/src/tests/engine.rs @@ -2,7 +2,7 @@ use group::{CurveAffine, CurveProjective}; use rand_core::SeedableRng; use rand_xorshift::XorShiftRng; -use {Engine, Field, PairingCurveAffine, PrimeField}; +use crate::{Engine, Field, PairingCurveAffine, PrimeField}; pub fn engine_tests() { let mut rng = XorShiftRng::from_seed([