From ae330ff6a79df9c953fae81e2a6cc17c17f849a3 Mon Sep 17 00:00:00 2001
From: wborgeaud <williamborgeaud@gmail.com>
Date: Tue, 8 Feb 2022 18:19:11 +0100
Subject: [PATCH] Clippy

---
 plonky2/src/fri/challenges.rs    |  1 -
 starky/src/get_challenges.rs     |  1 +
 starky/src/recursive_verifier.rs | 11 +++++------
 starky/src/verifier.rs           |  3 +--
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/plonky2/src/fri/challenges.rs b/plonky2/src/fri/challenges.rs
index 9222ebc8..0655d31f 100644
--- a/plonky2/src/fri/challenges.rs
+++ b/plonky2/src/fri/challenges.rs
@@ -10,7 +10,6 @@ use crate::hash::merkle_tree::MerkleCap;
 use crate::iop::challenger::{Challenger, RecursiveChallenger};
 use crate::iop::target::Target;
 use crate::plonk::circuit_builder::CircuitBuilder;
-use crate::plonk::circuit_data::CommonCircuitData;
 use crate::plonk::config::{AlgebraicHasher, GenericConfig, Hasher};
 
 impl<F: RichField, H: Hasher<F>> Challenger<F, H> {
diff --git a/starky/src/get_challenges.rs b/starky/src/get_challenges.rs
index d44075e7..3d815caf 100644
--- a/starky/src/get_challenges.rs
+++ b/starky/src/get_challenges.rs
@@ -101,6 +101,7 @@ impl<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>, const D: usize>
     }
 }
 
+#[allow(clippy::too_many_arguments)]
 pub(crate) fn get_challenges_target<
     F: RichField + Extendable<D>,
     C: GenericConfig<D, F = F>,
diff --git a/starky/src/recursive_verifier.rs b/starky/src/recursive_verifier.rs
index 8f7f6d8f..4e41a255 100644
--- a/starky/src/recursive_verifier.rs
+++ b/starky/src/recursive_verifier.rs
@@ -5,7 +5,6 @@ use plonky2::iop::ext_target::ExtensionTarget;
 use plonky2::plonk::circuit_builder::CircuitBuilder;
 use plonky2::plonk::config::{AlgebraicHasher, GenericConfig};
 use plonky2::util::reducing::ReducingFactorTarget;
-use plonky2::with_context;
 
 use crate::config::StarkConfig;
 use crate::constraint_consumer::RecursiveConstraintConsumer;
@@ -13,7 +12,7 @@ use crate::proof::{
     StarkOpeningSetTarget, StarkProofChallengesTarget, StarkProofWithPublicInputsTarget,
 };
 use crate::stark::Stark;
-use crate::vars::{StarkEvaluationTargets, StarkEvaluationVars};
+use crate::vars::StarkEvaluationTargets;
 
 pub fn verify_stark_proof<
     F: RichField + Extendable<D>,
@@ -27,8 +26,8 @@ pub fn verify_stark_proof<
     inner_config: &StarkConfig,
 ) where
     C::Hasher: AlgebraicHasher<F>,
-    [(); { S::COLUMNS }]:,
-    [(); { S::PUBLIC_INPUTS }]:,
+    [(); S::COLUMNS]:,
+    [(); S::PUBLIC_INPUTS]:,
 {
     assert_eq!(proof_with_pis.public_inputs.len(), S::PUBLIC_INPUTS);
     let degree_bits = proof_with_pis.proof.recover_degree_bits(inner_config);
@@ -59,8 +58,8 @@ fn verify_stark_proof_with_challenges<
     degree_bits: usize,
 ) where
     C::Hasher: AlgebraicHasher<F>,
-    [(); { S::COLUMNS }]:,
-    [(); { S::PUBLIC_INPUTS }]:,
+    [(); S::COLUMNS]:,
+    [(); S::PUBLIC_INPUTS]:,
 {
     let one = builder.one_extension();
 
diff --git a/starky/src/verifier.rs b/starky/src/verifier.rs
index f02a5619..e8ae6221 100644
--- a/starky/src/verifier.rs
+++ b/starky/src/verifier.rs
@@ -5,11 +5,10 @@ use plonky2::fri::verifier::verify_fri_proof;
 use plonky2::hash::hash_types::RichField;
 use plonky2::plonk::config::GenericConfig;
 use plonky2::plonk::plonk_common::reduce_with_powers;
-use plonky2_util::log2_strict;
 
 use crate::config::StarkConfig;
 use crate::constraint_consumer::ConstraintConsumer;
-use crate::proof::{StarkOpeningSet, StarkProof, StarkProofChallenges, StarkProofWithPublicInputs};
+use crate::proof::{StarkOpeningSet, StarkProofChallenges, StarkProofWithPublicInputs};
 use crate::stark::Stark;
 use crate::vars::StarkEvaluationVars;