From b089e99536f52c1fe3c53410d36e9f8143b399ed Mon Sep 17 00:00:00 2001
From: arnaucube <git@arnaucube.com>
Date: Mon, 25 Nov 2024 16:41:04 +0100
Subject: [PATCH] fix clippy lints after updating to v1.82.0

---
 cli/src/main.rs                        |  6 +++++-
 folding-schemes/src/folding/nova/zk.rs | 24 ++++++++++--------------
 folding-schemes/src/lib.rs             |  1 +
 frontends/src/circom/mod.rs            |  2 +-
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/cli/src/main.rs b/cli/src/main.rs
index 32802153..bdd51249 100644
--- a/cli/src/main.rs
+++ b/cli/src/main.rs
@@ -7,7 +7,11 @@ use std::{fs, io};
 mod settings;
 
 fn create_or_open_then_write<T: AsRef<[u8]>>(path: &Path, content: &T) -> Result<(), io::Error> {
-    let mut file = fs::OpenOptions::new().create(true).write(true).open(path)?;
+    let mut file = fs::OpenOptions::new()
+        .create(true)
+        .truncate(true)
+        .write(true)
+        .open(path)?;
     file.write_all(content.as_ref())
 }
 
diff --git a/folding-schemes/src/folding/nova/zk.rs b/folding-schemes/src/folding/nova/zk.rs
index 206d3025..63b5836a 100644
--- a/folding-schemes/src/folding/nova/zk.rs
+++ b/folding-schemes/src/folding/nova/zk.rs
@@ -71,23 +71,21 @@ where
     /// Compute a zero-knowledge proof of a Nova IVC proof
     /// It implements the prover of appendix D.4.in https://eprint.iacr.org/2023/573.pdf
     /// For further details on why folding is hiding, see lemma 9
-    pub fn new<
-        GC1: CurveVar<C1, CF2<C1>> + ToConstraintFieldGadget<CF2<C1>>,
-        GC2: CurveVar<C2, CF2<C2>>,
-        FC: FCircuit<C1::ScalarField>,
-        CS1: CommitmentScheme<C1, true>,
-        CS2: CommitmentScheme<C2, true>,
-    >(
+    pub fn new<GC1, GC2, FC, CS1, CS2>(
         nova: &Nova<C1, GC1, C2, GC2, FC, CS1, CS2, true>,
         mut rng: impl RngCore,
     ) -> Result<RandomizedIVCProof<C1, C2>, Error>
     where
+        GC1: CurveVar<C1, CF2<C1>> + ToConstraintFieldGadget<CF2<C1>>,
+        GC2: CurveVar<C2, CF2<C2>> + ToConstraintFieldGadget<<C2 as CurveGroup>::BaseField>,
+        FC: FCircuit<C1::ScalarField>,
+        CS1: CommitmentScheme<C1, true>,
+        CS2: CommitmentScheme<C2, true>,
         <C1 as Group>::ScalarField: Absorb,
         <C2 as Group>::ScalarField: Absorb,
         <C2 as Group>::ScalarField: PrimeField,
         <C2 as CurveGroup>::BaseField: PrimeField,
         <C2 as CurveGroup>::BaseField: Absorb,
-        GC2: ToConstraintFieldGadget<<C2 as CurveGroup>::BaseField>,
         C1: CurveGroup<BaseField = C2::ScalarField, ScalarField = C2::BaseField>,
     {
         let mut transcript = PoseidonSponge::<C1::ScalarField>::new(&nova.poseidon_config);
@@ -138,11 +136,7 @@ where
     /// Verify a zero-knowledge proof of a Nova IVC proof
     /// It implements the verifier of appendix D.4. in https://eprint.iacr.org/2023/573.pdf
     #[allow(clippy::too_many_arguments)]
-    pub fn verify<
-        CS1: CommitmentScheme<C1, true>,
-        GC2: CurveVar<C2, CF2<C2>>,
-        CS2: CommitmentScheme<C2, true>,
-    >(
+    pub fn verify<CS1, GC2, CS2>(
         r1cs: &R1CS<C1::ScalarField>,
         cf_r1cs: &R1CS<C2::ScalarField>,
         pp_hash: C1::ScalarField,
@@ -153,11 +147,13 @@ where
         proof: &RandomizedIVCProof<C1, C2>,
     ) -> Result<(), Error>
     where
+        CS1: CommitmentScheme<C1, true>,
+        GC2: CurveVar<C2, CF2<C2>>,
+        CS2: CommitmentScheme<C2, true> + ToConstraintFieldGadget<<C2 as CurveGroup>::BaseField>,
         <C1 as Group>::ScalarField: Absorb,
         <C2 as Group>::ScalarField: Absorb,
         <C2 as CurveGroup>::BaseField: PrimeField,
         <C2 as CurveGroup>::BaseField: Absorb,
-        GC2: ToConstraintFieldGadget<<C2 as CurveGroup>::BaseField>,
         C1: CurveGroup<BaseField = C2::ScalarField, ScalarField = C2::BaseField>,
     {
         // Handles case where i=0
diff --git a/folding-schemes/src/lib.rs b/folding-schemes/src/lib.rs
index a829fe6d..8da8b117 100644
--- a/folding-schemes/src/lib.rs
+++ b/folding-schemes/src/lib.rs
@@ -1,6 +1,7 @@
 #![allow(non_snake_case)]
 #![allow(non_upper_case_globals)]
 #![allow(non_camel_case_types)]
+#![allow(clippy::doc_lazy_continuation)]
 
 use ark_ec::{pairing::Pairing, CurveGroup};
 use ark_ff::PrimeField;
diff --git a/frontends/src/circom/mod.rs b/frontends/src/circom/mod.rs
index 88a9da5b..313a5602 100644
--- a/frontends/src/circom/mod.rs
+++ b/frontends/src/circom/mod.rs
@@ -8,8 +8,8 @@ use ark_relations::r1cs::{ConstraintSynthesizer, ConstraintSystemRef, SynthesisE
 use ark_std::fmt::Debug;
 use folding_schemes::{frontend::FCircuit, utils::PathOrBin, Error};
 use num_bigint::BigInt;
+use std::fmt;
 use std::rc::Rc;
-use std::{fmt, usize};
 
 pub mod utils;
 use utils::CircomWrapper;