Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update toolchain #810

Merged
merged 3 commits into from
Feb 5, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/lints.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ceno_emul/src/syscalls/keccak_permute.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion ceno_zkvm/src/instructions/riscv/shift.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 1 addition & 0 deletions multilinear_extensions/src/mle.rs
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,7 @@ impl<E: ExtensionField> DenseMultilinearExtension<E> {
op_mle!(self, |evaluations| {
DenseMultilinearExtension::from_evaluations_ext_vec(
self.num_vars(),
#[allow(clippy::useless_conversion)]
evaluations.iter().cloned().map(E::from).collect(),
)
})
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -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"]