Skip to content

Commit bd6c8cf

Browse files
authored
Upgrade Rust toolchain to 2025-07-29 (#4247)
Relevant upstream PRs: - rust-lang/rust#144389 (MIR-build: No longer emit assumes in enum-as casting) - rust-lang/rust#144392 (rustc_public: Remove movability from `RigidTy/AggregateKind::Coroutine`) - rust-lang/rust#144377 (Rename impl_of_method and trait_of_item) Resolves: #4246 By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 and MIT licenses.
1 parent 033755f commit bd6c8cf

File tree

7 files changed

+7
-11
lines changed

7 files changed

+7
-11
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -734,7 +734,7 @@ impl GotocCtx<'_> {
734734
}
735735
}
736736
}
737-
AggregateKind::Coroutine(_, _, _) => self.codegen_rvalue_coroutine(operands, res_ty),
737+
AggregateKind::Coroutine(_, _) => self.codegen_rvalue_coroutine(operands, res_ty),
738738
AggregateKind::CoroutineClosure(_, _) => {
739739
let ty = self.codegen_ty_stable(res_ty);
740740
self.codegen_unimplemented_expr(

kani-compiler/src/kani_middle/stubbing/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ impl MirVisitor for StubConstChecker<'_> {
183183
[one] => one.as_type().unwrap(),
184184
_ => unreachable!(),
185185
};
186-
let trait_ = tcx.trait_of_item(mono_const.def).unwrap();
186+
let trait_ = tcx.trait_of_assoc(mono_const.def).unwrap();
187187
let msg = format!(
188188
"Type `{implementor}` does not implement trait `{}`. \
189189
This is likely because `{}` is used as a stub but its \

kani-compiler/src/kani_middle/transform/check_uninit/ty_layout.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ fn data_bytes_for_ty(
394394
RigidTy::FnDef(_, _)
395395
| RigidTy::FnPtr(_)
396396
| RigidTy::Closure(_, _)
397-
| RigidTy::Coroutine(_, _, _)
397+
| RigidTy::Coroutine(_, _)
398398
| RigidTy::CoroutineClosure(_, _)
399399
| RigidTy::CoroutineWitness(_, _)
400400
| RigidTy::Foreign(_)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,7 @@ impl MirVisitor for CheckValueVisitor<'_, '_> {
687687
// Only aggregate value.
688688
AggregateKind::Array(_)
689689
| AggregateKind::Closure(_, _)
690-
| AggregateKind::Coroutine(_, _, _)
690+
| AggregateKind::Coroutine(_, _)
691691
| AggregateKind::CoroutineClosure(_, _)
692692
| AggregateKind::RawPtr(_, _)
693693
| AggregateKind::Tuple => {}
@@ -1057,7 +1057,7 @@ pub fn ty_validity_per_offset(
10571057
RigidTy::FnDef(_, _)
10581058
| RigidTy::FnPtr(_)
10591059
| RigidTy::Closure(_, _)
1060-
| RigidTy::Coroutine(_, _, _)
1060+
| RigidTy::Coroutine(_, _)
10611061
| RigidTy::CoroutineClosure(_, _)
10621062
| RigidTy::CoroutineWitness(_, _)
10631063
| RigidTy::Foreign(_)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ impl RustcInternalMir for AggregateKind {
5050
internal(tcx, generic_args),
5151
)
5252
}
53-
AggregateKind::Coroutine(coroutine_def, generic_args, _) => {
53+
AggregateKind::Coroutine(coroutine_def, generic_args) => {
5454
rustc_middle::mir::AggregateKind::Coroutine(
5555
internal(tcx, coroutine_def.0),
5656
internal(tcx, generic_args),

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-07-24"
5+
channel = "nightly-2025-07-29"
66
components = ["llvm-tools", "rustc-dev", "rust-src", "rustfmt"]

tests/script-based-pre/cargo_autoharness_contracts/contracts.expected

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@ arithmetic_overflow\
4040

4141
Autoharness: Checking function should_pass::alignment::Alignment::as_usize's contract against all possible inputs...
4242

43-
should_pass::alignment::Alignment::as_usize\
44-
- Status: SUCCESS\
45-
- Description: "Rust intrinsic assumption failed"
46-
4743
should_pass::alignment::Alignment::as_usize\
4844
- Status: SUCCESS\
4945
- Description: "|result| result.is_power_of_two()"

0 commit comments

Comments
 (0)