fix clippy errors

Author: Hakkush-07

src/circuits/bigint/mul.rs

@@ -23,9 +23,7 @@ impl<const N_BITS: usize> BigIntImpl<N_BITS> {
             let addition_wires_1 =
                 circuit.extend(Self::self_or_zero(a_wires.clone(), b_wires[i].clone()));
             let new_bits = circuit.extend(Self::add(addition_wires_0, addition_wires_1));
-            for j in i..=(i + N_BITS) {
-                circuit.0[j] = new_bits[j - i].clone();
-            }
+            circuit.0[i..(i + N_BITS + 1)].clone_from_slice(&new_bits[..((i + N_BITS - i) + 1)]);
         }
         circuit
     }
@@ -53,9 +51,7 @@ impl<const N_BITS: usize> BigIntImpl<N_BITS> {
                     addition_wires.push(circuit.0[j].clone());
                 }
                 let new_bits = circuit.extend(Self::add(a_wires.clone(), addition_wires));
-                for j in i..=(i + N_BITS) {
-                    circuit.0[j] = new_bits[j - i].clone();
-                }
+                circuit.0[i..(i + N_BITS + 1)].clone_from_slice(&new_bits[..((i + N_BITS - i) + 1)]);
             }
         }
 

src/circuits/bigint/utils.rs

