Same formatting as in ceno

Author: matthiasgoergens

circ_blocks/circ_fields/src/ext_field.rs

@@ -1,6 +1,6 @@
 use ff::{
-    derive::subtle::{Choice, ConditionallySelectable, ConstantTimeEq},
     Field,
+    derive::subtle::{Choice, ConditionallySelectable, ConstantTimeEq},
 };
 use rand::RngCore;
 use serde::{Deserialize, Serialize};

circ_blocks/circ_fields/src/ff_field.rs

@@ -85,11 +85,7 @@ macro_rules! def_field {
                 fn from(mut i: i64) -> Self {
                     let u = i.abs_diff(0);
                     let neg = i < 0;
-                    if neg {
-                        -Ft::from(u)
-                    } else {
-                        Ft::from(u)
-                    }
+                    if neg { -Ft::from(u) } else { Ft::from(u) }
                 }
             }
 
@@ -100,7 +96,7 @@ macro_rules! def_field {
 
             #[cfg(test)]
             mod test {
-                use super::{Ft, FMOD};
+                use super::{FMOD, Ft};
                 use ff::Field;
                 use rand::thread_rng;
                 use rug::Integer;

circ_blocks/circ_fields/src/int_field.rs

@@ -4,13 +4,15 @@
 use datasize::DataSize;
 use paste::paste;
 use rug::{
-    ops::{RemRounding, RemRoundingAssign},
     Integer,
+    ops::{RemRounding, RemRoundingAssign},
 };
 use serde::{Deserialize, Serialize};
-use std::fmt::{self, Display, Formatter};
-use std::ops::Deref;
-use std::sync::Arc;
+use std::{
+    fmt::{self, Display, Formatter},
+    ops::Deref,
+    sync::Arc,
+};
 
 #[derive(PartialEq, Eq, Clone, Debug, PartialOrd, Ord, Hash, Serialize, Deserialize, DataSize)]
 pub struct IntField {

circ_blocks/circ_fields/src/lib.rs

@@ -14,10 +14,10 @@ pub mod moduli {
 }
 
 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,
+    F_BLS12381_FMOD, F_BLS12381_FMOD_ARC, F_BN254_FMOD, F_BN254_FMOD_ARC, F_CURVE25519_FMOD,
+    F_CURVE25519_FMOD_ARC, F_GOLDILOCKS_FMOD, F_GOLDILOCKS_FMOD_ARC, FBls12381, FBn254,
+    FCurve25519, FGoldilocks,
 };
 use int_field::IntField;
 
@@ -26,9 +26,11 @@ use ff::Field;
 use paste::paste;
 use rug::Integer;
 use serde::{Deserialize, Serialize};
-use std::fmt::{self, Debug, Display, Formatter};
-use std::ops::{Add, AddAssign, Mul, MulAssign, Neg, Sub, SubAssign};
-use std::sync::Arc;
+use std::{
+    fmt::{self, Debug, Display, Formatter},
+    ops::{Add, AddAssign, Mul, MulAssign, Neg, Sub, SubAssign},
+    sync::Arc,
+};
 
 // TODO: rework this using macros?
 

circ_blocks/circ_fields/src/test.rs

@@ -1,6 +1,5 @@
 use super::*;
-use rand::thread_rng;
-use rand::Rng;
+use rand::{Rng, thread_rng};
 use rug::ops::RemRounding;
 
 #[test]

circ_blocks/circ_hc/examples/u32.rs

@@ -1,4 +1,4 @@
-use circ_hc::{generate_hashcons_rc, Node as NodeTrait, Table as TableTrait};
+use circ_hc::{Node as NodeTrait, Table as TableTrait, generate_hashcons_rc};
 
 generate_hashcons_rc!(u32);
 

circ_blocks/circ_hc/src/hashconsing/example_u8.rs

@@ -1,6 +1,5 @@
 // Warning: this file is generated from src/template.rs and generate_u8.zsh
-use hashconsing::*;
-use hashconsing::{HConsed, HashConsign};
+use hashconsing::{HConsed, HashConsign, *};
 
 use crate::Id;
 

circ_blocks/circ_hc/src/hashconsing/macro_.rs

@@ -2,8 +2,7 @@
 #[macro_export]
 macro_rules! generate_hashcons_hashconsing {
     ($Op:ty) => {
-        use hashconsing::*;
-        use hashconsing::{HConsed, HashConsign};
+        use hashconsing::{HConsed, HashConsign, *};
 
         use $crate::Id;
 

circ_blocks/circ_hc/src/hashconsing/template.rs

@@ -1,5 +1,4 @@
-use hashconsing::*;
-use hashconsing::{HConsed, HashConsign};
+use hashconsing::{HConsed, HashConsign, *};
 
 use std::net::SocketAddrV6 as TemplateOp;
 

circ_blocks/circ_hc/src/lib.rs

@@ -1,5 +1,7 @@
-use std::cmp::{Eq, Ord, PartialEq, PartialOrd};
-use std::hash::Hash;
+use std::{
+    cmp::{Eq, Ord, PartialEq, PartialOrd},
+    hash::Hash,
+};
 
 #[cfg(feature = "hashconsing")]
 pub mod hashconsing;