bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #89266 - cjgillot:session-ich, r=michaelwoerister

Browse source 
Move ICH to rustc_query_system

Based on https://github.com/rust-lang/rust/pull/89183

The StableHashingContext does not need to be in rustc_middle.

This PR moves it to rustc_query_system. This will avoid a dependency between rustc_ast_lowering and rustc_middle in https://github.com/rust-lang/rust/pull/89124.
This commit is contained in:
bors 2021-10-05 09:45:11 +00:00
commit 55111d656f
77 changed files with 168 additions and 221 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_query_impl/src/lib.rs
View file

@ -20,10 +20,10 @@ use rustc_data_structures::fingerprint::Fingerprint;
use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
use rustc_errors::DiagnosticBuilder;
use rustc_middle::dep_graph;
use rustc_middle::ich::StableHashingContext;
use rustc_middle::ty::query::{query_keys, query_storage, query_stored, query_values};
use rustc_middle::ty::query::{Providers, QueryEngine};
use rustc_middle::ty::{self, TyCtxt};
use rustc_query_system::ich::StableHashingContext;
use rustc_span::Span;
#[macro_use]

1
compiler/rustc_query_impl/src/plumbing.rs
View file

@ -36,7 +36,6 @@ impl<'tcx> std::ops::Deref for QueryCtxt<'tcx> {
impl HasDepContext for QueryCtxt<'tcx> {
type DepKind = rustc_middle::dep_graph::DepKind;
type StableHashingContext = rustc_middle::ich::StableHashingContext<'tcx>;
type DepContext = TyCtxt<'tcx>;
#[inline]