Merge pull request #30 from scroll-tech/matthias/formatting

Run `cargo fmt` everywhere

This is to make the subsequent PRs smaller.

Author: matthiasgoergens

circ_blocks/circ_fields/src/ext_field.rs

@@ -1,14 +1,19 @@
-use serde::{Serialize, Deserialize};
-use std::ops::{Neg, Add, AddAssign, Mul, MulAssign, Sub, SubAssign};
-use ff::{derive::subtle::{Choice, ConditionallySelectable, ConstantTimeEq}, Field};
+use ff::{
+    derive::subtle::{Choice, ConditionallySelectable, ConstantTimeEq},
+    Field,
+};
 use rand::RngCore;
+use serde::{Deserialize, Serialize};
+use std::ops::{Add, AddAssign, Mul, MulAssign, Neg, Sub, SubAssign};
 
 use crate::ff_field::FGoldilocks;
 use ff::derive::subtle::CtOption;
 use rug::Integer;
 
 /// Degree 2 FGoldilocks extension field mod x^2 - 7
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize, Hash)]
+#[derive(
+    Clone, Copy, Debug, Default, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize, Hash,
+)]
 pub struct FGoldilocksExt2(pub [FGoldilocks; 2]);
 
 impl FGoldilocksExt2 {
@@ -431,4 +436,4 @@ impl std::convert::From<&FGoldilocksExt2> for Integer {
         assert_eq!(f.0[1], FGoldilocks::from(0u64));
         Integer::from(&f.0[0])
     }
-}
+}

circ_blocks/circ_fields/src/ff_field.rs

@@ -151,9 +151,4 @@ def_field!(
     4
 );
 
-def_field!(
-    f_goldilocks,
-    "18446744069414584321",
-    "7",
-    2
-);
+def_field!(f_goldilocks, "18446744069414584321", "7", 2);

circ_blocks/circ_fields/src/lib.rs

@@ -3,20 +3,22 @@
 #![warn(missing_docs)]
 #![deny(warnings)]
 
+mod ext_field;
 mod ff_field;
 mod int_field;
-mod ext_field;
 pub mod size;
 
 /// Exports for moduli defined in this crate, as ARCs
 pub mod moduli {
     pub use super::ff_field::{F_BLS12381_FMOD_ARC, F_BN254_FMOD_ARC, F_CURVE25519_FMOD_ARC};
 }
 
-use ff_field::{FBls12381, FBn254, FCurve25519, FGoldilocks};
 use ext_field::FGoldilocksExt2;
+use ff_field::{FBls12381, FBn254, FCurve25519, FGoldilocks};
 use ff_field::{F_BLS12381_FMOD, F_BN254_FMOD, F_CURVE25519_FMOD, F_GOLDILOCKS_FMOD};
-use ff_field::{F_BLS12381_FMOD_ARC, F_BN254_FMOD_ARC, F_CURVE25519_FMOD_ARC, F_GOLDILOCKS_FMOD_ARC};
+use ff_field::{
+    F_BLS12381_FMOD_ARC, F_BN254_FMOD_ARC, F_CURVE25519_FMOD_ARC, F_GOLDILOCKS_FMOD_ARC,
+};
 use int_field::IntField;
 
 use datasize::DataSize;
@@ -573,10 +575,16 @@ impl FieldV {
         match &*self.full_cow() {
             FullFieldV::FBls12381(pf) => Self::from(FullFieldV::FBls12381(pf.invert().unwrap())),
             FullFieldV::FBn254(pf) => Self::from(FullFieldV::FBn254(pf.invert().unwrap())),
-            FullFieldV::FCurve25519(pf) => Self::from(FullFieldV::FCurve25519(pf.invert().unwrap())),
+            FullFieldV::FCurve25519(pf) => {
+                Self::from(FullFieldV::FCurve25519(pf.invert().unwrap()))
+            }
             FullFieldV::IntField(i) => Self::from(FullFieldV::IntField(i.clone().recip())),
-            FullFieldV::FGoldilocks(pf) => Self::from(FullFieldV::FGoldilocks(pf.invert().unwrap())),
-            FullFieldV::FGoldilocksExt2(pf) => Self::from(FullFieldV::FGoldilocksExt2(pf.invert().unwrap())),
+            FullFieldV::FGoldilocks(pf) => {
+                Self::from(FullFieldV::FGoldilocks(pf.invert().unwrap()))
+            }
+            FullFieldV::FGoldilocksExt2(pf) => {
+                Self::from(FullFieldV::FGoldilocksExt2(pf.invert().unwrap()))
+            }
         }
     }
 
