bus-auto: fix clippy

scroll-tech · Nov 15, 2023 · 8fc9156 · 8fc9156
1 parent 3ef65de
commit 8fc9156
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 8 deletions.
diff --git a/halo2_proofs/src/circuit/layouter.rs b/halo2_proofs/src/circuit/layouter.rs
@@ -228,11 +228,11 @@ impl<F: Field> RegionLayouter<F> for RegionShape {
         Ok(())
     }
 
-    fn query_advice(&self, column: Column<Advice>, offset: usize) -> Result<F, Error> {
+    fn query_advice(&self, _column: Column<Advice>, _offset: usize) -> Result<F, Error> {
         Ok(F::zero())
     }
 
-    fn query_fixed(&self, column: Column<Fixed>, offset: usize) -> Result<F, Error> {
+    fn query_fixed(&self, _column: Column<Fixed>, _offset: usize) -> Result<F, Error> {
         Ok(F::zero())
     }
 

diff --git a/halo2_proofs/src/dev.rs b/halo2_proofs/src/dev.rs
@@ -670,7 +670,7 @@ impl<'a, F: Field + Group> Assignment<F> for MockProver<'a, F> {
             .map(|v| match v {
                 CellValue::Assigned(f) => *f,
                 #[cfg(feature = "mock-batch-inv")]
-                CellValue::Rational(n, d) => n * d.invert().unwrap_or_default(),
+                CellValue::Rational(n, d) => *n * d.invert().unwrap_or(F::zero()),
                 _ => F::zero(),
             })
             .ok_or(Error::BoundsFailure)
@@ -695,7 +695,7 @@ impl<'a, F: Field + Group> Assignment<F> for MockProver<'a, F> {
             .map(|v| match v {
                 CellValue::Assigned(f) => *f,
                 #[cfg(feature = "mock-batch-inv")]
-                CellValue::Rational(n, d) => n * d.invert().unwrap_or_default(),
+                CellValue::Rational(n, d) => *n * d.invert().unwrap_or(F::zero()),
                 _ => F::zero(),
             })
             .ok_or(Error::BoundsFailure)

diff --git a/halo2_proofs/src/dev/cost.rs b/halo2_proofs/src/dev/cost.rs
@@ -78,11 +78,11 @@ impl<F: Field> Assignment<F> for Assembly {
         todo!()
     }
 
-    fn query_advice(&self, column: Column<Advice>, row: usize) -> Result<F, Error> {
+    fn query_advice(&self, _column: Column<Advice>, _row: usize) -> Result<F, Error> {
         Ok(F::zero())
     }
 
-    fn query_fixed(&self, column: Column<Fixed>, row: usize) -> Result<F, Error> {
+    fn query_fixed(&self, _column: Column<Fixed>, _row: usize) -> Result<F, Error> {
         Ok(F::zero())
     }
 

diff --git a/halo2_proofs/src/dev/graph.rs b/halo2_proofs/src/dev/graph.rs
@@ -116,6 +116,14 @@ impl<F: Field> Assignment<F> for Graph {
         // Do nothing
     }
 
+    fn query_advice(&self, _column: Column<Advice>, _row: usize) -> Result<F, Error> {
+        Ok(F::zero())
+    }
+
+    fn query_fixed(&self, _column: Column<Fixed>, _row: usize) -> Result<F, Error> {
+        Ok(F::zero())
+    }
+
     fn query_instance(&self, _: Column<Instance>, _: usize) -> Result<Value<F>, Error> {
         Ok(Value::unknown())
     }

diff --git a/halo2_proofs/src/dev/graph/layout.rs b/halo2_proofs/src/dev/graph/layout.rs
@@ -440,6 +440,14 @@ impl<F: Field> Assignment<F> for Layout {
         todo!()
     }
 
+    fn query_advice(&self, _column: Column<Advice>, _row: usize) -> Result<F, Error> {
+        Ok(F::zero())
+    }
+
+    fn query_fixed(&self, _column: Column<Fixed>, _row: usize) -> Result<F, Error> {
+        Ok(F::zero())
+    }
+
     fn query_instance(&self, _: Column<Instance>, _: usize) -> Result<Value<F>, Error> {
         Ok(Value::unknown())
     }

diff --git a/halo2_proofs/src/plonk/prover.rs b/halo2_proofs/src/plonk/prover.rs
@@ -230,7 +230,7 @@ pub fn create_proof<
                     advice,
                     challenges: self.challenges,
                     instances: self.instances,
-                    fixed_values: self.fixed_values.clone(),
+                    fixed_values: self.fixed_values,
                     rw_rows: sub_range.clone(),
                     usable_rows: self.usable_rows,
                     _marker: Default::default(),
@@ -272,7 +272,7 @@ pub fn create_proof<
             self.fixed_values
                 .get(column.index())
                 .and_then(|v| v.get(row))
-                .map(|v| *v)
+                .copied()
                 .ok_or(Error::BoundsFailure)
         }