WIP - Make proof-systems compatible with 1.91

.github/workflows/benches-mina-prover-set-baseline.yml

@@ -13,7 +13,7 @@ on:
 
 env:
   OCAML_VERSION: "4.14.2"
-  RUST_TOOLCHAIN_VERSION: "1.81"
+  RUST_TOOLCHAIN_VERSION: "1.91"
 
 
 jobs:

.github/workflows/benches-mina-prover.yml

@@ -5,7 +5,7 @@ on:
 
 env:
   OCAML_VERSION: "4.14.2"
-  RUST_TOOLCHAIN_VERSION: "1.81"
+  RUST_TOOLCHAIN_VERSION: "1.91"
 
 jobs:
 

.github/workflows/benches.yml

@@ -7,7 +7,7 @@ on:
 
 env:
   OCAML_VERSION: "4.14.2"
-  RUST_TOOLCHAIN_VERSION: "1.81"
+  RUST_TOOLCHAIN_VERSION: "1.91"
 
 jobs:
   bench:

.github/workflows/ci-nightly.yml

@@ -28,7 +28,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        rust_toolchain_version: ["1.81"]
+        rust_toolchain_version: ["1.91"]
         # FIXME: currently not available for 5.0.0.
         # It might be related to boxroot dependency, and we would need to bump
         # up the ocaml-rs dependency

.github/workflows/ci.yml

@@ -45,21 +45,16 @@ jobs:
         run: echo 'version=["20"]' >> "$GITHUB_OUTPUT"
       - id: defaults
         run: |
-          echo 'rust_version=1.81' >> "$GITHUB_OUTPUT"
+          echo 'rust_version=1.91' >> "$GITHUB_OUTPUT"
           echo 'os=ubuntu-latest' >> "$GITHUB_OUTPUT"
       - id: matrix
         run: |
-          # NOTE: This custom matrix configuration is needed to use Rust 1.84 specifically for macOS.
-          # When https://github.com/o1-labs/proof-systems/issues/3254 is fixed,
-          # this can be simplified to use a standard matrix configuration.
           cat > matrix.json << 'EOF'
           {
             "include": [
-              {"rust_toolchain_version": "1.81", "os": "ubuntu-latest"},
-              {"rust_toolchain_version": "1.82", "os": "ubuntu-latest"},
-              {"rust_toolchain_version": "1.81", "os": "ubuntu-24.04-arm"},
-              {"rust_toolchain_version": "1.82", "os": "ubuntu-24.04-arm"},
-              {"rust_toolchain_version": "1.84", "os": "macos-latest"}
+              {"rust_toolchain_version": "1.91", "os": "ubuntu-latest"},
+              {"rust_toolchain_version": "1.91", "os": "ubuntu-24.04-arm"},
+              {"rust_toolchain_version": "1.91", "os": "macos-latest"}
             ]
           }
           EOF
@@ -98,10 +93,6 @@ jobs:
         rust_and_os: ${{ fromJSON(needs.define-matrix.outputs.matrix).include }}
         ocaml_version: ${{ fromJSON(needs.define-matrix.outputs.ocaml_version) }}
         node: ${{ fromJSON(needs.define-matrix.outputs.node) }}
-        exclude:
-          # Skip Rust 1.84 due to linting issues - remove when
-          # https://github.com/o1-labs/proof-systems/pull/3245 is fixed
-          - rust_and_os: {rust_toolchain_version: '1.84', os: 'macos-latest'}
     runs-on: ${{ matrix.rust_and_os.os }}
     steps:
       - name: Checkout repository
@@ -203,10 +194,6 @@ jobs:
         rust_and_os: ${{ fromJSON(needs.define-matrix.outputs.matrix).include }}
         ocaml_version: ${{ fromJSON(needs.define-matrix.outputs.ocaml_version) }}
         node: ${{ fromJSON(needs.define-matrix.outputs.node) }}
