From 197d9e850bc047feb3b2e3c3b450bb3dac103e43 Mon Sep 17 00:00:00 2001
From: sinu <65924192+sinui0@users.noreply.github.com>
Date: Tue, 25 Jun 2024 14:17:20 -0700
Subject: [PATCH] fix: clippy --fix

---
 crates/mpz-common/Cargo.toml              |  2 +-
 crates/mpz-common/src/cpu.rs              | 18 ++++++++----------
 crates/mpz-common/src/id.rs               |  1 +
 crates/mpz-fields/src/lib.rs              |  2 +-
 crates/mpz-garble-core/src/evaluator.rs   | 10 +---------
 crates/mpz-garble-core/src/generator.rs   | 14 +++-----------
 crates/mpz-garble-core/src/lib.rs         |  4 ++--
 crates/mpz-garble/src/protocol/deap/vm.rs |  2 +-
 crates/mpz-ot-core/src/test.rs            | 18 ++++++++++--------
 crates/mpz-ot/src/ideal/ot.rs             |  3 ++-
 10 files changed, 30 insertions(+), 44 deletions(-)

diff --git a/crates/mpz-common/Cargo.toml b/crates/mpz-common/Cargo.toml
index 7d057cc4..2dd1e3f5 100644
--- a/crates/mpz-common/Cargo.toml
+++ b/crates/mpz-common/Cargo.toml
@@ -25,7 +25,7 @@ serde = { workspace = true, features = ["derive"] }
 pollster.workspace = true
 rayon = { workspace = true, optional = true }
 cfg-if.workspace = true
