From 96fbecd9c75e7e1421a619033c19b13fbfff3030 Mon Sep 17 00:00:00 2001
From: Nicholas Ward <npward@berkeley.edu>
Date: Wed, 5 Jul 2023 17:40:48 -0700
Subject: [PATCH] ignoring where appropriate (for izip), fixing elsewhere

---
 evm/src/cpu/gas.rs            | 2 ++
 evm/src/cpu/memio.rs          | 2 ++
 evm/src/cpu/stack.rs          | 2 ++
 evm/src/recursive_verifier.rs | 2 +-
 plonky2/src/iop/challenger.rs | 4 ++--
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/evm/src/cpu/gas.rs b/evm/src/cpu/gas.rs
index 9fb32298..40cee3b9 100644
--- a/evm/src/cpu/gas.rs
+++ b/evm/src/cpu/gas.rs
@@ -60,6 +60,7 @@ const SIMPLE_OPCODES: OpsColumnsView<Option<u32>> = OpsColumnsView {
     exception: None,
 };
 
+#[allow(clippy::useless_conversion)] // For izip! macro.
 fn eval_packed_accumulate<P: PackedField>(
     lv: &CpuColumnsView<P>,
     nv: &CpuColumnsView<P>,
@@ -118,6 +119,7 @@ pub fn eval_packed<P: PackedField>(
     eval_packed_init(lv, nv, yield_constr);
 }
 
+#[allow(clippy::useless_conversion)] // For izip! macro.
 fn eval_ext_circuit_accumulate<F: RichField + Extendable<D>, const D: usize>(
     builder: &mut plonky2::plonk::circuit_builder::CircuitBuilder<F, D>,
     lv: &CpuColumnsView<ExtensionTarget<D>>,
diff --git a/evm/src/cpu/memio.rs b/evm/src/cpu/memio.rs
index 09490e87..d33fb66e 100644
--- a/evm/src/cpu/memio.rs
+++ b/evm/src/cpu/memio.rs
@@ -40,6 +40,7 @@ fn eval_packed_load<P: PackedField>(
     }
 }
 
+#[allow(clippy::tuple_array_conversions)] // For izip! macro.
 fn eval_ext_circuit_load<F: RichField + Extendable<D>, const D: usize>(
     builder: &mut plonky2::plonk::circuit_builder::CircuitBuilder<F, D>,
     lv: &CpuColumnsView<ExtensionTarget<D>>,
@@ -109,6 +110,7 @@ fn eval_packed_store<P: PackedField>(
     }
 }
 
+#[allow(clippy::tuple_array_conversions)] // For izip! macro.
 fn eval_ext_circuit_store<F: RichField + Extendable<D>, const D: usize>(
     builder: &mut plonky2::plonk::circuit_builder::CircuitBuilder<F, D>,
     lv: &CpuColumnsView<ExtensionTarget<D>>,
diff --git a/evm/src/cpu/stack.rs b/evm/src/cpu/stack.rs
index 34e36b1e..54773b2b 100644
--- a/evm/src/cpu/stack.rs
+++ b/evm/src/cpu/stack.rs
@@ -187,6 +187,7 @@ fn eval_packed_one<P: PackedField>(
     }
 }
 
+#[allow(clippy::useless_conversion)] // For izip! macro.
 pub fn eval_packed<P: PackedField>(
     lv: &CpuColumnsView<P>,
     yield_constr: &mut ConstraintConsumer<P>,
@@ -301,6 +302,7 @@ fn eval_ext_circuit_one<F: RichField + Extendable<D>, const D: usize>(
     }
 }
 
+#[allow(clippy::useless_conversion)] // For izip! macro.
 pub fn eval_ext_circuit<F: RichField + Extendable<D>, const D: usize>(
     builder: &mut plonky2::plonk::circuit_builder::CircuitBuilder<F, D>,
     lv: &CpuColumnsView<ExtensionTarget<D>>,
diff --git a/evm/src/recursive_verifier.rs b/evm/src/recursive_verifier.rs
index 477d36c2..4d61aec2 100644
--- a/evm/src/recursive_verifier.rs
+++ b/evm/src/recursive_verifier.rs
@@ -188,7 +188,7 @@ where
         let circuit = buffer.read_circuit_data(gate_serializer, generator_serializer)?;
         let target_vec = buffer.read_target_vec()?;
         let init_challenger_state_target =
-            <C::Hasher as AlgebraicHasher<F>>::AlgebraicPermutation::new(target_vec.into_iter());
+            <C::Hasher as AlgebraicHasher<F>>::AlgebraicPermutation::new(target_vec);
         let zero_target = buffer.read_target()?;
         let stark_proof_target = StarkProofTarget::from_buffer(buffer)?;
         let ctl_challenges_target = GrandProductChallengeSet::from_buffer(buffer)?;
diff --git a/plonky2/src/iop/challenger.rs b/plonky2/src/iop/challenger.rs
index 06636d8a..f062dc6e 100644
--- a/plonky2/src/iop/challenger.rs
+++ b/plonky2/src/iop/challenger.rs
@@ -332,8 +332,8 @@ mod tests {
 
         // These are mostly arbitrary, but we want to test some rounds with enough inputs/outputs to
         // trigger multiple absorptions/squeezes.
-        let num_inputs_per_round = vec![2, 5, 3];
-        let num_outputs_per_round = vec![1, 2, 4];
+        let num_inputs_per_round = [2, 5, 3];
+        let num_outputs_per_round = [1, 2, 4];
 
         // Generate random input messages.
         let inputs_per_round: Vec<Vec<F>> = num_inputs_per_round