Merge branch 'master' into bg/div-rem-remu-opcodes

scroll-tech · Dec 7, 2024 · 277fd77 · 277fd77
2 parents 4c11b43 + e23de25
commit 277fd77
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 27 deletions.
diff --git 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
@@ -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
diff --git a/ceno_emul/src/addr.rs b/ceno_emul/src/addr.rs
@@ -206,7 +206,7 @@ impl IterAddresses for Range<Addr> {
     }
 }
 
-impl<'a, T: GetAddr> IterAddresses for &'a [T] {
+impl<T: GetAddr> IterAddresses for &[T] {
     fn iter_addresses(&self) -> impl ExactSizeIterator<Item = Addr> {
         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
@@ -6,7 +6,7 @@ use crate::{
 
 use super::GlobalStateRegisterMachineChipOperations;
 
-impl<'a, E: ExtensionField> GlobalStateRegisterMachineChipOperations<E> for CircuitBuilder<'a, E> {
+impl<E: ExtensionField> GlobalStateRegisterMachineChipOperations<E> for CircuitBuilder<'_, E> {
     fn state_in(&mut self, pc: Expression<E>, ts: Expression<E>) -> Result<(), ZKVMError> {
         let record: Vec<Expression<E>> = 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
@@ -9,8 +9,8 @@ use crate::{
 };
 use ff_ext::ExtensionField;
 
-impl<'a, E: ExtensionField, NR: Into<String>, N: FnOnce() -> NR> MemoryChipOperations<E, NR, N>
-    for CircuitBuilder<'a, E>
+impl<E: ExtensionField, NR: Into<String>, N: FnOnce() -> NR> MemoryChipOperations<E, NR, N>
+    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
@@ -11,8 +11,8 @@ use crate::{
 
 use super::{RegisterChipOperations, RegisterExpr};
 
-impl<'a, E: ExtensionField, NR: Into<String>, N: FnOnce() -> NR> RegisterChipOperations<E, NR, N>
-    for CircuitBuilder<'a, E>
+impl<E: ExtensionField, NR: Into<String>, N: FnOnce() -> NR> RegisterChipOperations<E, NR, N>
+    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
@@ -6,7 +6,7 @@ pub enum DebugIndex {
     RdWrite = 0,
 }
 
-impl<'a, E: ExtensionField> CircuitBuilder<'a, E> {
+impl<E: ExtensionField> CircuitBuilder<'_, E> {
     pub fn register_debug_expr<T: Into<usize>>(&mut self, debug_index: T, expr: Expression<E>) {
         self.cs.register_debug_expr(debug_index, expr)
     }

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2024-10-03"
+channel = "nightly-2024-12-06"