DefId{Map,Set} -> rustc::hir::def_id

src/librustc/arena.rs

@@ -41,7 +41,7 @@ macro_rules! arena_types {
                 rustc::hir::def_id::DefId,
                 rustc::ty::subst::SubstsRef<$tcx>
             )>,
-            [few, decode] mir_keys: rustc::util::nodemap::DefIdSet,
+            [few, decode] mir_keys: rustc::hir::def_id::DefIdSet,
             [decode] specialization_graph: rustc::traits::specialization_graph::Graph,
             [] region_scope_tree: rustc::middle::region::ScopeTree,
             [] item_local_set: rustc::util::nodemap::ItemLocalSet,
@@ -87,7 +87,7 @@ macro_rules! arena_types {
                 >,
             [few] crate_inherent_impls: rustc::ty::CrateInherentImpls,
             [few] upstream_monomorphizations:
-                rustc::util::nodemap::DefIdMap<
+                rustc::hir::def_id::DefIdMap<
                     rustc_data_structures::fx::FxHashMap<
                         rustc::ty::subst::SubstsRef<'tcx>,
                         rustc::hir::def_id::CrateNum
@@ -113,10 +113,10 @@ macro_rules! arena_types {
             >,
             [few] get_lib_features: rustc::middle::lib_features::LibFeatures,
             [few] defined_lib_features: rustc::middle::lang_items::LanguageItems,
-            [few] visible_parent_map: rustc::util::nodemap::DefIdMap<rustc::hir::def_id::DefId>,
+            [few] visible_parent_map: rustc::hir::def_id::DefIdMap<rustc::hir::def_id::DefId>,
             [few] foreign_module: rustc::middle::cstore::ForeignModule,
             [few] foreign_modules: Vec<rustc::middle::cstore::ForeignModule>,
-            [few] reachable_non_generics: rustc::util::nodemap::DefIdMap<
+            [few] reachable_non_generics: rustc::hir::def_id::DefIdMap<
                 rustc::middle::exported_symbols::SymbolExportLevel
             >,
             [few] crate_variances: rustc::ty::CrateVariancesMap<'tcx>,

src/librustc/hir/def.rs

@@ -1,9 +1,8 @@
 use self::Namespace::*;
 
 use crate::hir;
-use crate::hir::def_id::{DefId, CRATE_DEF_INDEX, LOCAL_CRATE};
+use crate::hir::def_id::{DefId, DefIdMap, CRATE_DEF_INDEX, LOCAL_CRATE};
 use crate::ty;
-use crate::util::nodemap::DefIdMap;
 
 use rustc_macros::HashStable;
 use rustc_span::hygiene::MacroKind;

src/librustc/hir/def_id.rs

@@ -157,6 +157,8 @@ impl DefId {
 impl rustc_serialize::UseSpecializedEncodable for DefId {}
 impl rustc_serialize::UseSpecializedDecodable for DefId {}
 
+rustc_data_structures::define_id_collections!(DefIdMap, DefIdSet, DefId);
+
 /// A LocalDefId is equivalent to a DefId with `krate == LOCAL_CRATE`. Since
 /// we encode this information in the type, we can ensure at compile time that
 /// no DefIds from upstream crates get thrown into the mix. There are quite a

src/librustc/infer/opaque_types/mod.rs

@@ -1,5 +1,5 @@
 use crate::hir;
-use crate::hir::def_id::DefId;
+use crate::hir::def_id::{DefId, DefIdMap};
 use crate::hir::Node;
 use crate::infer::outlives::free_region_map::FreeRegionRelations;
 use crate::infer::{self, InferCtxt, InferOk, TypeVariableOrigin, TypeVariableOriginKind};
@@ -8,7 +8,6 @@ use crate::traits::{self, PredicateObligation};
 use crate::ty::fold::{BottomUpFolder, TypeFoldable, TypeFolder, TypeVisitor};
 use crate::ty::subst::{GenericArg, GenericArgKind, InternalSubsts, SubstsRef};
 use crate::ty::{self, GenericParamDefKind, Ty, TyCtxt};
-use crate::util::nodemap::DefIdMap;
 use errors::DiagnosticBuilder;
 use rustc::session::config::nightly_options;
 use rustc_data_structures::fx::FxHashMap;

src/librustc/middle/privacy.rs

@@ -2,8 +2,8 @@
 //! outside their scopes. This pass will also generate a set of exported items
 //! which are available for use externally when compiled as a library.
 
+use crate::hir::def_id::DefIdSet;
 use crate::hir::HirId;
-use crate::util::nodemap::DefIdSet;
 
 use rustc_data_structures::fx::FxHashMap;
 use rustc_macros::HashStable;

src/librustc/traits/specialize/specialization_graph.rs

@@ -1,11 +1,10 @@
 use super::OverlapError;
 
-use crate::hir::def_id::DefId;
+use crate::hir::def_id::{DefId, DefIdMap};
 use crate::ich::{self, StableHashingContext};
 use crate::traits;
 use crate::ty::fast_reject::{self, SimplifiedType};
 use crate::ty::{self, TyCtxt, TypeFoldable};
-use crate::util::nodemap::DefIdMap;
 use rustc_data_structures::fx::FxHashMap;
 use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
 use syntax::ast::Ident;

src/librustc/ty/context.rs

@@ -4,7 +4,7 @@ use crate::arena::Arena;
 use crate::dep_graph::DepGraph;
 use crate::dep_graph::{self, DepConstructor, DepNode};
 use crate::hir::def::{DefKind, Export, Res};
-use crate::hir::def_id::{CrateNum, DefId, DefIndex, LOCAL_CRATE};
+use crate::hir::def_id::{CrateNum, DefId, DefIdMap, DefIdSet, DefIndex, LOCAL_CRATE};
 use crate::hir::map as hir_map;
 use crate::hir::map::DefPathHash;
 use crate::hir::{self, HirId, ItemKind, ItemLocalId, Node, TraitCandidate};
@@ -46,7 +46,7 @@ use crate::ty::{ExistentialPredicate, InferTy, ParamTy, PolyFnSig, Predicate, Pr
 use crate::ty::{InferConst, ParamConst};
 use crate::ty::{List, TyKind, TyS};
 use crate::util::common::ErrorReported;
-use crate::util::nodemap::{DefIdMap, DefIdSet, ItemLocalMap, ItemLocalSet};
+use crate::util::nodemap::{ItemLocalMap, ItemLocalSet};
 
 use arena::SyncDroplessArena;
 use errors::DiagnosticBuilder;

src/librustc/ty/mod.rs

@@ -7,7 +7,7 @@ pub use self::IntVarValue::*;
 pub use self::Variance::*;
 
 use crate::hir::def::{CtorKind, CtorOf, DefKind, ExportMap, Res};
-use crate::hir::def_id::{CrateNum, DefId, LocalDefId, CRATE_DEF_INDEX, LOCAL_CRATE};
+use crate::hir::def_id::{CrateNum, DefId, DefIdMap, LocalDefId, CRATE_DEF_INDEX, LOCAL_CRATE};
 use crate::hir::Node;
 use crate::hir::{map as hir_map, GlobMap, TraitMap};
 use crate::ich::Fingerprint;
@@ -28,7 +28,6 @@ use crate::ty::subst::{InternalSubsts, Subst, SubstsRef};
 use crate::ty::util::{Discr, IntTypeExt};
 use crate::ty::walk::TypeWalker;
 use crate::util::captures::Captures;
-use crate::util::nodemap::DefIdMap;
 use arena::SyncDroplessArena;
 use rustc_data_structures::fx::FxHashMap;
 use rustc_data_structures::svh::Svh;

src/librustc/ty/query/mod.rs

@@ -1,6 +1,6 @@
 use crate::dep_graph::{self, DepNode};
 use crate::hir::def::{DefKind, Export};
-use crate::hir::def_id::{CrateNum, DefId, DefIndex};
+use crate::hir::def_id::{CrateNum, DefId, DefIdMap, DefIdSet, DefIndex};
 use crate::hir::{self, ItemLocalId, TraitCandidate};
 use crate::infer::canonical::{self, Canonical};
 use crate::lint;
@@ -37,7 +37,7 @@ use crate::ty::subst::SubstsRef;
 use crate::ty::util::NeedsDrop;
 use crate::ty::{self, AdtSizedConstraint, CrateInherentImpls, ParamEnvAnd, Ty, TyCtxt};
 use crate::util::common::ErrorReported;
-use crate::util::nodemap::{DefIdMap, DefIdSet, HirIdSet};
+use crate::util::nodemap::HirIdSet;
 use rustc_data_structures::profiling::ProfileCategory::*;
 
 use rustc_data_structures::fingerprint::Fingerprint;

src/librustc/util/nodemap.rs

@@ -1,10 +1,8 @@
 //! An efficient hash map for `NodeId`s.
 
-use crate::hir::def_id::DefId;
 use crate::hir::{HirId, ItemLocalId};
 
 use rustc_data_structures::define_id_collections;
 
-define_id_collections!(DefIdMap, DefIdSet, DefId);
 define_id_collections!(HirIdMap, HirIdSet, HirId);
 define_id_collections!(ItemLocalMap, ItemLocalSet, ItemLocalId);