diff --git a/.github/workflows/lints.yml b/.github/workflows/lints.yml index 61ecda6c6..f87d32886 100644 --- a/.github/workflows/lints.yml +++ b/.github/workflows/lints.yml @@ -46,7 +46,7 @@ jobs: components: rustfmt, clippy targets: riscv32im-unknown-none-elf # TODO(Matthias): see whether we can keep this in sync with rust-toolchain.toml automatically? - toolchain: nightly-2024-10-03 + toolchain: nightly-2024-12-06 - name: Cargo cache uses: actions/cache@v3 with: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9cfdc255f..7bc6ef35a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -44,7 +44,7 @@ jobs: with: targets: riscv32im-unknown-none-elf # TODO(Matthias): see whether we can keep this in sync with rust-toolchain.toml automatically? - toolchain: nightly-2024-10-03 + toolchain: nightly-2024-12-06 - name: Cargo cache uses: actions/cache@v3 with: diff --git a/Cargo.lock b/Cargo.lock index fc7da65b3..d84685eb4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -217,9 +217,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.2.2" +version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f34d93e62b03caf570cccc334cbc6c2fceca82f39211051345108adcba3eebdc" +checksum = "27f657647bcff5394bf56c7317665bbf790a137a50eaaa5c6bfbb9e27a518f2d" dependencies = [ "shlex", ] @@ -937,9 +937,9 @@ checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" [[package]] name = "js-sys" -version = "0.3.74" +version = "0.3.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a865e038f7f6ed956f788f0d7d60c541fff74c7bd74272c5d4cf15c63743e705" +checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7" dependencies = [ "once_cell", "wasm-bindgen", @@ -2094,9 +2094,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.97" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d15e63b4482863c109d70a7b8706c1e364eb6ea449b201a76c5b89cedcec2d5c" +checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396" dependencies = [ "cfg-if", "once_cell", @@ -2105,13 +2105,12 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.97" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d36ef12e3aaca16ddd3f67922bc63e48e953f126de60bd33ccc0101ef9998cd" +checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79" dependencies = [ "bumpalo", "log", - "once_cell", "proc-macro2", "quote", "syn 2.0.90", @@ -2120,9 +2119,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.97" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "705440e08b42d3e4b36de7d66c944be628d579796b8090bfa3471478a2260051" +checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2130,9 +2129,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.97" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98c9ae5a76e46f4deecd0f0255cc223cfa18dc9b261213b8aa0c7b36f61b3f1d" +checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" dependencies = [ "proc-macro2", "quote", @@ -2143,15 +2142,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.97" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ee99da9c5ba11bd675621338ef6fa52296b76b83305e9b6e5c77d4c286d6d49" +checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6" [[package]] name = "web-sys" -version = "0.3.74" +version = "0.3.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a98bc3c33f0fe7e59ad7cd041b89034fa82a7c2d4365ca538dda6cdaf513863c" +checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc" dependencies = [ "js-sys", "wasm-bindgen", diff --git a/ceno_emul/src/addr.rs b/ceno_emul/src/addr.rs index 78b01563e..ff8f7c0a0 100644 --- a/ceno_emul/src/addr.rs +++ b/ceno_emul/src/addr.rs @@ -206,7 +206,7 @@ impl IterAddresses for Range { } } -impl<'a, T: GetAddr> IterAddresses for &'a [T] { +impl IterAddresses for &[T] { fn iter_addresses(&self) -> impl ExactSizeIterator { self.iter().map(T::get_addr) } diff --git a/ceno_zkvm/src/chip_handler/global_state.rs b/ceno_zkvm/src/chip_handler/global_state.rs index 110db6a84..27c28e166 100644 --- a/ceno_zkvm/src/chip_handler/global_state.rs +++ b/ceno_zkvm/src/chip_handler/global_state.rs @@ -6,7 +6,7 @@ use crate::{ use super::GlobalStateRegisterMachineChipOperations; -impl<'a, E: ExtensionField> GlobalStateRegisterMachineChipOperations for CircuitBuilder<'a, E> { +impl GlobalStateRegisterMachineChipOperations for CircuitBuilder<'_, E> { fn state_in(&mut self, pc: Expression, ts: Expression) -> Result<(), ZKVMError> { let record: Vec> = vec![ Expression::Constant(E::BaseField::from(RAMType::GlobalState as u64)), diff --git a/ceno_zkvm/src/chip_handler/memory.rs b/ceno_zkvm/src/chip_handler/memory.rs index 7c1100247..3b6b2ec53 100644 --- a/ceno_zkvm/src/chip_handler/memory.rs +++ b/ceno_zkvm/src/chip_handler/memory.rs @@ -9,8 +9,8 @@ use crate::{ }; use ff_ext::ExtensionField; -impl<'a, E: ExtensionField, NR: Into, N: FnOnce() -> NR> MemoryChipOperations - for CircuitBuilder<'a, E> +impl, N: FnOnce() -> NR> MemoryChipOperations + for CircuitBuilder<'_, E> { fn memory_read( &mut self, diff --git a/ceno_zkvm/src/chip_handler/register.rs b/ceno_zkvm/src/chip_handler/register.rs index e8a51a2d7..d2f1ebf14 100644 --- a/ceno_zkvm/src/chip_handler/register.rs +++ b/ceno_zkvm/src/chip_handler/register.rs @@ -11,8 +11,8 @@ use crate::{ use super::{RegisterChipOperations, RegisterExpr}; -impl<'a, E: ExtensionField, NR: Into, N: FnOnce() -> NR> RegisterChipOperations - for CircuitBuilder<'a, E> +impl, N: FnOnce() -> NR> RegisterChipOperations + for CircuitBuilder<'_, E> { fn register_read( &mut self, diff --git a/ceno_zkvm/src/chip_handler/test.rs b/ceno_zkvm/src/chip_handler/test.rs index 3df4b1e71..e8e36aa31 100644 --- a/ceno_zkvm/src/chip_handler/test.rs +++ b/ceno_zkvm/src/chip_handler/test.rs @@ -6,7 +6,7 @@ pub enum DebugIndex { RdWrite = 0, } -impl<'a, E: ExtensionField> CircuitBuilder<'a, E> { +impl CircuitBuilder<'_, E> { pub fn register_debug_expr>(&mut self, debug_index: T, expr: Expression) { self.cs.register_debug_expr(debug_index, expr) } diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 5d1274a3e..eb12bd38f 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "nightly-2024-10-03" +channel = "nightly-2024-12-06"