clippy + fmt

Author: trbritt

Cargo.toml

@@ -12,7 +12,6 @@ repository = "https://github.com/warlock-labs/sylow.git"
 name = "sylow"
 version = "0.1.0"
 edition = "2021"
-rust-version = "1.70.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [[example]]

src/fields/extensions.rs

@@ -20,9 +20,9 @@
 //! Other specifics must be dealt with on a case-by-case basis.
 
 use crate::fields::fp::FieldExtensionTrait;
+use core::ops::{Add, AddAssign, Neg, Sub, SubAssign};
 use crypto_bigint::subtle::{Choice, ConstantTimeEq};
 use num_traits::Zero;
-use core::ops::{Add, AddAssign, Neg, Sub, SubAssign};
 
 /// A generic struct representing a field extension.
 ///

src/fields/fp.rs

@@ -36,8 +36,8 @@
 //! ----------
 //! 1. <https://cacr.uwaterloo.ca/hac/about/chap14.pdf>
 
-use core::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Rem, Sub, SubAssign};
 use alloc::vec::Vec;
+use core::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Rem, Sub, SubAssign};
 use crypto_bigint::subtle::{Choice, ConditionallySelectable, ConstantTimeEq};
 use crypto_bigint::{
     impl_modulus, modular::ConstMontyParams, rand_core::CryptoRngCore, ConcatMixed, NonZero,
@@ -782,8 +782,8 @@ impl FieldExtensionTrait<2, 2> for Fp {
 // The reference values for non-obvious field elements are generated with Sage.
 #[cfg(test)]
 mod tests {
-    use alloc::format;
     use super::*;
+    use alloc::format;
 
     fn create_field(value: [u64; 4]) -> Fp {
         Fp::new(U256::from_words(value))
@@ -1503,10 +1503,10 @@ mod tests {
     }
 
     mod hash_tests {
+        use super::*;
         use core::hash::{Hash, Hasher};
         use proptest::std_facade::hash_map::DefaultHasher;
         use proptest::std_facade::HashSet;
-        use super::*;
 
         fn calculate_hash<T: Hash>(t: &T) -> u64 {
             let mut s = DefaultHasher::new();

src/fields/fp12.rs

@@ -17,9 +17,9 @@ use crate::fields::extensions::FieldExtension;
 use crate::fields::fp::{FieldExtensionTrait, Fp};
 use crate::fields::fp2::Fp2;
 use crate::fields::fp6::Fp6;
+use core::ops::{Div, DivAssign, Mul, MulAssign};
 use crypto_bigint::{rand_core::CryptoRngCore, subtle::ConditionallySelectable, U256};
 use num_traits::{Inv, One, Zero};
-use core::ops::{Div, DivAssign, Mul, MulAssign};
 use subtle::Choice;
 
 /// Frobenius coefficients for 𝔽ₚ¹².

src/fields/fp2.rs

@@ -9,9 +9,9 @@
 
 use crate::fields::extensions::FieldExtension;
 use crate::fields::fp::{FieldExtensionTrait, Fp, BN254_FP_MODULUS, FP_QUADRATIC_NON_RESIDUE};
+use core::ops::{Div, DivAssign, Mul, MulAssign};
 use crypto_bigint::{rand_core::CryptoRngCore, subtle::ConditionallySelectable, U256};
 use num_traits::{Inv, One, Zero};
-use core::ops::{Div, DivAssign, Mul, MulAssign};
 use subtle::{Choice, ConstantTimeEq, CtOption};
 
 /// Constant representing 1/2 in the base field 𝔽ₚ

src/fields/fp6.rs

@@ -10,9 +10,9 @@
 use crate::fields::extensions::FieldExtension;
 use crate::fields::fp::{FieldExtensionTrait, Fp};
 use crate::fields::fp2::Fp2;
+use core::ops::{Div, DivAssign, Mul, MulAssign};
 use crypto_bigint::{rand_core::CryptoRngCore, subtle::ConditionallySelectable, U256};
 use num_traits::{Inv, One, Zero};
-use core::ops::{Div, DivAssign, Mul, MulAssign};
 use subtle::Choice;
 
 // the following values are a bit difficult to compute. The reason

src/groups/g1.rs

@@ -25,8 +25,8 @@ use crate::Fr;
 use alloc::vec::Vec;
 use crypto_bigint::rand_core::CryptoRngCore;
 use num_traits::{One, Zero};
-use subtle::{Choice, ConditionallySelectable, ConstantTimeEq, CtOption};
 use once_cell::sync::OnceCell;
+use subtle::{Choice, ConditionallySelectable, ConstantTimeEq, CtOption};
 
 /// Affine representation of a point in the 𝔾₁ group
 pub type G1Affine = GroupAffine<1, 1, Fp>;

src/groups/g2.rs

@@ -33,11 +33,11 @@
 // TODO(Notably missing here is the representation as 𝔾₂(𝔽ₚ⁶))
 // rather than as projective or affine coordinates.
 
-use alloc::vec::Vec;
 use crate::fields::fp::{FieldExtensionTrait, Fp, Fr};
 use crate::fields::fp2::Fp2;
 use crate::groups::group::{GroupAffine, GroupError, GroupProjective, GroupTrait};
 use crate::hasher::Expander;
+use alloc::vec::Vec;
 use crypto_bigint::rand_core::CryptoRngCore;
 use crypto_bigint::U256;
 use num_traits::{One, Zero};

src/groups/group.rs

@@ -29,9 +29,9 @@
 
 use crate::fields::fp::{FieldExtensionTrait, Fp};
 use crate::hasher::Expander;
+use core::ops::{Add, Mul, Neg, Sub};
 use crypto_bigint::rand_core::CryptoRngCore;
 use crypto_bigint::subtle::{Choice, ConditionallySelectable, ConstantTimeEq};
-use core::ops::{Add, Mul, Neg, Sub};
 
 /// Errors that can occur when working with group elements.
 #[derive(Debug, Copy, Clone)]

src/groups/gt.rs

@@ -5,10 +5,10 @@ use crate::fields::fp6::Fp6;
 use crate::groups::group::{GroupError, GroupTrait};
 use crate::hasher::Expander;
 use crate::pairing::MillerLoopResult;
+use core::ops::{Add, Mul, Neg, Sub};
 use crypto_bigint::rand_core::CryptoRngCore;
 use crypto_bigint::U256;
 use num_traits::{One, Zero};
-use core::ops::{Add, Mul, Neg, Sub};
 use subtle::{Choice, ConditionallySelectable, ConstantTimeEq};
 
 // Do you have vertigo?

src/groups/mod.rs

@@ -21,16 +21,15 @@ pub(crate) mod gt;
 /// this means each group operation takes sub millisecond time, which is nice.
 #[cfg(test)]
 mod tests {
-    use alloc::string::String;
-    use alloc::vec::Vec;
-    use lazy_static::lazy_static;
-    use serde::{Deserialize, Serialize};
     #[allow(unused_imports)]
-
     use crate::fields::fp::{FieldExtensionTrait, Fp};
     use crate::fields::fp2::Fp2;
     use crate::groups::g1::{G1Affine, G1Projective};
     use crate::groups::g2::{G2Affine, G2Projective};
+    use alloc::string::String;
+    use alloc::vec::Vec;
+    use lazy_static::lazy_static;
+    use serde::{Deserialize, Serialize};
 
     #[derive(Serialize, Deserialize, Clone)]
     struct _G2Coords {
@@ -170,7 +169,7 @@ mod tests {
     lazy_static! {
         static ref REFERENCE_DATA: ReferenceData = {
             let file_content = include_str!("../../src/bn254_reference.json");
-            serde_json::from_str(&file_content).expect("Failed to parse JSON")
+            serde_json::from_str(file_content).expect("Failed to parse JSON")
         };
         static ref G1_REFERENCE_DATA: G1ReferenceData = G1ReferenceData {
             a: REFERENCE_DATA

src/hasher.rs

@@ -9,14 +9,14 @@
 //! These expansion functions are crucial for secure hashing to curve operations,
 //! ensuring uniform distribution and domain separation in cryptographic protocols.
 
-use alloc::vec;
-use alloc::vec::Vec;
 use crate::fields::fp::Fp;
 use crate::utils::u256_to_u512;
+use alloc::vec;
+use alloc::vec::Vec;
+use core::array::TryFromSliceError;
 use crypto_bigint::{Encoding, NonZero, U256, U512};
 use sha3::digest::crypto_common::BlockSizeUser;
 use sha3::digest::{ExtendableOutput, FixedOutput};
-use core::array::TryFromSliceError;
 
 /// Possible errors which may occur during hashing operations.
 #[derive(Debug, Copy, Clone)]
@@ -332,11 +332,11 @@ impl<D: Default + ExtendableOutput> Expander for XOFExpander<D> {
 }
 #[cfg(test)]
 mod tests {
+    use super::*;
     use alloc::format;
     use alloc::string::String;
     use once_cell::sync::OnceCell;
     use proptest::std_facade::HashMap;
-    use super::*;
 
     fn to_hex(bytes: &[u8]) -> String {
         // A simple utility function to convert a byte array into a big endian hex string

src/svdw.rs

@@ -307,9 +307,7 @@ mod tests {
                     assert_eq!(bn254_svdw.z.value(), z, "SvdW z failed");
                     Ok(())
                 }
-                Err(e) => {
-                    Err(e)
-                }
+                Err(e) => Err(e),
             };
             res.expect("Failed to generate constants for curve");
         }
@@ -341,9 +339,7 @@ mod tests {
                         GroupProjective::<1, 1, Fp>::new([_d.x, _d.y, _d.z]).expect("Map failed");
                     Ok(())
                 }
-                Err(e) => {
-                    Err(e)
-                }
+                Err(e) => Err(e),
             };
             res.expect("Failed to generate value on curve");
         }