@@ -15,9 +15,7 @@ pub fn random_u254() -> BigUint {
 
 pub fn bits_from_biguint(u: BigUint) -> Vec<bool> {
     let mut bytes = u.to_bytes_le();
-    for _ in bytes.len()..32 {
-        bytes.push(0_u8);
-    }
+    bytes.extend(vec![0_u8; 32 - bytes.len()]);
     let mut bits = Vec::new();
     for byte in bytes {
         for i in 0..8 {
@@ -87,6 +85,8 @@ pub fn change_to_neg_pos_decomposition(bits: Vec<bool>) -> Vec<i8> {
 
 #[cfg(test)]
 pub mod tests {
+    use std::cmp::Ordering;
+
     use super::*;
 
     #[test]
@@ -113,10 +113,10 @@ pub mod tests {
             }
 
             for i in (0..len).rev() {
-                if d[i] > 0 {
-                    res += pw[i].clone();
-                } else if d[i] < 0 {
-                    res -= pw[i].clone();
+                match d[i].cmp(&0) {
+                    Ordering::Less => { res -= pw[i].clone(); },
+                    Ordering::Equal => (),
+                    Ordering::Greater => { res += pw[i].clone(); },
                 }
             }
 

src/circuits/bn254/finalexp.rs

@@ -110,26 +110,26 @@ pub fn final_exponentiation(f: ark_bn254::Fq12) -> ark_bn254::Fq12 {
     let y0 = exp_by_neg_x(r);
     let y1 = y0.square();
     let y2 = y1.square();
-    let y3 = y2 * &y1;
+    let y3 = y2 * y1;
     let y4 = exp_by_neg_x(y3);
     let y5 = y4.square();
     let y6 = exp_by_neg_x(y5);
     let y7 = conjugate(y3);
     let y8 = conjugate(y6);
-    let y9 = y8 * &y4;
-    let y10 = y9 * &y7;
-    let y11 = y10 * &y1;
-    let y12 = y10 * &y4;
-    let y13 = y12 * &r;
+    let y9 = y8 * y4;
+    let y10 = y9 * y7;
+    let y11 = y10 * y1;
+    let y12 = y10 * y4;
+    let y13 = y12 * r;
     let y14 = y11.frobenius_map(1);
-    let y15 = y14 * &y13;
+    let y15 = y14 * y13;
     let y16 = y10.frobenius_map(2);
-    let y17 = y16 * &y15;
+    let y17 = y16 * y15;
     let r2 = conjugate(r);
-    let y18 = r2 * &y11;
+    let y18 = r2 * y11;
     let y19 = y18.frobenius_map(3);
 
-    y19 * &y17
+    y19 * y17
 }
 
 pub fn final_exponentiation_evaluate_fast(f: Wires) -> (Wires, GateCount) {

src/circuits/bn254/fq12.rs

@@ -18,7 +18,7 @@ impl Fq12 {
         assert_eq!(a.len(), Self::N_BITS);
         let mut circuit = Circuit::empty();
 
-        let a0 = a[0 * Fq::N_BITS..Fq::N_BITS].to_vec();
+        let a0 = a[..Fq::N_BITS].to_vec();
         let a1 = a[Fq::N_BITS..2 * Fq::N_BITS].to_vec();
         let a2 = a[2 * Fq::N_BITS..3 * Fq::N_BITS].to_vec();
         let a3 = a[3 * Fq::N_BITS..4 * Fq::N_BITS].to_vec();
@@ -43,7 +43,7 @@ impl Fq12 {
 
         let mut wire = results[0].clone();
 
-        for next in results[1..].to_vec() {
+        for next in results[1..].iter().cloned() {
             let new_wire = Rc::new(RefCell::new(Wire::new()));
             circuit.add(Gate::and(wire, next, new_wire.clone()));
             wire = new_wire;

src/circuits/bn254/pairing.rs

@@ -19,26 +19,26 @@ pub fn double_in_place(
     r: &mut ark_bn254::G2Projective,
 ) -> (ark_bn254::Fq2, ark_bn254::Fq2, ark_bn254::Fq2) {
     let half = ark_bn254::Fq::from(Fq::half_modulus());
-    let mut a = r.x * &r.y;
+    let mut a = r.x * r.y;
     a.mul_assign_by_fp(&half);
     let b = r.y.square();
     let c = r.z.square();
-    let e = ark_bn254::g2::Config::COEFF_B * &(c.double() + &c);
-    let f = e.double() + &e;
-    let mut g = b + &f;
+    let e = ark_bn254::g2::Config::COEFF_B * (c.double() + c);
+    let f = e.double() + e;
+    let mut g = b + f;
     g.mul_assign_by_fp(&half);
-    let h = (r.y + &r.z).square() - &(b + &c);
-    let i = e - &b;
+    let h = (r.y + r.z).square() - (b + c);
+    let i = e - b;
     let j = r.x.square();
     let e_square = e.square();
 
     let new_r = ark_bn254::G2Projective {
-        x: a * &(b - &f),
-        y: g.square() - &(e_square.double() + &e_square),
-        z: b * &h,
+        x: a * (b - f),
+        y: g.square() - (e_square.double() + e_square),
+        z: b * h,
     };
     *r = new_r;
-    (-h, j.double() + &j, i)
+    (-h, j.double() + j, i)
 }
 
 pub fn double_in_place2(
@@ -48,25 +48,25 @@ pub fn double_in_place2(
     (ark_bn254::Fq2, ark_bn254::Fq2, ark_bn254::Fq2),
 ) {
     let half = ark_bn254::Fq::from(Fq::half_modulus());
-    let mut a = r.x * &r.y;
+    let mut a = r.x * r.y;
     a.mul_assign_by_fp(&half);
     let b = r.y.square();
     let c = r.z.square();
-    let e = ark_bn254::g2::Config::COEFF_B * &(c.double() + &c);
-    let f = e.double() + &e;
-    let mut g = b + &f;
+    let e = ark_bn254::g2::Config::COEFF_B * (c.double() + c);
+    let f = e.double() + e;
+    let mut g = b + f;
     g.mul_assign_by_fp(&half);
-    let h = (r.y + &r.z).square() - &(b + &c);
-    let i = e - &b;
+    let h = (r.y + r.z).square() - (b + c);
+    let i = e - b;
     let j = r.x.square();
     let e_square = e.square();
 
     let new_r = ark_bn254::G2Projective {
-        x: a * &(b - &f),
-        y: g.square() - &(e_square.double() + &e_square),
-        z: b * &h,
+        x: a * (b - f),
+        y: g.square() - (e_square.double() + e_square),
+        z: b * h,
     };
-    (new_r, (-h, j.double() + &j, i))
+    (new_r, (-h, j.double() + j, i))
 }
 
 pub fn double_in_place_circuit(r: Wires) -> Circuit {
@@ -131,20 +131,20 @@ pub fn add_in_place(
     r: &mut ark_bn254::G2Projective,
     q: &ark_bn254::G2Affine,
 ) -> (ark_bn254::Fq2, ark_bn254::Fq2, ark_bn254::Fq2) {
-    let theta = r.y - &(q.y * &r.z);
-    let lambda = r.x - &(q.x * &r.z);
+    let theta = r.y - (q.y * r.z);
+    let lambda = r.x - (q.x * r.z);
     let c = theta.square();
     let d = lambda.square();
-    let e = lambda * &d;
-    let f = r.z * &c;
-    let g = r.x * &d;
-    let h = e + &f - &g.double();
-    let j = theta * &q.x - &(lambda * &q.y);
+    let e = lambda * d;
+    let f = r.z * c;
+    let g = r.x * d;
+    let h = e + f - g.double();
+    let j = theta * q.x - (lambda * q.y);
 
     let new_r = ark_bn254::G2Projective {
-        x: lambda * &h,
-        y: theta * &(g - &h) - &(e * &r.y),
-        z: r.z * &e,
+        x: lambda * h,
+        y: theta * (g - h) - (e * r.y),
+        z: r.z * e,
     };
     *r = new_r;
 
@@ -158,20 +158,20 @@ pub fn add_in_place2(
     ark_bn254::G2Projective,
     (ark_bn254::Fq2, ark_bn254::Fq2, ark_bn254::Fq2),
 ) {
-    let theta = r.y - &(q.y * &r.z);
-    let lambda = r.x - &(q.x * &r.z);
+    let theta = r.y - (q.y * r.z);
+    let lambda = r.x - (q.x * r.z);
     let c = theta.square();
     let d = lambda.square();
-    let e = lambda * &d;
-    let f = r.z * &c;
-    let g = r.x * &d;
-    let h = e + &f - &g.double();
-    let j = theta * &q.x - &(lambda * &q.y);
+    let e = lambda * d;
+    let f = r.z * c;
+    let g = r.x * d;
+    let h = e + f - g.double();
+    let j = theta * q.x - (lambda * q.y);
 
     let new_r = ark_bn254::G2Projective {
-        x: lambda * &h,
-        y: theta * &(g - &h) - &(e * &r.y),
-        z: r.z * &e,
+        x: lambda * h,
+        y: theta * (g - h) - (e * r.y),
+        z: r.z * e,
     };
 
     (new_r, (lambda, -theta, j))
@@ -1044,7 +1044,7 @@ mod tests {
         let c1 = fq2_from_wires(circuit.0[Fq2::N_BITS..2 * Fq2::N_BITS].to_vec());
         let c2 = fq2_from_wires(circuit.0[2 * Fq2::N_BITS..3 * Fq2::N_BITS].to_vec());
         let new_r_x = fq2_from_wires(
-            circuit.0[3 * Fq2::N_BITS + 0 * Fq2::N_BITS..3 * Fq2::N_BITS + Fq2::N_BITS]
+            circuit.0[3 * Fq2::N_BITS..3 * Fq2::N_BITS + Fq2::N_BITS]
                 .to_vec(),
         );
         let new_r_y = fq2_from_wires(

src/circuits/bn254/utils.rs

@@ -18,9 +18,7 @@ pub fn random_fq() -> ark_bn254::Fq {
 
 pub fn bits_from_fq(u: ark_bn254::Fq) -> Vec<bool> {
     let mut bytes = BigUint::from(u).to_bytes_le();
-    for _ in bytes.len()..32 {
-        bytes.push(0_u8);
-    }
+    bytes.extend(vec![0_u8; 32 - bytes.len()]);
     let mut bits = Vec::new();
     for byte in bytes {
         for i in 0..8 {
@@ -235,9 +233,7 @@ pub fn random_fr() -> ark_bn254::Fr {
 
 pub fn bits_from_fr(u: ark_bn254::Fr) -> Vec<bool> {
     let mut bytes = BigUint::from(u).to_bytes_le();
-    for _ in bytes.len()..32 {
-        bytes.push(0_u8);
-    }
+    bytes.extend(vec![0_u8; 32 - bytes.len()]);
     let mut bits = Vec::new();
     for byte in bytes {
         for i in 0..8 {
@@ -376,9 +372,9 @@ fn extended_gcd(a: &BigInt, b: &BigInt) -> (BigInt, BigInt, BigInt) {
     while !b1.is_zero() {
         let q = &a1 / &b1;
 
-        (x, x1) = (x1.clone(), &x - &q * &x1);
-        (y, y1) = (y1.clone(), &y - &q * &y1);
-        (a1, b1) = (b1.clone(), &a1 - &q * &b1);
+        (x, x1) = (x1.clone(), &x - q.clone() * x1);
+        (y, y1) = (y1.clone(), &y - q.clone() * y1);
+        (a1, b1) = (b1.clone(), &a1 - q.clone() * b1);
     }
 
     (a1, x, y)
@@ -391,11 +387,11 @@ pub fn calculate_montgomery_constants(modulus: BigUint, r: BigUint) -> (BigUint,
     let (gcd, r_inv_signed, n_inv_signed) = extended_gcd(&r_signed, &modulus_signed);
     assert_eq!(gcd, BigInt::one(), "r and modulus must be coprime");
 
-    let r_inv = ((r_inv_signed % &modulus_signed + &modulus_signed) % &modulus_signed)
+    let r_inv = ((r_inv_signed % modulus_signed.clone() + modulus_signed.clone()) % modulus_signed.clone())
         .to_biguint()
         .unwrap();
 
-    let n_prime = ((n_inv_signed % &r_signed + &r_signed) % &r_signed)
+    let n_prime = ((n_inv_signed % r_signed.clone() + r_signed.clone()) % r_signed.clone())
         .to_biguint()
         .unwrap();
 

src/circuits/groth16.rs

@@ -97,25 +97,14 @@ mod tests {
         test_rng,
     };
 
-    #[derive(Copy)]
+    #[derive(Copy, Clone)]
     struct DummyCircuit<F: PrimeField> {
         pub a: Option<F>,
         pub b: Option<F>,
         pub num_variables: usize,
         pub num_constraints: usize,
     }
 
-    impl<F: PrimeField> Clone for DummyCircuit<F> {
-        fn clone(&self) -> Self {
-            DummyCircuit {
-                a: self.a,
-                b: self.b,
-                num_variables: self.num_variables,
-                num_constraints: self.num_constraints,
-            }
-        }
-    }
-
     impl<F: PrimeField> ConstraintSynthesizer<F> for DummyCircuit<F> {
         fn generate_constraints(self, cs: ConstraintSystemRef<F>) -> Result<(), SynthesisError> {
             let a = cs.new_witness_variable(|| self.a.ok_or(SynthesisError::AssignmentMissing))?;

src/core/s.rs

@@ -18,8 +18,8 @@ impl S {
 
     pub fn neg(&self) -> Self {
         let mut s = self.0;
-        for i in 0..32 {
-            s[i] = 255 - self.0[i];
+        for (i, si) in s.iter_mut().enumerate() {
+            *si = 255 - self.0[i];
         }
         Self(s) + Self::one()
     }