Remove re-export.

Author: cjgillot

Cargo.lock

@@ -4247,6 +4247,7 @@ version = "0.0.0"
 dependencies = [
  "rustc_ast",
  "rustc_attr",
+ "rustc_crate",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_hir",

compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs

@@ -20,6 +20,7 @@ use crate::value::Value;
 
 use rustc_ast as ast;
 use rustc_codegen_ssa::traits::*;
+use rustc_crate::ich::NodeIdHashingMode;
 use rustc_data_structures::const_cstr;
 use rustc_data_structures::fingerprint::Fingerprint;
 use rustc_data_structures::fx::FxHashMap;
@@ -28,7 +29,6 @@ use rustc_fs_util::path_to_c_string;
 use rustc_hir::def::CtorKind;
 use rustc_hir::def_id::{DefId, LOCAL_CRATE};
 use rustc_index::vec::{Idx, IndexVec};
-use rustc_middle::ich::NodeIdHashingMode;
 use rustc_middle::mir::{self, Field, GeneratorLayout};
 use rustc_middle::ty::layout::{self, IntegerExt, PrimitiveExt, TyAndLayout};
 use rustc_middle::ty::subst::GenericArgKind;

compiler/rustc_macros/src/hash_stable.rs

@@ -115,13 +115,13 @@ pub fn hash_stable_derive(mut s: synstructure::Structure<'_>) -> proc_macro2::To
     s.bound_impl(
         quote!(
             ::rustc_data_structures::stable_hasher::HashStable<
-                ::rustc_middle::ich::StableHashingContext<'__ctx>,
+                ::rustc_crate::ich::StableHashingContext<'__ctx>,
             >
         ),
         quote! {
             fn hash_stable(
                 &self,
-                __hcx: &mut ::rustc_middle::ich::StableHashingContext<'__ctx>,
+                __hcx: &mut ::rustc_crate::ich::StableHashingContext<'__ctx>,
                 __hasher: &mut ::rustc_data_structures::stable_hasher::StableHasher) {
                 #discriminant
                 match *self { #body }

compiler/rustc_middle/src/dep_graph/mod.rs

@@ -1,6 +1,6 @@
-use crate::ich::StableHashingContext;
 use crate::ty::query::try_load_from_on_disk_cache;
 use crate::ty::{self, TyCtxt};
+use rustc_crate::ich::StableHashingContext;
 use rustc_data_structures::profiling::SelfProfilerRef;
 use rustc_data_structures::sync::Lock;
 use rustc_data_structures::thin_vec::ThinVec;

compiler/rustc_middle/src/hir/map/collector.rs

@@ -1,8 +1,8 @@
 use crate::arena::Arena;
 use crate::hir::map::{Entry, HirOwnerData, Map};
 use crate::hir::{Owner, OwnerNodes, ParentedNode};
-use crate::ich::StableHashingContext;
 use rustc_crate::cstore::CrateStore;
+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};

compiler/rustc_middle/src/hir/mod.rs

@@ -6,9 +6,9 @@ pub mod exports;
 pub mod map;
 pub mod place;
 
-use crate::ich::StableHashingContext;
 use crate::ty::query::Providers;
 use crate::ty::TyCtxt;
+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};

compiler/rustc_middle/src/ich/impls_ty.rs

@@ -1,10 +1,10 @@
 //! This module contains `HashStable` implementations for various data types
 //! from `rustc_middle::ty` in no particular order.
 
-use crate::ich::StableHashingContext;
 use crate::middle::region;
 use crate::mir;
 use crate::ty;
+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};

compiler/rustc_middle/src/ich/mod.rs

@@ -1,14 +1,13 @@
 //! ICH - Incremental Compilation Hash
 
 use crate::ty::{fast_reject, TyCtxt};
+use rustc_crate::ich::{StableHashingContext, StableHashingContextProvider};
 use rustc_data_structures::fx::FxHashMap;
 use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
 use rustc_hir::def_id::DefId;
 use smallvec::SmallVec;
 use std::cmp::Ord;
 
-pub use rustc_crate::ich::{NodeIdHashingMode, StableHashingContext, StableHashingContextProvider};
-
 mod impls_ty;
 
 impl StableHashingContextProvider<'tcx> for TyCtxt<'tcx> {

compiler/rustc_middle/src/lint.rs

@@ -1,6 +1,6 @@
 use std::cmp;
 
-use crate::ich::StableHashingContext;
+use rustc_crate::ich::StableHashingContext;
 use rustc_data_structures::fx::FxHashMap;
 use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
 use rustc_errors::{DiagnosticBuilder, DiagnosticId};

compiler/rustc_middle/src/middle/region.rs

@@ -6,8 +6,8 @@
 //!
 //! [rustc dev guide]: https://rustc-dev-guide.rust-lang.org/borrow_check.html
 
-use crate::ich::{NodeIdHashingMode, StableHashingContext};
 use crate::ty::TyCtxt;
+use rustc_crate::ich::{NodeIdHashingMode, StableHashingContext};
 use rustc_hir as hir;
 use rustc_hir::Node;
 

compiler/rustc_middle/src/mir/mod.rs

@@ -745,7 +745,7 @@ pub enum ImplicitSelfKind {
 CloneTypeFoldableAndLiftImpls! { BindingForm<'tcx>, }
 
 mod binding_form_impl {
-    use crate::ich::StableHashingContext;
+    use rustc_crate::ich::StableHashingContext;
     use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
 
     impl<'a, 'tcx> HashStable<StableHashingContext<'a>> for super::BindingForm<'tcx> {

compiler/rustc_middle/src/mir/mono.rs

@@ -1,8 +1,8 @@
 use crate::dep_graph::{DepConstructor, DepNode, WorkProduct, WorkProductId};
-use crate::ich::{NodeIdHashingMode, StableHashingContext};
 use crate::ty::{subst::InternalSubsts, Instance, InstanceDef, SymbolName, TyCtxt};
 use rustc_attr::InlineAttr;
 use rustc_crate::codegen_fn_attrs::{Linkage, Visibility};
+use rustc_crate::ich::{NodeIdHashingMode, StableHashingContext};
 use rustc_data_structures::base_n;
 use rustc_data_structures::fingerprint::Fingerprint;
 use rustc_data_structures::fx::FxHashMap;

compiler/rustc_middle/src/traits/query.rs

@@ -5,12 +5,12 @@
 //! The providers for the queries defined here can be found in
 //! `librustc_traits`.
 
-use crate::ich::StableHashingContext;
 use crate::infer::canonical::{Canonical, QueryResponse};
 use crate::ty::error::TypeError;
 use crate::ty::subst::GenericArg;
 use crate::ty::{self, Ty, TyCtxt};
 
+use rustc_crate::ich::StableHashingContext;
 use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
 use rustc_data_structures::sync::Lrc;
 use rustc_errors::struct_span_err;

compiler/rustc_middle/src/traits/specialization_graph.rs

@@ -1,7 +1,8 @@
-use crate::ich::{self, StableHashingContext};
+use crate::ich;
 use crate::ty::fast_reject::SimplifiedType;
 use crate::ty::fold::TypeFoldable;
 use crate::ty::{self, TyCtxt};
+use rustc_crate::ich::StableHashingContext;
 use rustc_data_structures::fx::FxHashMap;
 use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
 use rustc_errors::ErrorReported;

compiler/rustc_middle/src/ty/context.rs

@@ -3,7 +3,6 @@
 use crate::arena::Arena;
 use crate::dep_graph::{self, DepConstructor, DepGraph};
 use crate::hir::exports::ExportMap;
-use crate::ich::{NodeIdHashingMode, StableHashingContext};
 use crate::infer::canonical::{Canonical, CanonicalVarInfo, CanonicalVarInfos};
 use crate::lint::{struct_lint_level, LintDiagnosticBuilder, LintSource};
 use crate::middle::resolve_lifetime::{self, ObjectLifetimeDefault};
@@ -24,6 +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::stability;
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_data_structures::profiling::SelfProfilerRef;

compiler/rustc_middle/src/ty/fast_reject.rs

@@ -1,6 +1,6 @@
-use crate::ich::StableHashingContext;
 use crate::ty::{self, Ty, TyCtxt};
 use rustc_ast as ast;
+use rustc_crate::ich::StableHashingContext;
 use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
 use rustc_hir::def_id::DefId;
 use std::fmt::Debug;

compiler/rustc_middle/src/ty/layout.rs

@@ -1,8 +1,8 @@
-use crate::ich::StableHashingContext;
 use crate::mir::{GeneratorLayout, GeneratorSavedLocal};
 use crate::ty::subst::Subst;
 use crate::ty::{self, subst::SubstsRef, ReprOptions, Ty, TyCtxt, TypeFoldable};
 use rustc_crate::codegen_fn_attrs::CodegenFnAttrFlags;
+use rustc_crate::ich::StableHashingContext;
 
 use rustc_ast::{self as ast, IntTy, UintTy};
 use rustc_attr as attr;

compiler/rustc_middle/src/ty/mod.rs

@@ -6,7 +6,6 @@ pub use self::IntVarValue::*;
 pub use self::Variance::*;
 
 use crate::hir::exports::ExportMap;
-use crate::ich::StableHashingContext;
 use crate::middle::resolve_lifetime::ObjectLifetimeDefault;
 use crate::mir::interpret::ErrorHandled;
 use crate::mir::Body;
@@ -18,6 +17,7 @@ use crate::ty::util::{Discr, IntTypeExt};
 use rustc_ast as ast;
 use rustc_attr as attr;
 use rustc_crate::cstore::CrateStoreDyn;
+use rustc_crate::ich::StableHashingContext;
 use rustc_data_structures::captures::Captures;
 use rustc_data_structures::fingerprint::Fingerprint;
 use rustc_data_structures::fx::FxHashMap;

compiler/rustc_middle/src/ty/query/plumbing.rs

@@ -253,11 +253,8 @@ macro_rules! define_queries {
         [$($modifiers:tt)*] fn $name:ident($($K:tt)*) -> $V:ty,)*) => {
 
         use std::mem;
-        use crate::{
-            rustc_data_structures::stable_hasher::HashStable,
-            rustc_data_structures::stable_hasher::StableHasher,
-            ich::StableHashingContext
-        };
+        use rustc_crate::ich::StableHashingContext;
+        use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
 
         define_queries_struct! {
             tcx: $tcx,

compiler/rustc_middle/src/ty/trait_def.rs

@@ -1,8 +1,9 @@
-use crate::ich::{self, StableHashingContext};
+use crate::ich;
 use crate::traits::specialization_graph;
 use crate::ty::fast_reject;
 use crate::ty::fold::TypeFoldable;
 use crate::ty::{Ty, TyCtxt};
+use rustc_crate::ich::StableHashingContext;
 use rustc_hir as hir;
 use rustc_hir::def_id::{CrateNum, DefId};
 use rustc_hir::definitions::DefPathHash;

compiler/rustc_middle/src/ty/util.rs

@@ -1,6 +1,5 @@
 //! Miscellaneous type-system utilities that are too small to deserve their own modules.
 
-use crate::ich::NodeIdHashingMode;
 use crate::ty::fold::TypeFolder;
 use crate::ty::layout::IntegerExt;
 use crate::ty::query::TyCtxtAt;
@@ -11,6 +10,7 @@ use rustc_apfloat::Float as _;
 use rustc_ast as ast;
 use rustc_attr::{self as attr, SignedInt, UnsignedInt};
 use rustc_crate::codegen_fn_attrs::CodegenFnAttrFlags;
+use rustc_crate::ich::NodeIdHashingMode;
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
 use rustc_errors::ErrorReported;

compiler/rustc_mir/src/interpret/eval_context.rs

@@ -2,12 +2,12 @@ use std::cell::Cell;
 use std::fmt;
 use std::mem;
 
+use rustc_crate::ich::StableHashingContext;
 use rustc_data_structures::fx::FxHashMap;
 use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
 use rustc_hir::{self as hir, def::DefKind, def_id::DefId, definitions::DefPathData};
 use rustc_index::vec::IndexVec;
 use rustc_macros::HashStable;
-use rustc_middle::ich::StableHashingContext;
 use rustc_middle::mir;
 use rustc_middle::mir::interpret::{GlobalId, InterpResult, Pointer, Scalar};
 use rustc_middle::ty::layout::{self, TyAndLayout};

compiler/rustc_mir/src/transform/coverage/mod.rs

@@ -15,14 +15,14 @@ use spans::{CoverageSpan, CoverageSpans};
 use crate::transform::MirPass;
 use crate::util::pretty;
 
+use rustc_crate::ich::StableHashingContext;
 use rustc_data_structures::fingerprint::Fingerprint;
 use rustc_data_structures::graph::WithNumNodes;
 use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
 use rustc_data_structures::sync::Lrc;
 use rustc_index::vec::IndexVec;
 use rustc_middle::hir;
 use rustc_middle::hir::map::blocks::FnLikeNode;
-use rustc_middle::ich::StableHashingContext;
 use rustc_middle::mir::coverage::*;
 use rustc_middle::mir::{
     self, BasicBlock, BasicBlockData, Coverage, SourceInfo, Statement, StatementKind, Terminator,

compiler/rustc_symbol_mangling/src/legacy.rs

@@ -1,7 +1,7 @@
+use rustc_crate::ich::NodeIdHashingMode;
 use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
 use rustc_hir::def_id::CrateNum;
 use rustc_hir::definitions::{DefPathData, DisambiguatedDefPathData};
-use rustc_middle::ich::NodeIdHashingMode;
 use rustc_middle::mir::interpret::{ConstValue, Scalar};
 use rustc_middle::ty::print::{PrettyPrinter, Print, Printer};
 use rustc_middle::ty::subst::{GenericArg, GenericArgKind};

compiler/rustc_trait_selection/Cargo.toml

@@ -13,6 +13,7 @@ tracing = "0.1"
 rustc_attr = { path = "../rustc_attr" }
 rustc_middle = { path = "../rustc_middle" }
 rustc_ast = { path = "../rustc_ast" }
+rustc_crate = { path = "../rustc_crate" }
 rustc_data_structures = { path = "../rustc_data_structures" }
 rustc_errors = { path = "../rustc_errors" }
 rustc_hir = { path = "../rustc_hir" }

src/tools/clippy/clippy_lints/src/lib.rs

@@ -26,6 +26,7 @@
 extern crate rustc_ast;
 extern crate rustc_ast_pretty;
 extern crate rustc_attr;
+extern crate rustc_crate;
 extern crate rustc_data_structures;
 extern crate rustc_errors;
 extern crate rustc_hir;

src/tools/clippy/clippy_lints/src/utils/hir_utils.rs

@@ -1,14 +1,14 @@
 use crate::consts::{constant_context, constant_simple};
 use crate::utils::differing_macro_contexts;
 use rustc_ast::ast::InlineAsmTemplatePiece;
+use rustc_crate::ich::StableHashingContextProvider;
 use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
 use rustc_hir::{
     BinOpKind, Block, BlockCheckMode, BodyId, BorrowKind, CaptureBy, Expr, ExprKind, Field, FieldPat, FnRetTy,
     GenericArg, GenericArgs, Guard, InlineAsmOperand, Lifetime, LifetimeName, ParamName, Pat, PatKind, Path,
     PathSegment, QPath, Stmt, StmtKind, Ty, TyKind, TypeBinding,
 };
 use rustc_lint::LateContext;
-use rustc_middle::ich::StableHashingContextProvider;
 use rustc_middle::ty::TypeckResults;
 use rustc_span::Symbol;
 use std::hash::Hash;