Fully remove rustc_middle::ich.

Author: cjgillot

compiler/rustc_middle/src/ich/mod.rs

@@ -77,7 +77,6 @@ pub mod query;
 pub mod arena;
 pub mod dep_graph;
 pub mod hir;
-pub mod ich;
 pub mod infer;
 pub mod lint;
 pub mod middle;

compiler/rustc_middle/src/lib.rs

@@ -1,4 +1,3 @@
-use crate::ich;
 use crate::ty::fast_reject::SimplifiedType;
 use crate::ty::fold::TypeFoldable;
 use crate::ty::{self, TyCtxt};
@@ -241,6 +240,6 @@ impl<'a> HashStable<StableHashingContext<'a>> for Children {
     fn hash_stable(&self, hcx: &mut StableHashingContext<'a>, hasher: &mut StableHasher) {
         let Children { ref nonblanket_impls, ref blanket_impls } = *self;
 
-        ich::hash_stable_trait_impls(hcx, hasher, blanket_impls, nonblanket_impls);
+        ty::hash_stable_trait_impls(hcx, hasher, blanket_impls, nonblanket_impls);
     }
 }

compiler/rustc_middle/src/traits/specialization_graph.rs

@@ -23,7 +23,7 @@ use rustc_ast as ast;
 use rustc_ast::expand::allocator::AllocatorKind;
 use rustc_attr as attr;
 use rustc_crate::cstore::{CrateStoreDyn, EncodedMetadata};
-use rustc_crate::ich::{NodeIdHashingMode, StableHashingContext};
+use rustc_crate::ich::{NodeIdHashingMode, StableHashingContext, StableHashingContextProvider};
 use rustc_crate::stability;
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_data_structures::profiling::SelfProfilerRef;
@@ -883,6 +883,12 @@ impl<'tcx> Deref for TyCtxt<'tcx> {
     }
 }
 
+impl StableHashingContextProvider<'tcx> for TyCtxt<'tcx> {
+    fn get_stable_hashing_context(&self) -> StableHashingContext<'tcx> {
+        (*self).create_stable_hashing_context()
+    }
+}
+
 pub struct GlobalCtxt<'tcx> {
     pub arena: &'tcx WorkerLocal<Arena<'tcx>>,
 

compiler/rustc_middle/src/ty/context.rs

@@ -4,13 +4,52 @@
 use crate::middle::region;
 use crate::mir;
 use crate::ty;
+use crate::ty::fast_reject;
 use rustc_crate::ich::StableHashingContext;
 use rustc_data_structures::fingerprint::Fingerprint;
 use rustc_data_structures::fx::FxHashMap;
 use rustc_data_structures::stable_hasher::{HashStable, StableHasher, ToStableHashKey};
+use rustc_span::def_id::DefId;
+use smallvec::SmallVec;
 use std::cell::RefCell;
 use std::mem;
 
+pub fn hash_stable_trait_impls<'a>(
+    hcx: &mut StableHashingContext<'a>,
+    hasher: &mut StableHasher,
+    blanket_impls: &[DefId],
+    non_blanket_impls: &FxHashMap<fast_reject::SimplifiedType, Vec<DefId>>,
+) {
+    {
+        let mut blanket_impls: SmallVec<[_; 8]> =
+            blanket_impls.iter().map(|&def_id| hcx.def_path_hash(def_id)).collect();
+
+        if blanket_impls.len() > 1 {
+            blanket_impls.sort_unstable();
+        }
+
+        blanket_impls.hash_stable(hcx, hasher);
+    }
+
+    {
+        let mut keys: SmallVec<[_; 8]> =
+            non_blanket_impls.keys().map(|k| (k, k.map_def(|d| hcx.def_path_hash(d)))).collect();
+        keys.sort_unstable_by(|&(_, ref k1), &(_, ref k2)| k1.cmp(k2));
+        keys.len().hash_stable(hcx, hasher);
+        for (key, ref stable_key) in keys {
+            stable_key.hash_stable(hcx, hasher);
+            let mut impls: SmallVec<[_; 8]> =
+                non_blanket_impls[key].iter().map(|&impl_id| hcx.def_path_hash(impl_id)).collect();
+
+            if impls.len() > 1 {
+                impls.sort_unstable();
+            }
+
+            impls.hash_stable(hcx, hasher);
+        }
+    }
+}
+
 impl<'a, 'tcx, T> HashStable<StableHashingContext<'a>> for &'tcx ty::List<T>
 where
     T: HashStable<StableHashingContext<'a>>,

compiler/rustc_middle/src/ich/impls_ty.rs renamed to compiler/rustc_middle/src/ty/impls_ty.rs

@@ -114,12 +114,14 @@ pub mod walk;
 mod consts;
 mod context;
 mod diagnostics;
+mod impls_ty;
 mod instance;
 mod list;
 mod structural_impls;
 mod sty;
 
 pub use context::ENCODE_METADATA;
+pub use impls_ty::hash_stable_trait_impls;
 
 // Data types
 

compiler/rustc_middle/src/ty/mod.rs

@@ -1,8 +1,7 @@
-use crate::ich;
 use crate::traits::specialization_graph;
 use crate::ty::fast_reject;
 use crate::ty::fold::TypeFoldable;
-use crate::ty::{Ty, TyCtxt};
+use crate::ty::{self, Ty, TyCtxt};
 use rustc_crate::ich::StableHashingContext;
 use rustc_hir as hir;
 use rustc_hir::def_id::{CrateNum, DefId};
@@ -252,6 +251,6 @@ impl<'a> HashStable<StableHashingContext<'a>> for TraitImpls {
     fn hash_stable(&self, hcx: &mut StableHashingContext<'a>, hasher: &mut StableHasher) {
         let TraitImpls { ref blanket_impls, ref non_blanket_impls } = *self;
 
-        ich::hash_stable_trait_impls(hcx, hasher, blanket_impls, non_blanket_impls);
+        ty::hash_stable_trait_impls(hcx, hasher, blanket_impls, non_blanket_impls);
     }
 }