Fixes and cargo fmt

matter-labs · Jul 30, 2024 · c806fd8 · c806fd8
1 parent 0dd8673
commit c806fd8
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 5 deletions.
diff --git a/src/gadgets/queue/mod.rs b/src/gadgets/queue/mod.rs
@@ -6,7 +6,7 @@ use super::boolean::Boolean;
 use super::num::Num;
 use super::traits::allocatable::*;
 use super::u32::UInt32;
-use super::{traits::encodable::CircuitEncodable, *};
+use super::{traits::encodable::CircuitEncodable, traits::encodable::WitnessVarLengthEncodable, *};
 use crate::algebraic_props::round_function::AbsorptionModeOverwrite;
 use crate::algebraic_props::round_function::AlgebraicRoundFunction;
 use crate::config::CSConfig;
@@ -582,14 +582,28 @@ pub fn simulate_new_tail<
 use crate::gadgets::traits::encodable::CircuitVarLengthEncodable;
 use crate::serde_utils::BigArraySerde;
 
-#[derive(Derivative, CSAllocatable, CSSelectable, CSVarLengthEncodable, WitVarLengthEncodable, WitnessHookable)]
+#[derive(
+    Derivative,
+    CSAllocatable,
+    CSSelectable,
+    CSVarLengthEncodable,
+    WitVarLengthEncodable,
+    WitnessHookable,
+)]
 #[derivative(Clone, Copy, Debug)]
 pub struct QueueState<F: SmallField, const N: usize> {
     pub head: [Num<F>; N],
     pub tail: QueueTailState<F, N>,
 }
 
-#[derive(Derivative, CSAllocatable, CSSelectable, CSVarLengthEncodable, WitVarLengthEncodable, WitnessHookable)]
+#[derive(
+    Derivative,
+    CSAllocatable,
+    CSSelectable,
+    CSVarLengthEncodable,
+    WitVarLengthEncodable,
+    WitnessHookable,
+)]
 #[derivative(Clone, Copy, Debug)]
 pub struct QueueTailState<F: SmallField, const N: usize> {
     pub tail: [Num<F>; N],

diff --git a/src/gadgets/queue/queue_optimizer/sponge_optimizer.rs b/src/gadgets/queue/queue_optimizer/sponge_optimizer.rs
@@ -1,6 +1,13 @@
 use super::*;
 
-#[derive(Derivative, CSAllocatable, CSSelectable, CSVarLengthEncodable, WitVarLengthEncodable, WitnessHookable)]
+#[derive(
+    Derivative,
+    CSAllocatable,
+    CSSelectable,
+    CSVarLengthEncodable,
+    WitVarLengthEncodable,
+    WitnessHookable,
+)]
 #[derivative(Clone, Debug, Copy)]
 pub struct SpongeRoundRequest<F: SmallField, const SWIDTH: usize> {
     pub initial_state: [Num<F>; SWIDTH],

diff --git a/src/gadgets/recursion/allocated_vk.rs b/src/gadgets/recursion/allocated_vk.rs
@@ -142,4 +142,3 @@ impl<F: SmallField, H: RecursiveTreeHasher<F, Num<F>>> WitnessVarLengthEncodable
         }
     }
 }
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -142,4 +142,3 @@ impl<F: SmallField, H: RecursiveTreeHasher<F, Num<F>>> WitnessVarLengthEncodable
		}
		}
		}