@@ -587,10 +595,16 @@ impl FieldV {
         match &*self.full_cow() {
             FullFieldV::FBls12381(pf) => Self::from(FullFieldV::FBls12381(pf.invert().unwrap())),
             FullFieldV::FBn254(pf) => Self::from(FullFieldV::FBn254(pf.invert().unwrap())),
-            FullFieldV::FCurve25519(pf) => Self::from(FullFieldV::FCurve25519(pf.invert().unwrap())),
+            FullFieldV::FCurve25519(pf) => {
+                Self::from(FullFieldV::FCurve25519(pf.invert().unwrap()))
+            }
             FullFieldV::IntField(i) => Self::from(FullFieldV::IntField(i.clone().recip())),
-            FullFieldV::FGoldilocks(pf) => Self::from(FullFieldV::FGoldilocks(pf.invert().unwrap())),
-            FullFieldV::FGoldilocksExt2(pf) => Self::from(FullFieldV::FGoldilocksExt2(pf.invert().unwrap())),
+            FullFieldV::FGoldilocks(pf) => {
+                Self::from(FullFieldV::FGoldilocks(pf.invert().unwrap()))
+            }
+            FullFieldV::FGoldilocksExt2(pf) => {
+                Self::from(FullFieldV::FGoldilocksExt2(pf.invert().unwrap()))
+            }
         }
     }
 
@@ -625,7 +639,7 @@ impl FieldV {
             Err(FullFieldV::FCurve25519(pf)) => bool::from(pf.is_one()),
             Err(FullFieldV::IntField(i)) => i.i == 1,
             Err(FullFieldV::FGoldilocks(pf)) => bool::from(pf.is_one()),
-            Err(FullFieldV::FGoldilocksExt2(pf)) => { pf == &FGoldilocksExt2::one() },
+            Err(FullFieldV::FGoldilocksExt2(pf)) => pf == &FGoldilocksExt2::one(),
         }
     }
 
@@ -910,9 +924,15 @@ impl Neg for FieldV {
             match self.full_mut() {
                 FullFieldV::FBls12381(pf) => Self::from(FullFieldV::FBls12381(pf.clone().neg())),
                 FullFieldV::FBn254(pf) => Self::from(FullFieldV::FBn254(pf.clone().neg())),
-                FullFieldV::FCurve25519(pf) => Self::from(FullFieldV::FCurve25519(pf.clone().neg())),
-                FullFieldV::FGoldilocks(pf) => Self::from(FullFieldV::FGoldilocks(pf.clone().neg())),
-                FullFieldV::FGoldilocksExt2(pf) => Self::from(FullFieldV::FGoldilocksExt2(pf.clone().neg())),
+                FullFieldV::FCurve25519(pf) => {
+                    Self::from(FullFieldV::FCurve25519(pf.clone().neg()))
+                }
+                FullFieldV::FGoldilocks(pf) => {
+                    Self::from(FullFieldV::FGoldilocks(pf.clone().neg()))
+                }
+                FullFieldV::FGoldilocksExt2(pf) => {
+                    Self::from(FullFieldV::FGoldilocksExt2(pf.clone().neg()))
+                }
                 FullFieldV::IntField(i) => Self::from(FullFieldV::IntField(i.clone().neg())),
             }
         } else {