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

Upgrade toolchain to 7/12 #3337

Merged
merged 3 commits into from
Jul 12, 2024
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 kani-compiler/src/codegen_cprover_gotoc/codegen/typ.rs
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@ impl<'tcx> GotocCtx<'tcx> {
ty::Ref(_, t, _) | ty::RawPtr(t, _) => self.codegen_ty_ref(*t),
ty::FnDef(def_id, args) => {
let instance =
Instance::resolve(self.tcx, ty::ParamEnv::reveal_all(), *def_id, args)
Instance::try_resolve(self.tcx, ty::ParamEnv::reveal_all(), *def_id, args)
.unwrap()
.unwrap();
self.codegen_fndef_type(instance)
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
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-2024-07-01"
channel = "nightly-2024-07-12"
components = ["llvm-tools", "rustc-dev", "rust-src", "rustfmt"]
2 changes: 2 additions & 0 deletions tests/expected/function-contract/const_fn_with_effect.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
// Copyright Kani Contributors
// SPDX-License-Identifier: Apache-2.0 OR MIT
// kani-flags: -Zfunction-contracts -Zmem-predicates
// compile-flags: -Znext-solver

//! Check that Kani contract can be applied to a constant function.
//! <https://github.com/model-checking/kani/issues/3258>

#![feature(effects)]
#![allow(incomplete_features)]

#[kani::requires(kani::mem::can_dereference(arg))]
const unsafe fn dummy<T>(arg: *const T) -> T {
Expand Down
1 change: 1 addition & 0 deletions tools/compiletest/src/json.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ struct FutureBreakageItem {
}

#[derive(Deserialize, Clone)]
#[allow(dead_code)]
struct DiagnosticSpanMacroExpansion {
/// name of macro that was applied (e.g., "foo!" or "#[derive(Eq)]")
_macro_decl_name: String,
Expand Down
Loading