diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 806ce990d8..daf8911052 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -73,7 +73,7 @@ jobs: RUST_TOOLCHAIN_COVERAGE_VERSION: "1.74" strategy: matrix: - rust_toolchain_version: ["1.72", "1.73", "1.74", "1.75", "1.76", "1.77", "1.78"] + rust_toolchain_version: ["1.72", "1.73", "1.74", "1.75", "1.76", "1.77", "1.78", "1.79"] # 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 diff --git a/ivc/src/ivc/interpreter.rs b/ivc/src/ivc/interpreter.rs index a1d7784d20..befb0b804e 100644 --- a/ivc/src/ivc/interpreter.rs +++ b/ivc/src/ivc/interpreter.rs @@ -818,15 +818,11 @@ pub fn build_fixed_selectors( } for i in N_BLOCKS..N_FSEL_IVC - N_BLOCKS { - PoseidonBN254Parameters - .constants() - .iter() - .enumerate() - .for_each(|(_round, rcs)| { - rcs.iter().enumerate().for_each(|(_state_index, rc)| { - selectors[i] = vec![*rc; domain_size]; - }); + PoseidonBN254Parameters.constants().iter().for_each(|rcs| { + rcs.iter().for_each(|rc| { + selectors[i] = vec![*rc; domain_size]; }); + }); } selectors diff --git a/kimchi/src/circuits/polynomials/foreign_field_add/witness.rs b/kimchi/src/circuits/polynomials/foreign_field_add/witness.rs index c54236197b..99c4a1b33c 100644 --- a/kimchi/src/circuits/polynomials/foreign_field_add/witness.rs +++ b/kimchi/src/circuits/polynomials/foreign_field_add/witness.rs @@ -147,7 +147,7 @@ pub fn create_chain( // Make sure that the inputs are smaller than the modulus just in case let inputs: Vec = inputs.iter().map(|input| input % modulus.clone()).collect(); - let mut witness = array::from_fn(|_| vec![F::zero(); 0]); + let mut witness: [Vec; COLUMNS] = array::from_fn(|_| vec![]); let foreign_modulus = ForeignElement::from_biguint(modulus); diff --git a/kimchi/src/circuits/polynomials/foreign_field_mul/witness.rs b/kimchi/src/circuits/polynomials/foreign_field_mul/witness.rs index 16cb810d05..7b14e6938e 100644 --- a/kimchi/src/circuits/polynomials/foreign_field_mul/witness.rs +++ b/kimchi/src/circuits/polynomials/foreign_field_mul/witness.rs @@ -152,7 +152,7 @@ pub fn create( right_input: &BigUint, foreign_field_modulus: &BigUint, ) -> ([Vec; COLUMNS], ExternalChecks) { - let mut witness = array::from_fn(|_| vec![F::zero(); 0]); + let mut witness: [Vec; COLUMNS] = array::from_fn(|_| vec![]); let mut external_checks = ExternalChecks::::default(); // Compute quotient and remainder using foreign field modulus diff --git a/kimchi/src/prover.rs b/kimchi/src/prover.rs index b135d20836..711e2cacbf 100644 --- a/kimchi/src/prover.rs +++ b/kimchi/src/prover.rs @@ -701,8 +701,7 @@ where index_evals.extend( foreign_field_mul::gadget::circuit_gates() .iter() - .enumerate() - .map(|(_, gate_type)| (*gate_type, selector)), + .map(|gate_type| (*gate_type, selector)), ); } diff --git a/kimchi/src/tests/keccak.rs b/kimchi/src/tests/keccak.rs index cb0f0e5387..80565f59d7 100644 --- a/kimchi/src/tests/keccak.rs +++ b/kimchi/src/tests/keccak.rs @@ -36,8 +36,7 @@ fn create_keccak_witness(message: BigUint) -> [Vec; KECCAK_COLS] = - array::from_fn(|_| vec![G::ScalarField::zero(); 0]); + let mut witness: [Vec; KECCAK_COLS] = array::from_fn(|_| vec![]); extend_keccak_witness(&mut witness, message); // Adding dummy row to avoid out of bounds in squeeze constraints accessing Next row let dummy_row: [Vec; KECCAK_COLS] = diff --git a/o1vm/src/utils.rs b/o1vm/src/utils.rs index 64b70ded78..9dfe7496a5 100644 --- a/o1vm/src/utils.rs +++ b/o1vm/src/utils.rs @@ -45,6 +45,6 @@ mod tests { assert_eq!(memory_size(1024_usize), "1.0 KiB"); assert_eq!(memory_size(1024 * 1024_usize), "1.0 MiB"); assert_eq!(memory_size(2100 * 1024 * 1024_usize), "2.1 GiB"); - assert_eq!(memory_size(std::usize::MAX), "16.0 EiB"); + assert_eq!(memory_size(usize::MAX), "16.0 EiB"); } }