From 6cf21a87555a163a8f86373c5f5242568d01d460 Mon Sep 17 00:00:00 2001 From: Qinheping Hu Date: Fri, 31 May 2024 14:34:10 -0500 Subject: [PATCH] Upgrade Rust toolchain nightly-2024-05-27 (#3215) `lazy_cell` became stable: https://github.com/rust-lang/rust/pull/121377. `vtable_ptr` is renamed to `_vtable_ptr`: https://github.com/rust-lang/rust/commit/d83f3ca8ca. By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 and MIT licenses. --- 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"]