From 0abc3b92104893bb0f725178ad35f6bb94098f35 Mon Sep 17 00:00:00 2001
From: Robin Salen <30937548+Nashtare@users.noreply.github.com>
Date: Fri, 22 Sep 2023 10:14:47 -0400
Subject: [PATCH] Apply comments (#1248)

---
 evm/src/cpu/cpu_stark.rs                     | 16 ++++++----------
 evm/src/keccak_sponge/keccak_sponge_stark.rs | 20 ++++++++------------
 2 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/evm/src/cpu/cpu_stark.rs b/evm/src/cpu/cpu_stark.rs
index 14bb6015..f23ff308 100644
--- a/evm/src/cpu/cpu_stark.rs
+++ b/evm/src/cpu/cpu_stark.rs
@@ -243,11 +243,9 @@ impl<F: RichField + Extendable<D>, const D: usize> Stark<F, D> for CpuStark<F, D
         FE: FieldExtension<D2, BaseField = F>,
         P: PackedField<Scalar = FE>,
     {
-        let local_values =
-            TryInto::<[P; NUM_CPU_COLUMNS]>::try_into(vars.get_local_values()).unwrap();
+        let local_values: &[P; NUM_CPU_COLUMNS] = vars.get_local_values().try_into().unwrap();
         let local_values: &CpuColumnsView<P> = local_values.borrow();
-        let next_values =
-            TryInto::<[P; NUM_CPU_COLUMNS]>::try_into(vars.get_next_values()).unwrap();
+        let next_values: &[P; NUM_CPU_COLUMNS] = vars.get_next_values().try_into().unwrap();
         let next_values: &CpuColumnsView<P> = next_values.borrow();
 
         bootstrap_kernel::eval_bootstrap_kernel_packed(local_values, next_values, yield_constr);
@@ -276,13 +274,11 @@ impl<F: RichField + Extendable<D>, const D: usize> Stark<F, D> for CpuStark<F, D
         vars: &Self::EvaluationFrameTarget,
         yield_constr: &mut RecursiveConstraintConsumer<F, D>,
     ) {
-        let local_values =
-            TryInto::<[ExtensionTarget<D>; NUM_CPU_COLUMNS]>::try_into(vars.get_local_values())
-                .unwrap();
+        let local_values: &[ExtensionTarget<D>; NUM_CPU_COLUMNS] =
+            vars.get_local_values().try_into().unwrap();
         let local_values: &CpuColumnsView<ExtensionTarget<D>> = local_values.borrow();
-        let next_values =
-            TryInto::<[ExtensionTarget<D>; NUM_CPU_COLUMNS]>::try_into(vars.get_next_values())
-                .unwrap();
+        let next_values: &[ExtensionTarget<D>; NUM_CPU_COLUMNS] =
+            vars.get_next_values().try_into().unwrap();
         let next_values: &CpuColumnsView<ExtensionTarget<D>> = next_values.borrow();
 
         bootstrap_kernel::eval_bootstrap_kernel_ext_circuit(
diff --git a/evm/src/keccak_sponge/keccak_sponge_stark.rs b/evm/src/keccak_sponge/keccak_sponge_stark.rs
index 65edc941..2ed31c1f 100644
--- a/evm/src/keccak_sponge/keccak_sponge_stark.rs
+++ b/evm/src/keccak_sponge/keccak_sponge_stark.rs
@@ -438,11 +438,11 @@ impl<F: RichField + Extendable<D>, const D: usize> Stark<F, D> for KeccakSpongeS
         FE: FieldExtension<D2, BaseField = F>,
         P: PackedField<Scalar = FE>,
     {
-        let local_values =
-            TryInto::<[P; NUM_KECCAK_SPONGE_COLUMNS]>::try_into(vars.get_local_values()).unwrap();
+        let local_values: &[P; NUM_KECCAK_SPONGE_COLUMNS] =
+            vars.get_local_values().try_into().unwrap();
         let local_values: &KeccakSpongeColumnsView<P> = local_values.borrow();
-        let next_values =
-            TryInto::<[P; NUM_KECCAK_SPONGE_COLUMNS]>::try_into(vars.get_next_values()).unwrap();
+        let next_values: &[P; NUM_KECCAK_SPONGE_COLUMNS] =
+            vars.get_next_values().try_into().unwrap();
         let next_values: &KeccakSpongeColumnsView<P> = next_values.borrow();
 
         // Each flag (full-input block, final block or implied dummy flag) must be boolean.
@@ -549,15 +549,11 @@ impl<F: RichField + Extendable<D>, const D: usize> Stark<F, D> for KeccakSpongeS
         vars: &Self::EvaluationFrameTarget,
         yield_constr: &mut RecursiveConstraintConsumer<F, D>,
     ) {
-        let local_values = TryInto::<[ExtensionTarget<D>; NUM_KECCAK_SPONGE_COLUMNS]>::try_into(
-            vars.get_local_values(),
-        )
-        .unwrap();
+        let local_values: &[ExtensionTarget<D>; NUM_KECCAK_SPONGE_COLUMNS] =
+            vars.get_local_values().try_into().unwrap();
         let local_values: &KeccakSpongeColumnsView<ExtensionTarget<D>> = local_values.borrow();
-        let next_values = TryInto::<[ExtensionTarget<D>; NUM_KECCAK_SPONGE_COLUMNS]>::try_into(
-            vars.get_next_values(),
-        )
-        .unwrap();
+        let next_values: &[ExtensionTarget<D>; NUM_KECCAK_SPONGE_COLUMNS] =
+            vars.get_next_values().try_into().unwrap();
         let next_values: &KeccakSpongeColumnsView<ExtensionTarget<D>> = next_values.borrow();
 
         let one = builder.one_extension();