Update toolchain

And make new clippy happy
scroll-tech · Jan 7, 2025 · fa9cb87 · fa9cb87
1 parent c1b2a7c
commit fa9cb87
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/lints.yml b/.github/workflows/lints.yml
@@ -25,7 +25,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-12-06
+          toolchain: nightly-2025-01-06
       - name: Cargo cache
         uses: actions/cache@v4
         with:

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -24,7 +24,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-12-06
+          toolchain: nightly-2025-01-06
       - name: Cargo cache
         uses: actions/cache@v4
         with:

diff --git a/ceno_emul/src/syscalls/keccak_permute.rs b/ceno_emul/src/syscalls/keccak_permute.rs
@@ -40,7 +40,7 @@ pub fn keccak_permute(vm: &VMState) -> SyscallEffects {
     let output = {
         let mut state = [0_u64; KECCAK_CELLS];
         for (cell, (&lo, &hi)) in izip!(&mut state, input.iter().tuples()) {
-            *cell = lo as u64 | (hi as u64) << 32;
+            *cell = lo as u64 | ((hi as u64) << 32);
         }
 
         keccakf(&mut state);

diff --git a/ceno_zkvm/src/instructions/riscv/shift.rs b/ceno_zkvm/src/instructions/riscv/shift.rs
@@ -251,7 +251,7 @@ mod tests {
         verify::<SllOp>("basic", 0b_0001, 3, 0b_1000);
         // 33 << 33 === 33 << 1
         verify::<SllOp>("rs2 over 5-bits", 0b_0001, 33, 0b_0010);
-        verify::<SllOp>("bit loss", 1 << 31 | 1, 1, 0b_0010);
+        verify::<SllOp>("bit loss", (1 << 31) | 1, 1, 0b_0010);
         verify::<SllOp>("zero shift", 0b_0001, 0, 0b_0001);
         verify::<SllOp>("all zeros", 0b_0000, 0, 0b_0000);
         verify::<SllOp>("base is zero", 0b_0000, 1, 0b_0000);

diff --git a/multilinear_extensions/src/mle.rs b/multilinear_extensions/src/mle.rs
@@ -1013,6 +1013,7 @@ macro_rules! op_mle {
                 } else {
                     &a[..]
                 };
+                #[allow(clippy::useless_conversion)]
                 $op
             }
             _ => unreachable!(),

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,5 +1,5 @@
 [toolchain]
-channel = "nightly-2024-12-06"
+channel = "nightly-2025-01-06"
 targets = ["riscv32im-unknown-none-elf"]
 # We need the sources for build-std.
 components = ["rust-src"]
-Original file line number
+Diff line change
@@ Expand Up / @@ -1013,6 +1013,7 @@ macro_rules! op_mle { @@
                     } else {
                         &a[..]
                     };
+                    #[allow(clippy::useless_conversion)]
                     $op
                 }
                 _ => unreachable!(),
@@ Expand Down @@