chore: fix clippy

microsoft · May 3, 2024 · 30ddd39 · 30ddd39
1 parent a4ead79
commit 30ddd39
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 28 deletions.
diff --git a/benches/compressed-snark.rs b/benches/compressed-snark.rs
@@ -216,7 +216,7 @@ impl<F: PrimeField> StepCircuit<F> for NonTrivialCircuit<F> {
     let mut y = x.clone();
     for i in 0..self.num_cons {
       y = x.square(cs.namespace(|| format!("x_sq_{i}")))?;
-      x = y.clone();
+      x.clone_from(&y);
     }
     Ok(vec![y])
   }

diff --git a/benches/compute-digest.rs b/benches/compute-digest.rs
@@ -68,7 +68,7 @@ impl<F: PrimeField> StepCircuit<F> for NonTrivialCircuit<F> {
     let mut y = x.clone();
     for i in 0..self.num_cons {
       y = x.square(cs.namespace(|| format!("x_sq_{i}")))?;
-      x = y.clone();
+      x.clone_from(&y);
     }
     Ok(vec![y])
   }

diff --git a/benches/ppsnark.rs b/benches/ppsnark.rs
@@ -124,7 +124,7 @@ impl<F: PrimeField> StepCircuit<F> for NonTrivialCircuit<F> {
     let mut y = z[0].clone();
     for i in 0..self.num_cons {
       y = x.square(cs.namespace(|| format!("x_sq_{i}")))?;
-      x = y.clone();
+      x.clone_from(&y);
     }
     Ok(vec![y])
   }

diff --git a/benches/recursive-snark.rs b/benches/recursive-snark.rs
@@ -165,7 +165,7 @@ impl<F: PrimeField> StepCircuit<F> for NonTrivialCircuit<F> {
     let mut y = x.clone();
     for i in 0..self.num_cons {
       y = x.square(cs.namespace(|| format!("x_sq_{i}")))?;
-      x = y.clone();
+      x.clone_from(&y);
     }
     Ok(vec![y])
   }

diff --git a/src/gadgets/nonnative/mod.rs b/src/gadgets/nonnative/mod.rs
@@ -6,16 +6,12 @@ use ff::PrimeField;
 
 trait OptionExt<T> {
   fn grab(&self) -> Result<&T, SynthesisError>;
-  fn grab_mut(&mut self) -> Result<&mut T, SynthesisError>;
 }
 
 impl<T> OptionExt<T> for Option<T> {
   fn grab(&self) -> Result<&T, SynthesisError> {
     self.as_ref().ok_or(SynthesisError::AssignmentMissing)
   }
-  fn grab_mut(&mut self) -> Result<&mut T, SynthesisError> {
-    self.as_mut().ok_or(SynthesisError::AssignmentMissing)
-  }
 }
 
 trait BitAccess {

diff --git a/src/gadgets/nonnative/util.rs b/src/gadgets/nonnative/util.rs
@@ -14,8 +14,6 @@ use std::io::{self, Write};
 pub struct Bit<Scalar: PrimeField> {
   /// The linear combination which constrain the value of the bit
   pub bit: LinearCombination<Scalar>,
-  /// The value of the bit (filled at witness-time)
-  pub value: Option<bool>,
 }
 
 #[derive(Clone)]
@@ -58,7 +56,6 @@ impl<Scalar: PrimeField> Bit<Scalar> {
 
     Ok(Self {
       bit: LinearCombination::zero() + var,
-      value,
     })
   }
 }

diff --git a/src/provider/hyperkzg.rs b/src/provider/hyperkzg.rs
@@ -721,6 +721,7 @@ mod tests {
   }
 
   #[test]
+  #[allow(clippy::assigning_clones)]
   fn test_hyperkzg_small() {
     let n = 4;
 
@@ -765,7 +766,9 @@ mod tests {
 
     // Change the proof and expect verification to fail
     let mut bad_proof = proof.clone();
+
     bad_proof.v[0] = bad_proof.v[1].clone();
+
     let mut verifier_transcript2 = Keccak256Transcript::new(b"TestEval");
     assert!(EvaluationEngine::verify(
       &vk,
@@ -779,6 +782,7 @@ mod tests {
   }
 
   #[test]
+  #[allow(clippy::assigning_clones)]
   fn test_hyperkzg_large() {
     // test the hyperkzg prover and verifier with random instances (derived from a seed)
     for ell in [4, 5, 6] {
@@ -808,7 +812,9 @@ mod tests {
 
       // Change the proof and expect verification to fail
       let mut bad_proof = proof.clone();
+
       bad_proof.v[0] = bad_proof.v[1].clone();
+
       let mut verifier_tr2 = Keccak256Transcript::new(b"TestEval");
       assert!(
         EvaluationEngine::verify(&vk, &mut verifier_tr2, &C, &point, &eval, &bad_proof).is_err()

diff --git a/src/r1cs/mod.rs b/src/r1cs/mod.rs
@@ -481,7 +481,7 @@ impl<E: Engine> RelaxedR1CSInstance<E> {
     let mut r_instance = RelaxedR1CSInstance::default(ck, S);
     r_instance.comm_W = instance.comm_W;
     r_instance.u = E::Scalar::ONE;
-    r_instance.X = instance.X.clone();
+    r_instance.X.clone_from(&instance.X);
     r_instance
   }
 

diff --git a/src/spartan/direct.rs b/src/spartan/direct.rs
@@ -277,7 +277,7 @@ mod tests {
       assert!(res.is_ok());
 
       // set input to the next step
-      z_i = z_i_plus_one.clone();
+      z_i.clone_from(&z_i_plus_one);
     }
 
     // sanity: check the claimed output with a direct computation of the same

diff --git a/src/spartan/math.rs b/src/spartan/math.rs
@@ -1,23 +1,8 @@
 pub trait Math {
-  fn pow2(self) -> usize;
-  fn get_bits(self, num_bits: usize) -> Vec<bool>;
   fn log_2(self) -> usize;
 }
 
 impl Math for usize {
-  #[inline]
-  fn pow2(self) -> usize {
-    let base: usize = 2;
-    base.pow(self as u32)
-  }
-
-  /// Returns the `num_bits` from n in a canonical order
-  fn get_bits(self, num_bits: usize) -> Vec<bool> {
-    (0..num_bits)
-      .map(|shift_amount| ((self & (1 << (num_bits - shift_amount - 1))) > 0))
-      .collect::<Vec<bool>>()
-  }
-
   fn log_2(self) -> usize {
     assert_ne!(self, 0);