diff --git a/recursion/core/src/memory/air.rs b/recursion/core/src/memory/air.rs index 33d7c19df1..a1c16c03f1 100644 --- a/recursion/core/src/memory/air.rs +++ b/recursion/core/src/memory/air.rs @@ -12,7 +12,6 @@ use std::borrow::{Borrow, BorrowMut}; use tracing::instrument; use super::columns::MemoryInitCols; -use crate::air::Block; use crate::air::SP1RecursionAirBuilder; use crate::memory::MemoryGlobalChip; use crate::runtime::{ExecutionRecord, RecursionProgram}; @@ -68,17 +67,17 @@ impl MachineAir for MemoryGlobalChip { let (addr, timestamp, value) = &input.last_memory_record[i - input.first_memory_record.len()]; let last = i == nb_events - 1; - let (next_addr, _, _) = if last { - &(F::zero(), F::zero(), Block::from(F::zero())) + let next_addr = if last { + F::zero() } else { - &input.last_memory_record[i - input.first_memory_record.len() + 1] + input.last_memory_record[i - input.first_memory_record.len() + 1].0 }; cols.addr = *addr; cols.timestamp = *timestamp; cols.value = *value; cols.is_finalize = F::one(); (cols.diff_16bit_limb, cols.diff_12bit_limb) = if !last { - compute_addr_diff(*next_addr, *addr, true) + compute_addr_diff(next_addr, *addr, true) } else { (F::zero(), F::zero()) }; diff --git a/rust-toolchain b/rust-toolchain index 3a306210c9..ac81a9875d 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1,3 +1,3 @@ [toolchain] -channel = "nightly-2024-04-17" +channel = "1.75" components = ["llvm-tools", "rustc-dev"] \ No newline at end of file