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

@ -92,7 +92,7 @@ use crate::middle::lang_items;
use crate::namespace::Namespace;
use errors::{pluralize, Applicability, DiagnosticBuilder, DiagnosticId};
use rustc::hir::def::{CtorOf, DefKind, Res};
use rustc::hir::def_id::{CrateNum, DefId, LOCAL_CRATE};
use rustc::hir::def_id::{CrateNum, DefId, DefIdMap, DefIdSet, LOCAL_CRATE};
use rustc::hir::intravisit::{self, NestedVisitorMap, Visitor};
use rustc::hir::itemlikevisit::ItemLikeVisitor;
use rustc::hir::{self, ExprKind, GenericArg, ItemKind, Node, PatKind, QPath};
@ -145,7 +145,7 @@ use crate::session::config::EntryFnType;
use crate::session::Session;
use crate::util::captures::Captures;
use crate::util::common::{indenter, ErrorReported};
use crate::util::nodemap::{DefIdMap, DefIdSet, HirIdMap};
use crate::util::nodemap::HirIdMap;
use crate::TypeAndSubsts;
use self::autoderef::Autoderef;

View file

@ -5,14 +5,13 @@
use crate::check::FnCtxt;
use rustc::hir;
use rustc::hir::def_id::{DefId, DefIndex};
use rustc::hir::def_id::{DefId, DefIdSet, DefIndex};
use rustc::hir::intravisit::{self, NestedVisitorMap, Visitor};
use rustc::infer::error_reporting::TypeAnnotationNeeded::E0282;
use rustc::infer::InferCtxt;
use rustc::ty::adjustment::{Adjust, Adjustment, PointerCast};
use rustc::ty::fold::{TypeFoldable, TypeFolder};
use rustc::ty::{self, Ty, TyCtxt};
use rustc::util::nodemap::DefIdSet;
use rustc_data_structures::sync::Lrc;
use rustc_span::symbol::sym;
use rustc_span::Span;

View file

@ -6,11 +6,9 @@ use rustc_span::Span;
use syntax::ast;
use rustc::hir;
use rustc::hir::def_id::{DefId, LOCAL_CRATE};
use rustc::hir::def_id::{DefId, DefIdSet, LOCAL_CRATE};
use rustc::hir::itemlikevisit::ItemLikeVisitor;
use rustc::hir::print::visibility_qualified;
use rustc::util::nodemap::DefIdSet;
use rustc_data_structures::fx::FxHashMap;
pub fn check_crate(tcx: TyCtxt<'_>) {