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

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

View file

@ -23,7 +23,7 @@ use Determinacy::*;
use errors::{Applicability, DiagnosticBuilder};
use rustc::hir::def::Namespace::*;
use rustc::hir::def::{self, CtorKind, CtorOf, DefKind, ExportMap, NonMacroAttrKind, PartialRes};
use rustc::hir::def_id::{CrateNum, DefId, CRATE_DEF_INDEX, LOCAL_CRATE};
use rustc::hir::def_id::{CrateNum, DefId, DefIdMap, CRATE_DEF_INDEX, LOCAL_CRATE};
use rustc::hir::map::Definitions;
use rustc::hir::{Bool, Char, Float, Int, PrimTy, Str, Uint};
use rustc::hir::{GlobMap, TraitMap};
@ -33,7 +33,6 @@ use rustc::session::Session;
use rustc::span_bug;
use rustc::ty::query::Providers;
use rustc::ty::{self, DefIdTree, ResolverOutputs};
use rustc::util::nodemap::DefIdMap;
use rustc_data_structures::fx::{FxHashMap, FxHashSet, FxIndexMap};
use rustc_data_structures::ptr_key::PtrKey;
use rustc_data_structures::sync::Lrc;

View file

@ -7,7 +7,7 @@
use errors::{pluralize, Applicability, DiagnosticBuilder};
use rustc::hir::def::{DefKind, Res};
use rustc::hir::def_id::{CrateNum, DefId, LocalDefId, LOCAL_CRATE};
use rustc::hir::def_id::{CrateNum, DefId, DefIdMap, LocalDefId, LOCAL_CRATE};
use rustc::hir::intravisit::{self, NestedVisitorMap, Visitor};
use rustc::hir::map::Map;
use rustc::hir::{self, GenericParamKind, LifetimeParamKind};
@ -16,7 +16,7 @@ use rustc::lint;
use rustc::middle::resolve_lifetime::*;
use rustc::session::Session;
use rustc::ty::{self, DefIdTree, GenericParamDefKind, TyCtxt};
use rustc::util::nodemap::{DefIdMap, HirIdMap, HirIdSet};
use rustc::util::nodemap::{HirIdMap, HirIdSet};
use rustc::{bug, span_bug};
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
use rustc_span::symbol::{kw, sym};