Rollup merge of #67881 - varkor:scattering-of-backticks, r=Centril

[rust.git] / src / librustc / mir / mono.rs

diff --git a/src/librustc/mir/mono.rs b/src/librustc/mir/mono.rs
index b13b4fd3b8d37e108d2674c6039ad5c64556f39c..2dbe1d4fa5c49413d721fea66743f2cc14ff62ff 100644 (file)
--- a/src/librustc/mir/mono.rs
+++ b/src/librustc/mir/mono.rs
@@ -5,14 +5,14 @@
 use crate::session::config::OptLevel;
 use crate::ty::print::obsolete::DefPathBasedNames;
 use crate::ty::{subst::InternalSubsts, Instance, InstanceDef, SymbolName, TyCtxt};
-use crate::util::nodemap::FxHashMap;
 use rustc_data_structures::base_n;
+use rustc_data_structures::fx::FxHashMap;
 use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
+use rustc_span::source_map::Span;
+use rustc_span::symbol::Symbol;
 use std::fmt;
 use std::hash::Hash;
 use syntax::attr::InlineAttr;
-use syntax::source_map::Span;
-use syntax::symbol::Symbol;
 
 /// Describes how a monomorphization will be instantiated in object files.
 #[derive(PartialEq)]