From 5d6aafe4bb6d1a22155a31d8e26dbe90633b6b67 Mon Sep 17 00:00:00 2001 From: Qinheping Hu Date: Thu, 30 May 2024 12:46:17 -0500 Subject: [PATCH 1/2] Update Rust toolchain nightly-2024-05-24 --- kani-compiler/src/kani_middle/resolve.rs | 2 +- rust-toolchain.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kani-compiler/src/kani_middle/resolve.rs b/kani-compiler/src/kani_middle/resolve.rs index 53670bfd482d..816f25343fe3 100644 --- a/kani-compiler/src/kani_middle/resolve.rs +++ b/kani-compiler/src/kani_middle/resolve.rs @@ -247,7 +247,7 @@ where /// Resolves an external crate name. fn resolve_external(tcx: TyCtxt, name: &str) -> Option { debug!(?name, "resolve_external"); - tcx.crates(()).iter().find_map(|crate_num| { + tcx.used_crates(()).iter().find_map(|crate_num| { let crate_name = tcx.crate_name(*crate_num); if crate_name.as_str() == name { Some(DefId { index: CRATE_DEF_INDEX, krate: *crate_num }) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 8cc564b125c4..afb9d0e2cd95 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -2,5 +2,5 @@ # SPDX-License-Identifier: Apache-2.0 OR MIT [toolchain] -channel = "nightly-2024-05-23" +channel = "nightly-2024-05-24" components = ["llvm-tools-preview", "rustc-dev", "rust-src", "rustfmt"] From 5549297791baaa76932f6552e576773d91d9f4af Mon Sep 17 00:00:00 2001 From: Qinheping Hu Date: Thu, 30 May 2024 14:28:33 -0500 Subject: [PATCH 2/2] Update Rust toolchain nightly-2024-05-27 --- kani-compiler/src/codegen_cprover_gotoc/codegen/rvalue.rs | 2 +- kani-compiler/src/main.rs | 1 - rust-toolchain.toml | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/kani-compiler/src/codegen_cprover_gotoc/codegen/rvalue.rs b/kani-compiler/src/codegen_cprover_gotoc/codegen/rvalue.rs index 8a9aa4821ab6..131e40944a0f 100644 --- a/kani-compiler/src/codegen_cprover_gotoc/codegen/rvalue.rs +++ b/kani-compiler/src/codegen_cprover_gotoc/codegen/rvalue.rs @@ -699,7 +699,7 @@ impl<'tcx> GotocCtx<'tcx> { data_cast } else { let vtable_expr = - meta.member("vtable_ptr", &self.symbol_table).cast_to( + meta.member("_vtable_ptr", &self.symbol_table).cast_to( typ.lookup_field_type("vtable", &self.symbol_table).unwrap(), ); dynamic_fat_ptr(typ, data_cast, vtable_expr, &self.symbol_table) diff --git a/kani-compiler/src/main.rs b/kani-compiler/src/main.rs index fef0fba66489..a5cfa347a85e 100644 --- a/kani-compiler/src/main.rs +++ b/kani-compiler/src/main.rs @@ -10,7 +10,6 @@ #![recursion_limit = "256"] #![feature(box_patterns)] #![feature(rustc_private)] -#![feature(lazy_cell)] #![feature(more_qualified_paths)] #![feature(iter_intersperse)] #![feature(let_chains)] diff --git a/rust-toolchain.toml b/rust-toolchain.toml index afb9d0e2cd95..787015c6337e 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -2,5 +2,5 @@ # SPDX-License-Identifier: Apache-2.0 OR MIT [toolchain] -channel = "nightly-2024-05-24" +channel = "nightly-2024-05-27" components = ["llvm-tools-preview", "rustc-dev", "rust-src", "rustfmt"]