-        exclude:
-          # Skip Rust 1.84 due to linting issues - remove when
-          # https://github.com/o1-labs/proof-systems/pull/3245 is fixed
-          - rust_and_os: {rust_toolchain_version: '1.84', os: 'macos-latest'}
     runs-on: ${{ matrix.rust_and_os.os }}
     steps:
       - name: Checkout repository
@@ -276,10 +263,6 @@ jobs:
         rust_and_os: ${{ fromJSON(needs.define-matrix.outputs.matrix).include }}
         ocaml_version: ${{ fromJSON(needs.define-matrix.outputs.ocaml_version) }}
         node: ${{ fromJSON(needs.define-matrix.outputs.node) }}
-        exclude:
-          # Skip Rust 1.84 due to linting issues - remove when
-          # https://github.com/o1-labs/proof-systems/pull/3245 is fixed
-          - rust_and_os: {rust_toolchain_version: '1.84', os: 'macos-latest'}
     runs-on: ${{ matrix.rust_and_os.os }}
     steps:
       - name: Checkout repository

.github/workflows/o1vm-ci.yml

@@ -28,7 +28,7 @@ jobs:
     runs-on: ["ubuntu-latest"]
     strategy:
       matrix:
-        rust_toolchain_version: ["1.81"]
+        rust_toolchain_version: ["1.91"]
         # FIXME: currently not available for 5.0.0.
         # It might be related to boxroot dependency, and we would need to bump
         # up the ocaml-rs dependency

.github/workflows/test-export-vectors.yml

@@ -29,7 +29,7 @@ jobs:
       - name: Use shared Rust toolchain setting up steps
         uses: ./.github/actions/toolchain-shared
         with:
-          rust_toolchain_version: "1.81"
+          rust_toolchain_version: "1.91"
 
       - name: Use shared OCaml setting up steps
         uses: ./.github/actions/ocaml-shared

arrabbiata/src/interpreter.rs

@@ -1,3 +1,4 @@
+#![allow(clippy::doc_overindented_list_items)]
 //! This module contains the implementation of the IVC scheme in addition to
 //! running an arbitrary function that can use up to [crate::NUMBER_OF_COLUMNS]
 //! columns.

arrabbiata/src/witness.rs

@@ -1,3 +1,6 @@
+// We can't use is_multiple_of as it's not available in the older nightly used for WASM builds
+#![allow(clippy::manual_is_multiple_of)]
+
 use ark_ec::CurveConfig;
 use ark_ff::PrimeField;
 use ark_poly::Evaluations;

curves/Cargo.toml

@@ -9,6 +9,11 @@ readme = "../README.md"
 edition = "2021"
 license = "Apache-2.0"
 
+[lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = [
+  "cfg(feature, values(\"asm\"))",
+] }
+
 [dependencies]
 ark-bn254.workspace = true
 ark-ec.workspace = true

hasher/src/roinput.rs

