Skip to content

Commit b4152b2

Browse files
tautschnigqinheping
andcommitted
Upgrade Rust toolchain to nightly-2023-02-18
Upstream PRs that require local changes: - Switch to EarlyBinder for type_of query rust-lang/rust#107753 - Factor query arena allocation out from query caches rust-lang/rust#107833 Co-authored-by: Qinheping Hu <[email protected]>
1 parent 5d071eb commit b4152b2

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ impl<'tcx> GotocCtx<'tcx> {
2828
let pretty_name = Instance::new(def_id, InternalSubsts::empty()).to_string();
2929
debug!(?symbol_name, ?pretty_name, "declare_static {}", item);
3030

31-
let typ = self.codegen_ty(self.tcx.type_of(def_id));
31+
let typ = self.codegen_ty(self.tcx.type_of(def_id).subst_identity());
3232
let span = self.tcx.def_span(def_id);
3333
let location = self.codegen_span(&span);
3434
let symbol = Symbol::static_variable(symbol_name.clone(), symbol_name, typ, location)

kani-compiler/src/kani_middle/provide.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
77
use crate::kani_middle::reachability::{collect_reachable_items, filter_crate_items};
88
use crate::kani_middle::stubbing;
9+
use crate::kani_middle::ty::query::query_provided::collect_and_partition_mono_items;
910
use kani_queries::{QueryDb, UserInput};
1011
use rustc_hir::def_id::DefId;
1112
use rustc_interface;
12-
use rustc_middle::ty::query::query_stored::collect_and_partition_mono_items;
1313
use rustc_middle::{
1414
mir::Body,
1515
ty::{query::ExternProviders, query::Providers, TyCtxt},

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
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-2023-02-17"
5+
channel = "nightly-2023-02-18"
66
components = ["llvm-tools-preview", "rustc-dev", "rust-src", "rustfmt"]

0 commit comments

Comments
 (0)