Skip to content

Commit

Permalink
Upgrade toolchain to 2024-02-17
Browse files Browse the repository at this point in the history
  • Loading branch information
zhassan-aws committed Feb 20, 2024
1 parent 72fd9f4 commit 70e6165
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 7 deletions.
4 changes: 2 additions & 2 deletions kani-compiler/src/kani_middle/intrinsics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ fn resolve_rust_intrinsic<'tcx>(
func_ty: Ty<'tcx>,
) -> Option<(Symbol, GenericArgsRef<'tcx>)> {
if let ty::FnDef(def_id, args) = *func_ty.kind() {
if tcx.is_intrinsic(def_id) {
return Some((tcx.item_name(def_id), args));
if let Some(symbol) = tcx.intrinsic(def_id) {
return Some((symbol, args));
}
}
None
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-02-14"
channel = "nightly-2024-02-17"
components = ["llvm-tools-preview", "rustc-dev", "rust-src", "rustfmt"]
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
// Copyright Kani Contributors
// SPDX-License-Identifier: Apache-2.0 OR MIT
// The original harness takes too long so we introduced a simplified version to run in CI.
// kani-flags: --harness simplified

//! This is a regression test for size_and_align_of_dst computing the
//! size and alignment of a dynamically-sized type like
//! Arc<Mutex<dyn Subscriber>>.
//! We added a simplified version of the original harness from:
//! <https://github.com/model-checking/kani/issues/426>
//! This currently fails due to
//! <https://github.com/model-checking/kani/issues/1781>

use std::sync::Arc;
use std::sync::Mutex;
Expand Down

0 comments on commit 70e6165

Please sign in to comment.