diff --git a/rustfmt.toml b/rustfmt.toml new file mode 100644 index 00000000..65106950 --- /dev/null +++ b/rustfmt.toml @@ -0,0 +1,2 @@ +unstable_features = true +group_imports = "StdExternalCrate" diff --git a/src/bin/bench_ldes.rs b/src/bin/bench_ldes.rs index 1fb02d65..e6d7c457 100644 --- a/src/bin/bench_ldes.rs +++ b/src/bin/bench_ldes.rs @@ -1,10 +1,9 @@ use std::time::Instant; -use rayon::prelude::*; - use plonky2::field::crandall_field::CrandallField; use plonky2::field::field::Field; use plonky2::polynomial::polynomial::PolynomialValues; +use rayon::prelude::*; type F = CrandallField; diff --git a/src/bin/bench_recursion.rs b/src/bin/bench_recursion.rs index 35ba280d..19f7716c 100644 --- a/src/bin/bench_recursion.rs +++ b/src/bin/bench_recursion.rs @@ -1,5 +1,4 @@ use env_logger::Env; - use plonky2::circuit_builder::CircuitBuilder; use plonky2::circuit_data::CircuitConfig; use plonky2::field::crandall_field::CrandallField; diff --git a/src/field/crandall_field.rs b/src/field/crandall_field.rs index 46dcb172..0cee8860 100644 --- a/src/field/crandall_field.rs +++ b/src/field/crandall_field.rs @@ -1,5 +1,7 @@ use std::fmt; use std::fmt::{Debug, Display, Formatter}; +use std::hash::{Hash, Hasher}; +use std::iter::{Product, Sum}; use std::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Sub, SubAssign}; use num::Integer; @@ -8,8 +10,6 @@ use crate::field::extension_field::quadratic::QuadraticCrandallField; use crate::field::extension_field::quartic::QuarticCrandallField; use crate::field::extension_field::Extendable; use crate::field::field::Field; -use std::hash::{Hash, Hasher}; -use std::iter::{Product, Sum}; /// EPSILON = 9 * 2**28 - 1 const EPSILON: u64 = 2415919103; diff --git a/src/field/extension_field/algebra.rs b/src/field/extension_field/algebra.rs index eac0bbd8..996053bf 100644 --- a/src/field/extension_field/algebra.rs +++ b/src/field/extension_field/algebra.rs @@ -1,8 +1,9 @@ -use crate::field::extension_field::OEF; use std::fmt::{Debug, Display, Formatter}; use std::iter::{Product, Sum}; use std::ops::{Add, AddAssign, Mul, MulAssign, Neg, Sub, SubAssign}; +use crate::field::extension_field::OEF; + /// Let `F_D` be the optimal extension field `F[X]/(X^D-W)`. Then `ExtensionAlgebra` is the quotient `F_D[X]/(X^D-W)`. /// It's a `D`-dimensional algebra over `F_D` useful to lift the multiplication over `F_D` to a multiplication over `(F_D)^D`. #[derive(Copy, Clone)] @@ -154,11 +155,12 @@ impl, const D: usize> PolynomialCoeffsAlgebra { #[cfg(test)] mod tests { + use itertools::Itertools; + use crate::field::crandall_field::CrandallField; use crate::field::extension_field::algebra::ExtensionAlgebra; use crate::field::extension_field::{Extendable, FieldExtension}; use crate::field::field::Field; - use itertools::Itertools; /// Tests that the multiplication on the extension algebra lifts that of the field extension. fn test_extension_algebra, const D: usize>() { diff --git a/src/field/extension_field/quadratic.rs b/src/field/extension_field/quadratic.rs index 27fc33a1..b61ccbaa 100644 --- a/src/field/extension_field/quadratic.rs +++ b/src/field/extension_field/quadratic.rs @@ -1,12 +1,14 @@ -use crate::field::crandall_field::CrandallField; -use crate::field::extension_field::{FieldExtension, OEF}; -use crate::field::field::Field; -use rand::Rng; use std::fmt::{Debug, Display, Formatter}; use std::hash::Hash; use std::iter::{Product, Sum}; use std::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Sub, SubAssign}; +use rand::Rng; + +use crate::field::crandall_field::CrandallField; +use crate::field::extension_field::{FieldExtension, OEF}; +use crate::field::field::Field; + #[derive(Copy, Clone, Eq, PartialEq, Hash)] pub struct QuadraticCrandallField([CrandallField; 2]); diff --git a/src/field/field_testing.rs b/src/field/field_testing.rs index 7d2339af..53e9c63c 100644 --- a/src/field/field_testing.rs +++ b/src/field/field_testing.rs @@ -142,9 +142,10 @@ pub fn run_binaryop_test_cases( macro_rules! test_arithmetic { ($field:ty) => { mod arithmetic { - use crate::field::field::Field; use std::ops::{Add, Mul, Neg, Sub}; + use crate::field::field::Field; + // Can be 32 or 64; doesn't have to be computer's actual word // bits. Choosing 32 gives more tests... const WORD_BITS: usize = 32; diff --git a/src/merkle_tree.rs b/src/merkle_tree.rs index db41b8a3..ed092cff 100644 --- a/src/merkle_tree.rs +++ b/src/merkle_tree.rs @@ -84,11 +84,10 @@ impl MerkleTree { mod tests { use anyhow::Result; + use super::*; use crate::field::crandall_field::CrandallField; use crate::merkle_proofs::verify_merkle_proof; - use super::*; - fn random_data(n: usize, k: usize) -> Vec> { (0..n).map(|_| F::rand_vec(k)).collect() } diff --git a/src/polynomial/commitment.rs b/src/polynomial/commitment.rs index 5169748b..355a56e4 100644 --- a/src/polynomial/commitment.rs +++ b/src/polynomial/commitment.rs @@ -340,9 +340,8 @@ mod tests { } mod quadratic { - use crate::field::crandall_field::CrandallField; - use super::*; + use crate::field::crandall_field::CrandallField; #[test] fn test_batch_polynomial_commitment() -> Result<()> { @@ -351,9 +350,8 @@ mod tests { } mod quartic { - use crate::field::crandall_field::CrandallField; - use super::*; + use crate::field::crandall_field::CrandallField; #[test] fn test_batch_polynomial_commitment() -> Result<()> { diff --git a/src/polynomial/polynomial.rs b/src/polynomial/polynomial.rs index 7c30ec02..9f605051 100644 --- a/src/polynomial/polynomial.rs +++ b/src/polynomial/polynomial.rs @@ -1,11 +1,11 @@ use std::cmp::max; +use std::iter::Sum; use std::ops::{Add, Mul, Sub}; use crate::field::extension_field::Extendable; use crate::field::fft::{fft, ifft}; use crate::field::field::Field; use crate::util::log2_strict; -use std::iter::Sum; /// A polynomial in point-value form. /// @@ -279,9 +279,8 @@ mod tests { use rand::{thread_rng, Rng}; - use crate::field::crandall_field::CrandallField; - use super::*; + use crate::field::crandall_field::CrandallField; #[test] fn test_trimmed() { diff --git a/src/proof.rs b/src/proof.rs index 12735b73..b1772c45 100644 --- a/src/proof.rs +++ b/src/proof.rs @@ -1,3 +1,5 @@ +use std::convert::TryInto; + use crate::field::extension_field::Extendable; use crate::field::field::Field; use crate::fri::FriConfig; @@ -5,7 +7,6 @@ use crate::merkle_proofs::{MerkleProof, MerkleProofTarget}; use crate::polynomial::commitment::{ListPolynomialCommitment, OpeningProof}; use crate::polynomial::polynomial::PolynomialCoeffs; use crate::target::Target; -use std::convert::TryInto; /// Represents a ~256 bit hash output. #[derive(Copy, Clone, Debug, Eq, PartialEq)]