canonicalize FxHash{Map,Set} imports

Author: Centril

src/librustc/hir/map/collector.rs

@@ -8,7 +8,7 @@ use crate::ich::Fingerprint;
 use crate::middle::cstore::CrateStore;
 use crate::session::CrateDisambiguator;
 use crate::session::Session;
-use crate::util::nodemap::FxHashMap;
+use rustc_data_structures::fx::FxHashMap;
 use rustc_data_structures::svh::Svh;
 use rustc_index::vec::IndexVec;
 use rustc_span::source_map::SourceMap;

src/librustc/hir/map/mod.rs

@@ -12,8 +12,8 @@ use crate::hir::*;
 use crate::middle::cstore::CrateStoreDyn;
 use crate::ty::query::Providers;
 use crate::util::common::time;
-use crate::util::nodemap::FxHashMap;
 
+use rustc_data_structures::fx::FxHashMap;
 use rustc_data_structures::svh::Svh;
 use rustc_index::vec::IndexVec;
 use rustc_span::hygiene::MacroKind;

src/librustc/hir/mod.rs

@@ -11,9 +11,10 @@ pub use self::UnsafeSource::*;
 use crate::hir::def::{DefKind, Res};
 use crate::hir::def_id::{DefId, DefIndex, LocalDefId, CRATE_DEF_INDEX};
 use crate::ty::query::Providers;
-use crate::util::nodemap::{FxHashSet, NodeMap};
+use crate::util::nodemap::NodeMap;
 
 use errors::FatalError;
+use rustc_data_structures::fx::FxHashSet;
 use rustc_data_structures::sync::{par_for_each_in, Send, Sync};
 use rustc_macros::HashStable;
 use rustc_serialize::{self, Decodable, Decoder, Encodable, Encoder};

src/librustc/infer/freshen.rs

@@ -33,7 +33,8 @@
 
 use crate::ty::fold::TypeFolder;
 use crate::ty::{self, Ty, TyCtxt, TypeFoldable};
-use crate::util::nodemap::FxHashMap;
+
+use rustc_data_structures::fx::FxHashMap;
 
 use std::collections::hash_map::Entry;
 

src/librustc/infer/lexical_region_resolve/graphviz.rs

@@ -15,7 +15,7 @@ use crate::infer::SubregionOrigin;
 use crate::middle::free_region::RegionRelations;
 use crate::middle::region;
 use crate::ty;
-use crate::util::nodemap::{FxHashMap, FxHashSet};
+use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 
 use std::borrow::Cow;
 use std::collections::btree_map::BTreeMap;

src/librustc/infer/mod.rs

@@ -22,9 +22,9 @@ use crate::ty::relate::RelateResult;
 use crate::ty::subst::{GenericArg, InternalSubsts, SubstsRef};
 use crate::ty::{self, GenericParamDefKind, InferConst, Ty, TyCtxt};
 use crate::ty::{ConstVid, FloatVid, IntVid, TyVid};
-use crate::util::nodemap::{FxHashMap, FxHashSet};
 
 use errors::DiagnosticBuilder;
+use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_data_structures::sync::Lrc;
 use rustc_data_structures::unify as ut;
 use rustc_span::symbol::Symbol;

src/librustc/lint/context.rs

@@ -27,9 +27,8 @@ use crate::middle::privacy::AccessLevels;
 use crate::session::Session;
 use crate::ty::layout::{LayoutError, LayoutOf, TyLayout};
 use crate::ty::{self, print::Printer, subst::GenericArg, Ty, TyCtxt};
-use crate::util::nodemap::FxHashMap;
-
 use errors::DiagnosticBuilder;
+use rustc_data_structures::fx::FxHashMap;
 use rustc_data_structures::sync;
 use rustc_span::{symbol::Symbol, MultiSpan, Span};
 use std::slice;

src/librustc/lint/levels.rs

@@ -6,8 +6,8 @@ use crate::lint::builtin;
 use crate::lint::context::{CheckLintNameResult, LintStore};
 use crate::lint::{self, Level, Lint, LintId, LintSource};
 use crate::session::Session;
-use crate::util::nodemap::FxHashMap;
 use errors::{Applicability, DiagnosticBuilder};
+use rustc_data_structures::fx::FxHashMap;
 use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
 use rustc_span::source_map::MultiSpan;
 use rustc_span::symbol::{sym, Symbol};

src/librustc/middle/lang_items.rs

@@ -9,15 +9,15 @@
 
 pub use self::LangItem::*;
 
+use crate::hir;
 use crate::hir::check_attr::Target;
 use crate::hir::def_id::DefId;
+use crate::hir::itemlikevisit::ItemLikeVisitor;
 use crate::middle::cstore::ExternCrate;
 use crate::middle::weak_lang_items;
 use crate::ty::{self, TyCtxt};
-use crate::util::nodemap::FxHashMap;
 
-use crate::hir;
-use crate::hir::itemlikevisit::ItemLikeVisitor;
+use rustc_data_structures::fx::FxHashMap;
 use rustc_macros::HashStable;
 use rustc_span::symbol::{sym, Symbol};
 use rustc_span::Span;

src/librustc/middle/privacy.rs

@@ -3,8 +3,9 @@
 //! which are available for use externally when compiled as a library.
 
 use crate::hir::HirId;
-use crate::util::nodemap::{DefIdSet, FxHashMap};
+use crate::util::nodemap::DefIdSet;
 
+use rustc_data_structures::fx::FxHashMap;
 use rustc_macros::HashStable;
 use std::fmt;
 use std::hash::Hash;