Skip to content

Commit

Permalink
Upgrade Rust toolchain to nightly-2023-02-18
Browse files Browse the repository at this point in the history
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 <qinhh@amazon.com>
  • Loading branch information
tautschnig and qinheping committed Apr 17, 2023
1 parent 5d071eb commit b4152b2
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ impl<'tcx> GotocCtx<'tcx> {
let pretty_name = Instance::new(def_id, InternalSubsts::empty()).to_string();
debug!(?symbol_name, ?pretty_name, "declare_static {}", item);

let typ = self.codegen_ty(self.tcx.type_of(def_id));
let typ = self.codegen_ty(self.tcx.type_of(def_id).subst_identity());
let span = self.tcx.def_span(def_id);
let location = self.codegen_span(&span);
let symbol = Symbol::static_variable(symbol_name.clone(), symbol_name, typ, location)
Expand Down
2 changes: 1 addition & 1 deletion kani-compiler/src/kani_middle/provide.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@

use crate::kani_middle::reachability::{collect_reachable_items, filter_crate_items};
use crate::kani_middle::stubbing;
use crate::kani_middle::ty::query::query_provided::collect_and_partition_mono_items;
use kani_queries::{QueryDb, UserInput};
use rustc_hir::def_id::DefId;
use rustc_interface;
use rustc_middle::ty::query::query_stored::collect_and_partition_mono_items;
use rustc_middle::{
mir::Body,
ty::{query::ExternProviders, query::Providers, TyCtxt},
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-2023-02-17"
channel = "nightly-2023-02-18"
components = ["llvm-tools-preview", "rustc-dev", "rust-src", "rustfmt"]

0 comments on commit b4152b2

Please sign in to comment.