From 641b4b5f94cb7bbdd710eba0e84f94d1d23ca0c3 Mon Sep 17 00:00:00 2001
From: kilic <kiliconu@itu.edu.tr>
Date: Mon, 14 Feb 2022 14:31:04 +0300
Subject: [PATCH] Apply clippy and fmt

---
 halo2_gadgets/src/lib.rs                   |  2 +-
 halo2_proofs/examples/cost-model.rs        |  1 +
 halo2_proofs/examples/simple-example-2.rs  | 14 ++------------
 halo2_proofs/examples/simple-example-3.rs  |  4 ----
 halo2_proofs/src/poly/multiopen.rs         |  2 +-
 halo2_proofs/src/poly/multiopen/shplonk.rs |  5 ++---
 6 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/halo2_gadgets/src/lib.rs b/halo2_gadgets/src/lib.rs
index d91ef87f..695ac06b 100644
--- a/halo2_gadgets/src/lib.rs
+++ b/halo2_gadgets/src/lib.rs
@@ -10,4 +10,4 @@
 #![deny(unsafe_code)]
 
 #[cfg(featFure = "unstable")]
-pub mod sha256;
\ No newline at end of file
+pub mod sha256;
diff --git a/halo2_proofs/examples/cost-model.rs b/halo2_proofs/examples/cost-model.rs
index 6b11c6f7..4d555537 100644
--- a/halo2_proofs/examples/cost-model.rs
+++ b/halo2_proofs/examples/cost-model.rs
@@ -100,6 +100,7 @@ impl FromStr for Poly {
 
 #[derive(Debug)]
 struct Lookup {
+    #[allow(dead_code)]
     columns: usize,
     input_deg: usize,
     table_deg: usize,
diff --git a/halo2_proofs/examples/simple-example-2.rs b/halo2_proofs/examples/simple-example-2.rs
index 73b4df03..59e88c49 100644
--- a/halo2_proofs/examples/simple-example-2.rs
+++ b/halo2_proofs/examples/simple-example-2.rs
@@ -43,7 +43,6 @@ trait StandardCs<FF: FieldExt> {
 #[derive(Clone)]
 struct MyCircuit<F: FieldExt> {
     a: Option<F>,
-    zero: Option<F>,
     k: u32,
 }
 
@@ -168,11 +167,7 @@ impl<F: FieldExt> Circuit<F> for MyCircuit<F> {
     type FloorPlanner = SimpleFloorPlanner;
 
     fn without_witnesses(&self) -> Self {
-        Self {
-            a: None,
-            zero: None,
-            k: self.k,
-        }
+        Self { a: None, k: self.k }
     }
 
     fn configure(meta: &mut ConstraintSystem<F>) -> PlonkConfig {
@@ -247,11 +242,7 @@ fn main() {
     let k = 8;
     let public_inputs_size = 0;
 
-    let empty_circuit: MyCircuit<Fp> = MyCircuit {
-        a: None,
-        zero: None,
-        k,
-    };
+    let empty_circuit: MyCircuit<Fp> = MyCircuit { a: None, k };
 
     // Initialize the polynomial commitment parameters
     let params: Params<G1Affine> = Params::<G1Affine>::unsafe_setup::<Bn256>(k);
@@ -263,7 +254,6 @@ fn main() {
 
     let circuit: MyCircuit<Fp> = MyCircuit {
         a: Some(Fp::from(5)),
-        zero: Some(Fp::zero()),
         k,
     };
 
diff --git a/halo2_proofs/examples/simple-example-3.rs b/halo2_proofs/examples/simple-example-3.rs
index ab5e447c..c9c5a789 100644
--- a/halo2_proofs/examples/simple-example-3.rs
+++ b/halo2_proofs/examples/simple-example-3.rs
@@ -72,9 +72,6 @@ struct FieldConfig {
     // This is important when building larger circuits, where columns are used by
     // multiple sets of instructions.
     s_mul: Selector,
-
-    /// The fixed column used to load constants.
-    constant: Column<Fixed>,
 }
 
 impl<F: FieldExt> FieldChip<F> {
@@ -132,7 +129,6 @@ impl<F: FieldExt> FieldChip<F> {
             advice,
             instance,
             s_mul,
-            constant,
         }
     }
 }
diff --git a/halo2_proofs/src/poly/multiopen.rs b/halo2_proofs/src/poly/multiopen.rs
index 2c524313..06c865fb 100644
--- a/halo2_proofs/src/poly/multiopen.rs
+++ b/halo2_proofs/src/poly/multiopen.rs
@@ -326,7 +326,7 @@ mod tests {
                     {
                         let poly = &polynomials[i][j];
                         let commitment: &G1Affine = &commitments[i][j];
-                        let eval = eval_polynomial(&poly, *point);
+                        let eval = eval_polynomial(poly, *point);
                         let query = VerifierQuery::new_commitment(commitment, *point, eval);
                         verifier_queries.push(query);
                     }
diff --git a/halo2_proofs/src/poly/multiopen/shplonk.rs b/halo2_proofs/src/poly/multiopen/shplonk.rs
index ef82d9dd..567d636f 100644
--- a/halo2_proofs/src/poly/multiopen/shplonk.rs
+++ b/halo2_proofs/src/poly/multiopen/shplonk.rs
@@ -133,7 +133,7 @@ where
     // 4. find diff points
     // commitment_id_diff_points_map = { c_1:  { p_2, p_3, ... }, c_2: { p_0 }, ... }
     let mut commitment_id_diff_points_map = BTreeMap::new();
-    for query in queries.clone() {
+    for query in queries {
         let id = get_commitment_id(&query);
         let commitment_point_set = commitment_id_point_map.get(&id).unwrap();
 
@@ -320,8 +320,7 @@ mod tests {
 
             let points = vec_to_set(points);
             let diffs = vec_to_set(diffs);
-            let intersection: Vec<Fr> = points.intersection(&diffs).cloned().collect();
-            assert_eq!(intersection.len(), 0);
+            assert_eq!(points.intersection(&diffs).cloned().count(), 0);
             let union: Vec<Fr> = points.union(&diffs).cloned().collect();
             assert_eq!(union, super_point_set);
         }