@@ -260,7 +260,7 @@ impl ROInput {
         // Check that the number of bytes is consistent with the expected lengths
         let expected_len_bits = fields_len * Fp::MODULUS_BIT_SIZE as usize + bits_len;
         // Round up to nearest multiple of 8
-        let expected_len = (expected_len_bits + 7) / 8 + SER_HEADER_SIZE;
+        let expected_len = expected_len_bits.div_ceil(8) + SER_HEADER_SIZE;
         if input.len() != expected_len {
             return Err(Error);
         }

internal-tracing/src/lib.rs

@@ -107,6 +107,8 @@ macro_rules! decl_traces {
             }
 
             #[cfg(feature = "ocaml_types")]
+            #[allow(non_local_definitions)]
+            #[allow(dead_code)]
             pub mod caml {
                 use super::*;
 

kimchi-stubs/src/lib.rs

@@ -7,6 +7,9 @@
 //!   a math library that Proof-systems builds on top of.
 //!
 
+#![allow(non_local_definitions)]
+#![allow(unexpected_cfgs)]
+
 extern crate libc;
 
 /// Caml helpers

kimchi/benches/amortization.rs

@@ -8,9 +8,7 @@ pub fn amortization(c: &mut Criterion) {
 
     let ctx = BenchmarkCtx::new(16);
     let proof_and_public = ctx.create_proof();
-    let proofs: Vec<_> = core::iter::repeat(proof_and_public)
-        .take(1 << PROOFS)
-        .collect();
+    let proofs: Vec<_> = std::iter::repeat_n(proof_and_public, 1 << PROOFS).collect();
 
     group.sample_size(10);
     for size in 0..=PROOFS {

kimchi/benches/proof_criterion_mina.rs

@@ -25,7 +25,7 @@ pub fn bench_proof_creation_mina(c: &mut Criterion) {
     // Parse filename "kimchi_inputs_CURVENAME_SEED.ser" into two parameters
     let (curve_name, seed): (&str, &str) = filename
         .split('/')
-        .last()
+        .next_back()
         .unwrap()
         .strip_prefix("kimchi_inputs_")
         .unwrap()

kimchi/benches/proof_iai.rs

@@ -8,7 +8,7 @@ fn bench_proof_creation() {
 fn bench_proof_creation_and_verification() {
     let ctx = BenchmarkCtx::new(14);
     let proof_and_public = ctx.create_proof();
-    ctx.batch_verification(&vec![proof_and_public]);
+    ctx.batch_verification(&[proof_and_public]);
 }
 
 iai::main!(bench_proof_creation, bench_proof_creation_and_verification);

kimchi/src/alphas.rs

@@ -130,7 +130,7 @@ impl<F: Field> Alphas<F> {
         &self,
         ty: ArgumentType,
         num: u32,
-    ) -> MustConsumeIterator<Cloned<Take<Skip<Iter<F>>>>, F> {
+    ) -> MustConsumeIterator<Cloned<Take<Skip<Iter<'_, F>>>>, F> {
         let ty = if matches!(ty, ArgumentType::Gate(_)) {
             ArgumentType::Gate(GateType::Zero)
         } else {

kimchi/src/bin/flamegraph.rs

@@ -27,7 +27,7 @@ fn main() {
             let ctx = BenchmarkCtx::new(4);
             let proof_and_public = ctx.create_proof();
             loop {
-                ctx.batch_verification(black_box(&vec![proof_and_public.clone()]));
+                ctx.batch_verification(black_box(std::slice::from_ref(&proof_and_public)));
             }
         }
         _ => panic!("you must provide an argument (prove or verify)"),

kimchi/src/circuits/lookup/index.rs

@@ -13,7 +13,6 @@ use ark_poly::{
     univariate::DensePolynomial as DP, EvaluationDomain, Evaluations as E,
     Radix2EvaluationDomain as D,
 };
-use core::iter;
 use itertools::repeat_n;
 use o1_utils::field_helpers::i32_to_field;
 use serde::{de::DeserializeOwned, Deserialize, Serialize};
@@ -287,12 +286,12 @@ impl<F: PrimeField> LookupConstraintSystem<F> {
 
                             // it's 1 everywhere, except at the entries where
                             // the runtime table applies
-                            evals.extend(iter::repeat(F::one()).take(runtime_table_offset));
-                            evals.extend(iter::repeat(F::zero()).take(runtime_len));
-                            evals.extend(
-                                iter::repeat(F::one())
-                                    .take(d1_size - runtime_table_offset - runtime_len),
-                            );
+                            evals.extend(std::iter::repeat_n(F::one(), runtime_table_offset));
+                            evals.extend(std::iter::repeat_n(F::zero(), runtime_len));
+                            evals.extend(std::iter::repeat_n(
+                                F::one(),
+                                d1_size - runtime_table_offset - runtime_len,
+                            ));
 
                             // although the last zk_rows are fine
                             for e in evals.iter_mut().rev().take(zk_rows) {

kimchi/src/circuits/polynomials/foreign_field_add/witness.rs

@@ -156,7 +156,7 @@ pub fn create_chain<F: PrimeField>(
     for i in 0..num {
         // Create foreign field addition row
         for w in &mut witness {
-            w.extend(core::iter::repeat(F::zero()).take(1));
+            w.extend(std::iter::repeat_n(F::zero(), 1));
         }
         let right = ForeignElement::from_biguint(inputs[i + 1].clone());
         let (output, _sign, ovf, carry) =
@@ -298,7 +298,7 @@ pub fn extend_witness_bound_addition<F: PrimeField>(
     // Extend the witness for the add gate
     let offset = witness[0].len();
     for col in witness.iter_mut().take(COLUMNS) {
-        col.extend(core::iter::repeat(F::zero()).take(2))
+        col.extend(std::iter::repeat_n(F::zero(), 2))
     }
 
     init_bound_rows(

kimchi/src/circuits/polynomials/foreign_field_mul/witness.rs

@@ -198,7 +198,7 @@ pub fn create<F: PrimeField>(
 
     // Extend the witness by two rows for foreign field multiplication
     for w in &mut witness {
-        w.extend(core::iter::repeat(F::zero()).take(2));
+        w.extend(std::iter::repeat_n(F::zero(), 2));
     }
 
     // Create the foreign field multiplication witness rows
@@ -329,7 +329,7 @@ impl<F: PrimeField> ExternalChecks<F> {
         for chunk in self.high_bounds.clone().chunks(2) {
             // Extend the witness for the generic gate
             for col in witness.iter_mut().take(COLUMNS) {
-                col.extend(core::iter::repeat(F::zero()).take(1))
+                col.extend(std::iter::repeat_n(F::zero(), 1))
             }
             let last_row = witness[0].len() - 1;
             // Fill in with dummy if it is an odd number of bounds

kimchi/src/circuits/polynomials/keccak/constants.rs

@@ -1,4 +1,4 @@
-/// Constants for each witness' index offsets and lengths
+// Constants for each witness' index offsets and lengths
 
 // KECCAK PARAMETERS
 /// The dimension of the Keccak state

kimchi/src/circuits/polynomials/keccak/witness.rs

@@ -393,6 +393,7 @@ impl PiRho {
         let aux = grid!(100, rotation_e.expand_rot);
         for y in 0..DIM {
             for x in 0..DIM {
+                #[allow(clippy::needless_range_loop)]
                 for q in 0..QUARTERS {
                     state_b[(2 * x + 3 * y) % DIM][y][q] = aux(y, x, q);
                 }

kimchi/src/circuits/polynomials/turshi.rs

@@ -1,3 +1,4 @@
+#![allow(clippy::doc_overindented_list_items)]
 //! This implements the constraints of the Cairo gates
 //!
 //! Cairo programs can have the following assembly-like instructions:

kimchi/src/lib.rs

@@ -1,4 +1,5 @@
 #![doc = include_str!("../README.md")]
+#![allow(non_local_definitions)]
 
 pub use groupmap;
 pub use mina_curves;

kimchi/src/prover.rs

@@ -241,7 +241,7 @@ where
             }
 
             // padding
-            w.extend(core::iter::repeat(G::ScalarField::zero()).take(length_padding));
+            w.extend(std::iter::repeat_n(G::ScalarField::zero(), length_padding));
 
             // zk-rows
             for row in w.iter_mut().rev().take(index.cs.zk_rows as usize) {

kimchi/src/snarky/runner.rs

@@ -599,7 +599,7 @@ where
         }
 
         // pad with zeros for the public output part
-        public_input.extend(core::iter::repeat(F::zero()).take(self.public_output.len()));
+        public_input.extend(std::iter::repeat_n(F::zero(), self.public_output.len()));
 
         // re-initialize `next_var` (which will grow every time we compile or generate a witness)
         self.next_var = self.num_public_inputs;

kimchi/src/tests/serde.rs

@@ -49,7 +49,7 @@ mod tests {
             rmp_serde::from_slice(&ser_pf).unwrap();
 
         // verify the deserialized proof (must accept the proof)
-        ctx.batch_verification(&vec![(de_pf, public_input)]);
+        ctx.batch_verification(&[(de_pf, public_input)]);
     }
 
     #[test]

msm/src/circuit_design/witness.rs

@@ -9,7 +9,7 @@ use crate::{
 };
 use ark_ff::PrimeField;
 use log::debug;
-use std::{collections::BTreeMap, iter, marker::PhantomData};
+use std::{collections::BTreeMap, marker::PhantomData};
 
 /// Witness builder environment. Operates on multiple rows at the same
 /// time. `CIx::N_COL` must be equal to `N_WIT + N_FSEL`; passing these two
@@ -345,9 +345,8 @@ impl<
             );
             if table_id.length() < domain_size {
                 let n_repeated_dummy_value: usize = domain_size - table_id.length() - 1;
-                let repeated_dummy_value: Vec<F> = iter::repeat(-F::one())
-                    .take(n_repeated_dummy_value)
-                    .collect();
+                let repeated_dummy_value: Vec<F> =
+                    std::iter::repeat_n(-F::one(), n_repeated_dummy_value).collect();
                 m.extend(repeated_dummy_value);
                 m.push(F::from(n_repeated_dummy_value as u64));
             }

msm/src/fec/interpreter.rs

@@ -1,3 +1,5 @@
+#![allow(clippy::doc_overindented_list_items)]
+
 use crate::{
     circuit_design::{
         capabilities::{read_column_array, write_column_array_const, write_column_const},

msm/src/lookups.rs

@@ -4,7 +4,7 @@ use crate::logup::{Logup, LogupWitness, LookupTableID};
 use ark_ff::{FftField, PrimeField};
 use kimchi::circuits::domains::EvaluationDomains;
 use rand::{seq::SliceRandom, thread_rng, Rng};
-use std::{cmp::Ord, iter};
+use std::cmp::Ord;
 
 /// Dummy lookup table. For the cases when you don't need one -- a single dummy element 0.
 #[derive(Clone, Copy, Debug, Hash, Eq, PartialEq, Ord, PartialOrd)]
@@ -144,9 +144,8 @@ impl<F: FftField> LookupWitness<F> {
         };
         let dummy_value = F::rand(&mut rng);
         let repeated_dummy_value: Vec<F> = {
-            let r: Vec<F> = iter::repeat(dummy_value)
-                .take((domain.d1.size - table_size) as usize)
-                .collect();
+            let r: Vec<F> =
+                std::iter::repeat_n(dummy_value, (domain.d1.size - table_size) as usize).collect();
             r
         };
         let t_evals = {

msm/src/serialization/interpreter.rs

@@ -1,3 +1,6 @@
+// We can't use is_multiple_of as it's not available in the older nightly used for WASM builds
+#![allow(clippy::manual_is_multiple_of)]
+
 use ark_ff::{PrimeField, Zero};
 use num_bigint::{BigInt, BigUint, ToBigInt};
 use num_integer::Integer;

msm/src/test/proof_system.rs

@@ -1,4 +1,4 @@
-/// Tests for the proof system itself, targeting prover and verifier.
+//! Tests for the proof system itself, targeting prover and verifier.
 
 #[cfg(test)]
 mod tests {

mvpoly/src/lib.rs

@@ -4,8 +4,8 @@
 //! Different representations are provided in the sub-modules:
 //! - `monomials`: a representation based on monomials
 //! - `prime`: a representation based on a mapping from variables to prime
-//!    numbers. This representation is unmaintained for now. We leave it
-//!    for interested users.
+//!   numbers. This representation is unmaintained for now. We leave it
+//!   for interested users.
 //!
 //! "Expressions", as defined in the [kimchi] crate, can be converted into a
 //! multi-variate polynomial using the `from_expr` method.