diff --git a/bellman/src/groth16/mod.rs b/bellman/src/groth16/mod.rs index 428176bf9..9fa3bc880 100644 --- a/bellman/src/groth16/mod.rs +++ b/bellman/src/groth16/mod.rs @@ -3,8 +3,8 @@ use pairing::{Engine, PairingCurveAffine}; use crate::SynthesisError; -use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt}; use crate::multiexp::SourceBuilder; +use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt}; use std::io::{self, Read, Write}; use std::sync::Arc; diff --git a/pairing/src/bls12_381/ec.rs b/pairing/src/bls12_381/ec.rs index 3fc2b43a1..675999167 100644 --- a/pairing/src/bls12_381/ec.rs +++ b/pairing/src/bls12_381/ec.rs @@ -622,11 +622,11 @@ macro_rules! curve_impl { pub mod g1 { use super::super::{Bls12, Fq, Fq12, FqRepr, Fr, FrRepr}; use super::g2::G2Affine; + use crate::{Engine, PairingCurveAffine}; use ff::{BitIterator, Field, PrimeField, PrimeFieldRepr, SqrtField}; use group::{CurveAffine, CurveProjective, EncodedPoint, GroupDecodingError}; use rand_core::RngCore; use std::fmt; - use crate::{Engine, PairingCurveAffine}; curve_impl!( "G1", @@ -1291,11 +1291,11 @@ pub mod g1 { pub mod g2 { use super::super::{Bls12, Fq, Fq12, Fq2, FqRepr, Fr, FrRepr}; use super::g1::G1Affine; + use crate::{Engine, PairingCurveAffine}; use ff::{BitIterator, Field, PrimeField, PrimeFieldRepr, SqrtField}; use group::{CurveAffine, CurveProjective, EncodedPoint, GroupDecodingError}; use rand_core::RngCore; use std::fmt; - use crate::{Engine, PairingCurveAffine}; curve_impl!( "G2", diff --git a/zcash_primitives/src/group_hash.rs b/zcash_primitives/src/group_hash.rs index e67ca4905..8549c5e3e 100644 --- a/zcash_primitives/src/group_hash.rs +++ b/zcash_primitives/src/group_hash.rs @@ -2,8 +2,8 @@ use crate::jubjub::{edwards, JubjubEngine, PrimeOrder}; use ff::PrimeField; -use blake2s_simd::Params; use crate::constants; +use blake2s_simd::Params; /// Produces a random point in the Jubjub curve. /// The point is guaranteed to be prime order diff --git a/zcash_primitives/src/pedersen_hash.rs b/zcash_primitives/src/pedersen_hash.rs index 0274a1e66..835e9c730 100644 --- a/zcash_primitives/src/pedersen_hash.rs +++ b/zcash_primitives/src/pedersen_hash.rs @@ -1,5 +1,5 @@ -use ff::{Field, PrimeField, PrimeFieldRepr}; use crate::jubjub::*; +use ff::{Field, PrimeField, PrimeFieldRepr}; #[derive(Copy, Clone)] pub enum Personalization { diff --git a/zcash_primitives/src/transaction/builder.rs b/zcash_primitives/src/transaction/builder.rs index 244f41b29..a5df4c878 100644 --- a/zcash_primitives/src/transaction/builder.rs +++ b/zcash_primitives/src/transaction/builder.rs @@ -1,5 +1,6 @@ //! Structs for building transactions. +use crate::zip32::ExtendedSpendingKey; use crate::{ jubjub::fs::Fs, primitives::{Diversifier, Note, PaymentAddress}, @@ -7,7 +8,6 @@ use crate::{ use ff::Field; use pairing::bls12_381::{Bls12, Fr}; use rand::{rngs::OsRng, seq::SliceRandom, CryptoRng, RngCore}; -use crate::zip32::ExtendedSpendingKey; use crate::{ keys::OutgoingViewingKey,