From 46389159403ca0973bf88a4c153a2707cdb257d2 Mon Sep 17 00:00:00 2001 From: Michael Goulet Date: Fri, 27 May 2022 20:03:57 -0700 Subject: Make TyCtxt implement Interner, make HashStable generic and move to rustc_type_ir --- compiler/rustc_query_impl/src/on_disk_cache.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'compiler/rustc_query_impl/src') diff --git a/compiler/rustc_query_impl/src/on_disk_cache.rs b/compiler/rustc_query_impl/src/on_disk_cache.rs index 7dc6921a569..8e4b3269402 100644 --- a/compiler/rustc_query_impl/src/on_disk_cache.rs +++ b/compiler/rustc_query_impl/src/on_disk_cache.rs @@ -11,7 +11,7 @@ use rustc_middle::mir::interpret::{AllocDecodingSession, AllocDecodingState}; use rustc_middle::mir::{self, interpret}; use rustc_middle::thir; use rustc_middle::ty::codec::{RefDecodable, TyDecoder, TyEncoder}; -use rustc_middle::ty::{self, Ty, TyCtxt, TyInterner}; +use rustc_middle::ty::{self, Ty, TyCtxt}; use rustc_query_system::dep_graph::DepContext; use rustc_query_system::query::{QueryCache, QueryContext, QuerySideEffects}; use rustc_serialize::{ @@ -548,12 +548,12 @@ where } impl<'a, 'tcx> TyDecoder for CacheDecoder<'a, 'tcx> { - type I = TyInterner<'tcx>; + type I = TyCtxt<'tcx>; const CLEAR_CROSS_CRATE: bool = false; #[inline] - fn interner(&self) -> TyInterner<'tcx> { - TyInterner { tcx: self.tcx } + fn interner(&self) -> TyCtxt<'tcx> { + self.tcx } #[inline] @@ -932,7 +932,7 @@ impl<'a, 'tcx, E> TyEncoder for CacheEncoder<'a, 'tcx, E> where E: 'a + OpaqueEncoder, { - type I = TyInterner<'tcx>; + type I = TyCtxt<'tcx>; const CLEAR_CROSS_CRATE: bool = false; fn position(&self) -> usize { -- cgit 1.4.1-3-g733a5