From b0df9d5f38ec4f24931ff1ade4bfb2a58c24398a Mon Sep 17 00:00:00 2001
From: parazyd <parazyd@dyne.org>
Date: Wed, 27 Mar 2024 15:19:04 +0100
Subject: [PATCH] chore: Clippy lints

---
 src/zk/debug.rs | 11 +++++------
 src/zk/vm.rs    |  5 ++---
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/zk/debug.rs b/src/zk/debug.rs
index eacb49519..3279bf754 100644
--- a/src/zk/debug.rs
+++ b/src/zk/debug.rs
@@ -132,15 +132,15 @@ pub fn import_witness_json<P: AsRef<Path>>(input_path: P) -> (Vec<Witness>, Vec<
 
     let jval_as_fp = |j_val: &JsonValue| {
         let valstr: &String = j_val.get().expect("value str");
-        pallas::Base::from_str(&valstr).unwrap()
+        pallas::Base::from_str(valstr).unwrap()
     };
 
     let jval_as_vecfp = |j_val: &JsonValue| {
         j_val
             .get::<Vec<_>>()
             .expect("value str")
-            .into_iter()
-            .map(|v| jval_as_fp(v))
+            .iter()
+            .map(jval_as_fp)
             .collect::<Vec<pallas::Base>>()
     };
 
@@ -156,7 +156,7 @@ pub fn import_witness_json<P: AsRef<Path>>(input_path: P) -> (Vec<Witness>, Vec<
             }
             "Scalar" => {
                 let valstr: &String = j_val.get().expect("value str");
-                let fq = pallas::Scalar::from_str(&valstr).unwrap();
+                let fq = pallas::Scalar::from_str(valstr).unwrap();
                 witnesses.push(Witness::Scalar(Value::known(fq)));
             }
             "Uint32" => {
@@ -164,8 +164,7 @@ pub fn import_witness_json<P: AsRef<Path>>(input_path: P) -> (Vec<Witness>, Vec<
                 witnesses.push(Witness::Uint32(Value::known(*val as u32)));
             }
             "MerklePath" => {
-                let vals: Vec<_> =
-                    jval_as_vecfp(j_val).into_iter().map(|v| MerkleNode::new(v)).collect();
+                let vals: Vec<_> = jval_as_vecfp(j_val).into_iter().map(MerkleNode::new).collect();
                 assert_eq!(vals.len(), 32);
                 let vals: [MerkleNode; 32] = vals.try_into().unwrap();
                 witnesses.push(Witness::MerklePath(Value::known(vals)));
diff --git a/src/zk/vm.rs b/src/zk/vm.rs
index eb4a099c4..b5e07e571 100644
--- a/src/zk/vm.rs
+++ b/src/zk/vm.rs
@@ -574,8 +574,7 @@ impl Circuit<pallas::Base> for ZkCircuit {
             SinsemillaChip::load(sinsemilla_cfg1.clone(), &mut layouter)?;
         }
 
-        let no_sinsemilla_chip =
-            config.chips.iter().find(|&c| matches!(c, VmChip::Sinsemilla(_))).is_none();
+        let no_sinsemilla_chip = !config.chips.iter().any(|c| matches!(c, VmChip::Sinsemilla(_)));
 
         // Construct the 64-bit NativeRangeCheck chip
         let rangecheck64_chip = config.rangecheck64_chip();
@@ -592,7 +591,7 @@ impl Circuit<pallas::Base> for ZkCircuit {
         }
 
         let no_rangecheck64_chip =
-            config.chips.iter().find(|&c| matches!(c, VmChip::NativeRange64(_))).is_none();
+            !config.chips.iter().any(|c| matches!(c, VmChip::NativeRange64(_)));
 
         // Construct the 253-bit NativeRangeCheck and LessThan chips.
         let rangecheck253_chip = config.rangecheck253_chip();