Skip to content

Upgrade Rust toolchain to 2025-10-24 #4426

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.

Sign up for GitHub

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

Merged
merged 7 commits into from
Oct 30, 2025
Merged

Upgrade Rust toolchain to 2025-10-24 #4426

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d0592d0
Upgrade Rust toolchain to 2025-10-24
tautschnig Oct 24, 2025
434b753
Merge branch 'main' into toolchain-2025-10-24-manual
thanhnguyen-aws Oct 27, 2025
2c02afd
Merge branch 'main' into toolchain-2025-10-24-manual
thanhnguyen-aws Oct 28, 2025
94896cb
move sizeOf and allignOf from NullOp to intrinsic
thanhnguyen-aws Oct 28, 2025
a360bcd
Merge branch 'toolchain-2025-10-24-manual' of https://github.com/taut…
thanhnguyen-aws Oct 28, 2025
c9d5d41
change a test which runs forever to fixme
thanhnguyen-aws Oct 29, 2025
9c58050
move the test to slow
thanhnguyen-aws Oct 29, 2025
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
3 changes: 0 additions & 3 deletions kani-compiler/src/codegen_cprover_gotoc/codegen/rvalue.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,9 +827,6 @@ impl GotocCtx<'_, '_> {
Rvalue::NullaryOp(k, t) => {
let layout = self.layout_of_stable(*t);
match k {
NullOp::SizeOf => Expr::int_constant(layout.size.bytes_usize(), Type::size_t())
.with_size_of_annotation(self.codegen_ty_stable(*t)),
NullOp::AlignOf => Expr::int_constant(layout.align.abi.bytes(), Type::size_t()),
NullOp::OffsetOf(fields) => Expr::int_constant(
self.tcx
.offset_of_subfield(
Expand Down
2 changes: 0 additions & 2 deletions kani-compiler/src/kani_middle/transform/internal_mir.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,6 @@ impl RustcInternalMir for NullOp {

fn internal_mir<'tcx>(&self, tcx: TyCtxt<'tcx>) -> Self::T<'tcx> {
match self {
NullOp::SizeOf => rustc_middle::mir::NullOp::SizeOf,
NullOp::AlignOf => rustc_middle::mir::NullOp::AlignOf,
NullOp::OffsetOf(offsets) => rustc_middle::mir::NullOp::OffsetOf(
tcx.mk_offset_of(
offsets
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
# SPDX-License-Identifier: Apache-2.0 OR MIT

[toolchain]
channel = "nightly-2025-10-23"
channel = "nightly-2025-10-24"
components = ["llvm-tools", "rustc-dev", "rust-src", "rustfmt"]
Loading