user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Mazdak Farrokhzad 2019-12-25 00:10:10 +01:00
parent 8e15bb6546
commit ca297f8cf4
25 changed files with 32 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/librustc/ty/context.rs
View file

@ -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;

3
src/librustc/ty/mod.rs
View file

@ -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;

4
src/librustc/ty/query/mod.rs
View file

@ -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;