Skip to content

Commit 02e3327

Browse files
authored
Upgrade toolchain to 7/12 (#3337)
Upgrade toolchain to 7/12 Relevant PRs: rust-lang/rust#127176 and rust-lang/rust#125507 Resolves #3319 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 068f63c commit 02e3327

File tree

4 files changed

+5
-2
lines changed

4 files changed

+5
-2
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ impl<'tcx> GotocCtx<'tcx> {
574574
ty::Ref(_, t, _) | ty::RawPtr(t, _) => self.codegen_ty_ref(*t),
575575
ty::FnDef(def_id, args) => {
576576
let instance =
577-
Instance::resolve(self.tcx, ty::ParamEnv::reveal_all(), *def_id, args)
577+
Instance::try_resolve(self.tcx, ty::ParamEnv::reveal_all(), *def_id, args)
578578
.unwrap()
579579
.unwrap();
580580
self.codegen_fndef_type(instance)

rust-toolchain.toml

+1-1
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-2024-07-01"
5+
channel = "nightly-2024-07-12"
66
components = ["llvm-tools", "rustc-dev", "rust-src", "rustfmt"]

tests/expected/function-contract/const_fn_with_effect.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
// Copyright Kani Contributors
22
// SPDX-License-Identifier: Apache-2.0 OR MIT
33
// kani-flags: -Zfunction-contracts -Zmem-predicates
4+
// compile-flags: -Znext-solver
45

56
//! Check that Kani contract can be applied to a constant function.
67
//! <https://github.com/model-checking/kani/issues/3258>
78
89
#![feature(effects)]
10+
#![allow(incomplete_features)]
911

1012
#[kani::requires(kani::mem::can_dereference(arg))]
1113
const unsafe fn dummy<T>(arg: *const T) -> T {

tools/compiletest/src/json.rs

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ struct FutureBreakageItem {
3535
}
3636

3737
#[derive(Deserialize, Clone)]
38+
#[allow(dead_code)]
3839
struct DiagnosticSpanMacroExpansion {
3940
/// name of macro that was applied (e.g., "foo!" or "#[derive(Eq)]")
4041
_macro_decl_name: String,

0 commit comments

Comments
 (0)