-tokio = { workspace = true, optional = true, default-features = false }
+tokio = { workspace = true, optional = true }
 
 [dev-dependencies]
 tokio = { workspace = true, features = [
diff --git a/crates/mpz-common/src/cpu.rs b/crates/mpz-common/src/cpu.rs
index 7cc4766c..e161a1dd 100644
--- a/crates/mpz-common/src/cpu.rs
+++ b/crates/mpz-common/src/cpu.rs
@@ -33,12 +33,12 @@ mod st {
 
         /// Executes a closure on the CPU backend.
         #[inline]
-        pub fn blocking<F, R>(f: F) -> impl Future<Output = R> + Send
+        pub async fn blocking<F, R>(f: F) -> R
         where
             F: FnOnce() -> R + Send + 'static,
             R: Send + 'static,
         {
-            async move { f() }
+            f()
         }
     }
 
@@ -88,18 +88,16 @@ mod rayon_backend {
         }
 
         /// Executes a closure on the CPU backend.
-        pub fn blocking<F, R>(f: F) -> impl Future<Output = R> + Send
+        pub async fn blocking<F, R>(f: F) -> R
         where
             F: FnOnce() -> R + Send + 'static,
             R: Send + 'static,
         {
-            async move {
-                let (sender, receiver) = oneshot::channel();
-                rayon::spawn(move || {
-                    _ = sender.send(f());
-                });
-                receiver.await.expect("worker thread does not drop channel")
-            }
+            let (sender, receiver) = oneshot::channel();
+            rayon::spawn(move || {
+                _ = sender.send(f());
+            });
+            receiver.await.expect("worker thread does not drop channel")
         }
     }
 
diff --git a/crates/mpz-common/src/id.rs b/crates/mpz-common/src/id.rs
index 42d7e55b..5344df68 100644
--- a/crates/mpz-common/src/id.rs
+++ b/crates/mpz-common/src/id.rs
@@ -83,6 +83,7 @@ pub struct Counter(u32);
 
 impl Counter {
     /// Increments the counter in place, returning the previous value.
+    #[allow(clippy::should_implement_trait)]
     pub fn next(&mut self) -> Self {
         let prev = self.0;
         self.0 += 1;
diff --git a/crates/mpz-fields/src/lib.rs b/crates/mpz-fields/src/lib.rs
index d71956d8..041a83c7 100644
--- a/crates/mpz-fields/src/lib.rs
+++ b/crates/mpz-fields/src/lib.rs
@@ -164,6 +164,6 @@ mod tests {
         assert!(GetBit::<Lsb0>::get_bit(&a, 0));
 
         assert_eq!(b, T::two_pow(T::BIT_SIZE as u32 - 1));
-        assert!(GetBit::<Lsb0>::get_bit(&b, (T::BIT_SIZE - 1) as usize));
+        assert!(GetBit::<Lsb0>::get_bit(&b, T::BIT_SIZE - 1));
     }
 }
diff --git a/crates/mpz-garble-core/src/evaluator.rs b/crates/mpz-garble-core/src/evaluator.rs
index 9ea29035..f503ef0e 100644
--- a/crates/mpz-garble-core/src/evaluator.rs
+++ b/crates/mpz-garble-core/src/evaluator.rs
@@ -68,20 +68,12 @@ pub struct EvaluatorOutput {
 }
 
 /// Garbled circuit evaluator.
-#[derive(Debug)]
+#[derive(Debug, Default)]
 pub struct Evaluator {
     /// Buffer for the active labels.
     buffer: Vec<Label>,
 }
 
-impl Default for Evaluator {
-    fn default() -> Self {
-        Self {
-            buffer: Default::default(),
-        }
-    }
-}
-
 impl Evaluator {
     /// Returns a consumer over the encrypted gates of a circuit.
     ///
diff --git a/crates/mpz-garble-core/src/generator.rs b/crates/mpz-garble-core/src/generator.rs
index a79e3cf8..cfcc99f9 100644
--- a/crates/mpz-garble-core/src/generator.rs
+++ b/crates/mpz-garble-core/src/generator.rs
@@ -77,20 +77,12 @@ pub struct GeneratorOutput {
 }
 
 /// Garbled circuit generator.
-#[derive(Debug)]
+#[derive(Debug, Default)]
 pub struct Generator {
     /// Buffer for the 0-bit labels.
     buffer: Vec<Label>,
 }
 
-impl Default for Generator {
-    fn default() -> Self {
-        Self {
-            buffer: Default::default(),
-        }
-    }
-}
-
 impl Generator {
     /// Returns an iterator over the encrypted gates of a circuit.
     ///
@@ -295,7 +287,7 @@ where
                     // If we have generated all AND gates, we can compute
                     // the rest of the "free" gates.
                     if !self.has_gates() {
-                        assert!(matches!(self.next(), None));
+                        assert!(self.next().is_none());
 
                         self.complete = true;
                     }
@@ -356,7 +348,7 @@ where
 
         let mut batch = [EncryptedGate::default(); N];
         let mut i = 0;
-        while let Some(gate) = self.0.next() {
+        for gate in self.0.by_ref() {
             batch[i] = gate;
             i += 1;
 
diff --git a/crates/mpz-garble-core/src/lib.rs b/crates/mpz-garble-core/src/lib.rs
index d6e4e759..35b08a4a 100644
--- a/crates/mpz-garble-core/src/lib.rs
+++ b/crates/mpz-garble-core/src/lib.rs
@@ -168,7 +168,7 @@ mod tests {
             .iter()
             .zip(full_outputs)
             .map(|(active_output, full_output)| {
-                full_output.commit().verify(&active_output).unwrap();
+                full_output.commit().verify(active_output).unwrap();
                 active_output.decode(&full_output.decoding()).unwrap()
             })
             .collect();
@@ -234,7 +234,7 @@ mod tests {
             .iter()
             .zip(full_outputs)
             .map(|(active_output, full_output)| {
-                full_output.commit().verify(&active_output).unwrap();
+                full_output.commit().verify(active_output).unwrap();
                 active_output.decode(&full_output.decoding()).unwrap()
             })
             .collect();
diff --git a/crates/mpz-garble/src/protocol/deap/vm.rs b/crates/mpz-garble/src/protocol/deap/vm.rs
index 55faa25d..a1965e64 100644
--- a/crates/mpz-garble/src/protocol/deap/vm.rs
+++ b/crates/mpz-garble/src/protocol/deap/vm.rs
@@ -107,7 +107,7 @@ where
                 deap.finalize(&mut self.ctx, &mut self.ot_recv).await
             }
             State::Child(_) => Err(FinalizationError::NotMainThread.into()),
-            State::Finalized => return Err(FinalizationError::AlreadyFinalized.into()),
+            State::Finalized => Err(FinalizationError::AlreadyFinalized.into()),
         }
     }
 }
diff --git a/crates/mpz-ot-core/src/test.rs b/crates/mpz-ot-core/src/test.rs
index 975215ec..cc65d87e 100644
--- a/crates/mpz-ot-core/src/test.rs
+++ b/crates/mpz-ot-core/src/test.rs
@@ -4,26 +4,28 @@ use mpz_core::Block;
 
 /// Asserts the correctness of correlated oblivious transfer.
 pub fn assert_cot(delta: Block, choices: &[bool], msgs: &[Block], received: &[Block]) {
-    assert!(choices.into_iter().zip(msgs.into_iter().zip(received)).all(
-        |(&choice, (&msg, &received))| {
+    assert!(choices
+        .iter()
+        .zip(msgs.iter().zip(received))
+        .all(|(&choice, (&msg, &received))| {
             if choice {
                 received == msg ^ delta
             } else {
                 received == msg
             }
-        }
-    ));
+        }));
 }
 
 /// Asserts the correctness of random oblivious transfer.
 pub fn assert_rot<T: Copy + PartialEq>(choices: &[bool], msgs: &[[T; 2]], received: &[T]) {
-    assert!(choices.into_iter().zip(msgs.into_iter().zip(received)).all(
-        |(&choice, (&msg, &received))| {
+    assert!(choices
+        .iter()
+        .zip(msgs.iter().zip(received))
+        .all(|(&choice, (&msg, &received))| {
             if choice {
                 received == msg[1]
             } else {
                 received == msg[0]
             }
-        }
-    ));
+        }));
 }
diff --git a/crates/mpz-ot/src/ideal/ot.rs b/crates/mpz-ot/src/ideal/ot.rs
index ab008756..326438dd 100644
--- a/crates/mpz-ot/src/ideal/ot.rs
+++ b/crates/mpz-ot/src/ideal/ot.rs
@@ -143,7 +143,8 @@ impl<Ctx: Context, T: Copy + Send + Sync + 'static> CommittedOTReceiver<Ctx, boo
     for IdealOTReceiver<T>
 {
     async fn reveal_choices(&mut self, ctx: &mut Ctx) -> Result<(), OTError> {
-        Ok(self.0.call(ctx, (), verify).await)
+        self.0.call(ctx, (), verify).await;
+        Ok(())
     }
 }