Skip to content

Commit d0592d0

Browse files
committed
Upgrade Rust toolchain to 2025-10-24
Relevant upstream PR: - rust-lang/rust#147793 (Replace NullOp::SizeOf and NullOp::AlignOf by lang items.) Resolves: model-checking#4425
1 parent e0316ff commit d0592d0

File tree

3 files changed

+1
-6
lines changed

3 files changed

+1
-6
lines changed

kani-compiler/src/codegen_cprover_gotoc/codegen/rvalue.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -827,9 +827,6 @@ impl GotocCtx<'_, '_> {
827827
Rvalue::NullaryOp(k, t) => {
828828
let layout = self.layout_of_stable(*t);
829829
match k {
830-
NullOp::SizeOf => Expr::int_constant(layout.size.bytes_usize(), Type::size_t())
831-
.with_size_of_annotation(self.codegen_ty_stable(*t)),
832-
NullOp::AlignOf => Expr::int_constant(layout.align.abi.bytes(), Type::size_t()),
833830
NullOp::OffsetOf(fields) => Expr::int_constant(
834831
self.tcx
835832
.offset_of_subfield(

kani-compiler/src/kani_middle/transform/internal_mir.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,6 @@ impl RustcInternalMir for NullOp {
195195

196196
fn internal_mir<'tcx>(&self, tcx: TyCtxt<'tcx>) -> Self::T<'tcx> {
197197
match self {
198-
NullOp::SizeOf => rustc_middle::mir::NullOp::SizeOf,
199-
NullOp::AlignOf => rustc_middle::mir::NullOp::AlignOf,
200198
NullOp::OffsetOf(offsets) => rustc_middle::mir::NullOp::OffsetOf(
201199
tcx.mk_offset_of(
202200
offsets

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
# SPDX-License-Identifier: Apache-2.0 OR MIT
33

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

0 commit comments

Comments
 (0)