Merge branch 'matthias/clippy-and-warnings' into matthias/s-box-7

scroll-tech · Jan 24, 2025 · 3c8fa58 · 3c8fa58
2 parents e6c74ea + 9442f47
commit 3c8fa58
Show file tree

Hide file tree

Showing 13 changed files with 204 additions and 251 deletions.
diff --git a/circ_blocks/examples/zxc.rs b/circ_blocks/examples/zxc.rs
@@ -33,7 +33,6 @@ use libspartan::{
 use merlin::Transcript;
 use serde::{Deserialize, Serialize};
 use std::time::*;
-use std::time::*;
 
 // How many reserved variables (EXCLUDING V) are in front of the actual input / output?
 // %BN, %RET, %TS, %AS, %SP, %BP

diff --git a/ff/ff_derive/src/lib.rs b/ff/ff_derive/src/lib.rs
@@ -35,10 +35,7 @@ impl ReprEndianness {
         match self {
             ReprEndianness::Big => {
                 let buf = modulus.to_bytes_be();
-                iter::repeat(0)
-                    .take(bytes - buf.len())
-                    .chain(buf.into_iter())
-                    .collect()
+                iter::repeat(0).take(bytes - buf.len()).chain(buf).collect()
             }
             ReprEndianness::Little => {
                 let mut buf = modulus.to_bytes_le();

diff --git a/spartan_parallel/src/custom_dense_mlpoly.rs b/spartan_parallel/src/custom_dense_mlpoly.rs
@@ -35,7 +35,7 @@ pub fn rev_bits(q: usize, max_num_proofs: usize) -> usize {
   (0..max_num_proofs.log_2())
     .rev()
     .map(|i| q / (i.pow2()) % 2 * (max_num_proofs / i.pow2() / 2))
-    .fold(0, |a, b| a + b)
+    .sum::<usize>()
 }
 
 impl<S: SpartanExtensionField> DensePolynomialPqx<S> {
@@ -112,7 +112,7 @@ impl<S: SpartanExtensionField> DensePolynomialPqx<S> {
   }
 
   pub fn len(&self) -> usize {
-    return self.num_instances * self.max_num_proofs * self.max_num_inputs;
+    self.num_instances * self.max_num_proofs * self.max_num_inputs
   }
 
   // Given (p, q_rev, x_rev) return Z[p][q_rev][x_rev]
@@ -122,9 +122,9 @@ impl<S: SpartanExtensionField> DensePolynomialPqx<S> {
       && w < self.Z[p][q_rev].len()
       && x_rev < self.Z[p][q_rev][w].len()
     {
-      return self.Z[p][q_rev][w][x_rev];
+      self.Z[p][q_rev][w][x_rev]
     } else {
-      return S::field_zero();
+      S::field_zero()
     }
   }
 
@@ -138,31 +138,31 @@ impl<S: SpartanExtensionField> DensePolynomialPqx<S> {
     match mode {
       MODE_P => {
         if p + self.num_instances / 2 < self.Z.len() {
-          return self.Z[p + self.num_instances / 2][q_rev][w][x_rev];
+          self.Z[p + self.num_instances / 2][q_rev][w][x_rev]
         } else {
-          return S::field_zero();
+          S::field_zero()
         }
       }
       MODE_Q => {
-        return if self.num_proofs[p] == 1 {
+        if self.num_proofs[p] == 1 {
           S::field_zero()
         } else {
           self.Z[p][q_rev + self.num_proofs[p] / 2][w][x_rev]
-        };
+        }
       }
       MODE_W => {
         if w + self.num_witness_secs / 2 < self.Z[p][q_rev].len() {
-          return self.Z[p][q_rev][w + self.num_witness_secs / 2][x_rev];
+          self.Z[p][q_rev][w + self.num_witness_secs / 2][x_rev]
         } else {
-          return S::field_zero();
+          S::field_zero()
         }
       }
       MODE_X => {
-        return if self.num_inputs[p] == 1 {
+        if self.num_inputs[p] == 1 {
           S::field_zero()
         } else {
           self.Z[p][q_rev][w][x_rev + self.num_inputs[p] / 2]
-        };
+        }
       }
       _ => {
         panic!(

diff --git a/spartan_parallel/src/dense_mlpoly.rs b/spartan_parallel/src/dense_mlpoly.rs
@@ -4,11 +4,9 @@ use crate::scalar::SpartanExtensionField;
 use super::errors::ProofVerifyError;
 use super::math::Math;
 use super::random::RandomTape;
-use super::transcript::ProofTranscript;
 use core::ops::Index;
 use merlin::Transcript;
 use serde::{Deserialize, Serialize};
-use std::collections::HashMap;
 
 #[cfg(feature = "multicore")]
 use rayon::prelude::*;

diff --git a/spartan_parallel/src/instance.rs b/spartan_parallel/src/instance.rs
@@ -165,7 +165,7 @@ impl<S: SpartanExtensionField> Instance<S> {
     Vec<(usize, usize, [u8; 32])>,
   ) {
     let int_to_scalar = |i: isize| {
-      let abs_scalar = S::from(i.abs() as u64);
+      let abs_scalar = S::from(i.unsigned_abs() as u64);
       if i < 0 {
         abs_scalar.negate().to_bytes()
       } else {
@@ -1043,7 +1043,7 @@ impl<S: SpartanExtensionField> Instance<S> {
         println!("Total Cons Exec Size: {}", total_cons_exec_size);
       }
 
-      let pairwise_check_inst = Instance::new(
+      Instance::new(
         3,
         pairwise_check_max_num_cons,
         pairwise_check_num_cons,
@@ -1052,8 +1052,7 @@ impl<S: SpartanExtensionField> Instance<S> {
         &B_list,
         &C_list,
       )
-      .unwrap();
-      pairwise_check_inst
+      .unwrap()
     };
     (
       pairwise_check_num_vars,
@@ -1294,7 +1293,7 @@ impl<S: SpartanExtensionField> Instance<S> {
         println!("Total Cons Exec Size: {}", total_cons_exec_size);
       }
 
-      let perm_root_inst = Instance::new(
+      Instance::new(
         1,
         perm_root_num_cons,
         vec![perm_root_num_cons],
@@ -1303,8 +1302,7 @@ impl<S: SpartanExtensionField> Instance<S> {
         &B_list,
         &C_list,
       )
-      .unwrap();
-      perm_root_inst
+      .unwrap()
     };
     (
       perm_root_num_cons,