Skip to content

Commit fa9cb87

Browse files
Update toolchain
And make new clippy happy
1 parent c1b2a7c commit fa9cb87

File tree

6 files changed

+6
-5
lines changed

6 files changed

+6
-5
lines changed

.github/workflows/lints.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
components: rustfmt, clippy
2626
targets: riscv32im-unknown-none-elf
2727
# TODO(Matthias): see whether we can keep this in sync with rust-toolchain.toml automatically?
28-
toolchain: nightly-2024-12-06
28+
toolchain: nightly-2025-01-06
2929
- name: Cargo cache
3030
uses: actions/cache@v4
3131
with:

.github/workflows/tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
with:
2525
targets: riscv32im-unknown-none-elf
2626
# TODO(Matthias): see whether we can keep this in sync with rust-toolchain.toml automatically?
27-
toolchain: nightly-2024-12-06
27+
toolchain: nightly-2025-01-06
2828
- name: Cargo cache
2929
uses: actions/cache@v4
3030
with:

ceno_emul/src/syscalls/keccak_permute.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ pub fn keccak_permute(vm: &VMState) -> SyscallEffects {
4040
let output = {
4141
let mut state = [0_u64; KECCAK_CELLS];
4242
for (cell, (&lo, &hi)) in izip!(&mut state, input.iter().tuples()) {
43-
*cell = lo as u64 | (hi as u64) << 32;
43+
*cell = lo as u64 | ((hi as u64) << 32);
4444
}
4545

4646
keccakf(&mut state);

ceno_zkvm/src/instructions/riscv/shift.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ mod tests {
251251
verify::<SllOp>("basic", 0b_0001, 3, 0b_1000);
252252
// 33 << 33 === 33 << 1
253253
verify::<SllOp>("rs2 over 5-bits", 0b_0001, 33, 0b_0010);
254-
verify::<SllOp>("bit loss", 1 << 31 | 1, 1, 0b_0010);
254+
verify::<SllOp>("bit loss", (1 << 31) | 1, 1, 0b_0010);
255255
verify::<SllOp>("zero shift", 0b_0001, 0, 0b_0001);
256256
verify::<SllOp>("all zeros", 0b_0000, 0, 0b_0000);
257257
verify::<SllOp>("base is zero", 0b_0000, 1, 0b_0000);

multilinear_extensions/src/mle.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1013,6 +1013,7 @@ macro_rules! op_mle {
10131013
} else {
10141014
&a[..]
10151015
};
1016+
#[allow(clippy::useless_conversion)]
10161017
$op
10171018
}
10181019
_ => unreachable!(),

rust-toolchain.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[toolchain]
2-
channel = "nightly-2024-12-06"
2+
channel = "nightly-2025-01-06"
33
targets = ["riscv32im-unknown-none-elf"]
44
# We need the sources for build-std.
55
components = ["rust-src"]

0 commit comments

Comments
 (0)