chore: update toolchain (#309)

Our `rust-toolchain` specifies `nightly-2024-05-02`. That one comes with
`rustfmt` version 1.7. But our `rustfmt.toml` uses `style_edition =
"2024"`; but `2024` was only added in version 1.8. So in this PR we
update to a more recent nightly toolchain.

Most of the changes in here are from our specified `rustfmt.toml` config
actually applying. The main thing that's causing a lot of diff is
[version sorting](rust-lang/rust#123800) of
imports, which changes how letter case is handled for comparison.

Fixes #297

Author: matthiasgoergens

.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-05-02
+          toolchain: nightly-2024-10-03
       - name: Cargo cache
         uses: actions/cache@v3
         with:

.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-05-02
+          toolchain: nightly-2024-10-03
       - name: Cargo cache
         uses: actions/cache@v3
         with:

ceno_emul/src/elf.rs

@@ -19,8 +19,8 @@ extern crate alloc;
 use alloc::collections::BTreeMap;
 
 use crate::addr::WORD_SIZE;
-use anyhow::{anyhow, bail, Context, Result};
-use elf::{endian::LittleEndian, file::Class, ElfBytes};
+use anyhow::{Context, Result, anyhow, bail};
+use elf::{ElfBytes, endian::LittleEndian, file::Class};
 
 /// A RISC Zero program
 pub struct Program {

ceno_emul/src/lib.rs

@@ -2,7 +2,7 @@ mod addr;
 pub use addr::*;
 
 mod platform;
-pub use platform::{Platform, CENO_PLATFORM};
+pub use platform::{CENO_PLATFORM, Platform};
 
 mod tracer;
 pub use tracer::{Change, MemOp, ReadOp, StepRecord, Tracer, WriteOp};

ceno_emul/src/rv32im.rs

@@ -14,11 +14,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use anyhow::{anyhow, Result};
+use anyhow::{Result, anyhow};
 use std::sync::OnceLock;
 use strum_macros::EnumIter;
 
-use super::addr::{ByteAddr, RegIdx, Word, WordAddr, WORD_SIZE};
+use super::addr::{ByteAddr, RegIdx, WORD_SIZE, Word, WordAddr};
 
 pub trait EmuContext {
     // Handle environment call

ceno_emul/src/tracer.rs

@@ -1,9 +1,9 @@
 use std::{collections::HashMap, fmt, mem};
 
 use crate::{
+    CENO_PLATFORM, PC_STEP_SIZE,
     addr::{ByteAddr, Cycle, RegIdx, Word, WordAddr},
     rv32im::DecodedInstruction,
-    CENO_PLATFORM, PC_STEP_SIZE,
 };
 
 /// An instruction and its context in an execution trace. That is concrete values of registers and memory.
@@ -239,13 +239,10 @@ impl Tracer {
     /// Return the completed step and advance to the next cycle.
     pub fn advance(&mut self) -> StepRecord {
         let next_cycle = self.record.cycle + Self::SUBCYCLES_PER_INSN;
-        mem::replace(
-            &mut self.record,
-            StepRecord {
-                cycle: next_cycle,
-                ..StepRecord::default()
-            },
-        )
+        mem::replace(&mut self.record, StepRecord {
+            cycle: next_cycle,
+            ..StepRecord::default()
+        })
     }
 
     pub fn store_pc(&mut self, pc: ByteAddr) {

ceno_emul/src/vm_state.rs

@@ -2,13 +2,13 @@ use std::collections::HashMap;
 
 use super::rv32im::EmuContext;
 use crate::{
+    Program,
     addr::{ByteAddr, RegIdx, Word, WordAddr},
     platform::Platform,
     rv32im::{DecodedInstruction, Emulator, TrapCause},
     tracer::{Change, StepRecord, Tracer},
-    Program,
 };
-use anyhow::{anyhow, Result};
+use anyhow::{Result, anyhow};
 use std::iter::from_fn;
 
 /// An implementation of the machine state and of the side-effects of operations.

ceno_emul/tests/test_elf.rs

@@ -1,5 +1,5 @@
 use anyhow::Result;
-use ceno_emul::{ByteAddr, EmuContext, InsnKind, StepRecord, VMState, CENO_PLATFORM};
+use ceno_emul::{ByteAddr, CENO_PLATFORM, EmuContext, InsnKind, StepRecord, VMState};
 
 #[test]
 fn test_ceno_rt_mini() -> Result<()> {

ceno_emul/tests/test_vm_trace.rs

@@ -3,7 +3,7 @@ use anyhow::Result;
 use std::collections::HashMap;
 
 use ceno_emul::{
-    ByteAddr, Cycle, EmuContext, InsnKind, StepRecord, Tracer, VMState, WordAddr, CENO_PLATFORM,
+    ByteAddr, CENO_PLATFORM, Cycle, EmuContext, InsnKind, StepRecord, Tracer, VMState, WordAddr,
 };
 
 #[test]

ceno_zkvm/Cargo.toml

@@ -50,6 +50,8 @@ glob = "0.3"
 default = ["riv32"]
 riv32 = []
 riv64 = []
+non_pow2_rayon_thread = []
+flamegraph = ["pprof/flamegraph", "pprof/criterion"]
 
 [[bench]]
 name = "riscv_add"

ceno_zkvm/benches/riscv_add.rs

@@ -3,7 +3,7 @@ use std::time::{Duration, Instant};
 use ark_std::test_rng;
 use ceno_zkvm::{
     self,
-    instructions::{riscv::arith::AddInstruction, Instruction},
+    instructions::{Instruction, riscv::arith::AddInstruction},
     scheme::prover::ZKVMProver,
     structs::{ZKVMConstraintSystem, ZKVMFixedTraces},
 };

ceno_zkvm/examples/riscv_opcodes.rs

@@ -9,13 +9,13 @@ use clap::Parser;
 use const_env::from_env;
 
 use ceno_emul::{
-    ByteAddr,
+    ByteAddr, CENO_PLATFORM,
     InsnKind::{ADD, BLTU, EANY, JAL},
-    StepRecord, VMState, CENO_PLATFORM,
+    StepRecord, VMState,
 };
 use ceno_zkvm::{
     instructions::riscv::ecall::HaltInstruction,
-    scheme::{constants::MAX_NUM_VARIABLES, verifier::ZKVMVerifier, PublicValues},
+    scheme::{PublicValues, constants::MAX_NUM_VARIABLES, verifier::ZKVMVerifier},
     structs::{ZKVMConstraintSystem, ZKVMFixedTraces, ZKVMWitnesses},
     tables::{AndTableCircuit, LtuTableCircuit, U16TableCircuit},
 };
@@ -24,7 +24,7 @@ use goldilocks::GoldilocksExt2;
 use mpcs::{Basefold, BasefoldRSParams, PolynomialCommitmentScheme};
 use rand_chacha::ChaCha8Rng;
 use tracing_flame::FlameLayer;
-use tracing_subscriber::{fmt, layer::SubscriberExt, EnvFilter, Registry};
+use tracing_subscriber::{EnvFilter, Registry, fmt, layer::SubscriberExt};
 use transcript::Transcript;
 
 #[from_env]

ceno_zkvm/src/expression.rs

@@ -826,7 +826,7 @@ mod tests {
 
     use crate::circuit_builder::{CircuitBuilder, ConstraintSystem};
 
-    use super::{fmt, Expression, ToExpr};
+    use super::{Expression, ToExpr, fmt};
     use ff::Field;
 
     #[test]

ceno_zkvm/src/expression/monomial.rs

@@ -154,7 +154,7 @@ mod tests {
     use super::*;
     use ff::Field;
     use goldilocks::{Goldilocks as F, GoldilocksExt2 as E};
-    use rand_chacha::{rand_core::SeedableRng, ChaChaRng};
+    use rand_chacha::{ChaChaRng, rand_core::SeedableRng};
 
     #[test]
     fn test_to_monomial_form() {

ceno_zkvm/src/gadgets/div.rs

@@ -3,11 +3,11 @@ use std::{fmt::Display, mem::MaybeUninit};
 use ff_ext::ExtensionField;
 
 use crate::{
+    Value,
     circuit_builder::CircuitBuilder,
     error::ZKVMError,
-    instructions::riscv::constants::{UInt, UINT_LIMBS},
+    instructions::riscv::constants::{UINT_LIMBS, UInt},
     witness::LkMultiplicity,
-    Value,
 };
 
 use super::AssertLTConfig;

ceno_zkvm/src/gadgets/mod.rs

@@ -2,5 +2,5 @@ mod div;
 mod is_lt;
 mod is_zero;
 pub use div::DivConfig;
-pub use is_lt::{cal_lt_diff, AssertLTConfig, InnerLtConfig, IsLtConfig};
+pub use is_lt::{AssertLTConfig, InnerLtConfig, IsLtConfig, cal_lt_diff};
 pub use is_zero::{IsEqualConfig, IsZeroConfig};