Rollup merge of #67922 - Centril:lowering-cleanup, r=petrochenkov

[rust.git] / src / librustc_resolve / imports.rs

diff --git a/src/librustc_resolve/imports.rs b/src/librustc_resolve/imports.rs
index afbfb647b3cacbdf720d5fe95834b26583fa5a85..72de895f350f83ac139b3481662b54c7aafa3b84 100644 (file)
--- a/src/librustc_resolve/imports.rs
+++ b/src/librustc_resolve/imports.rs
@@ -11,24 +11,23 @@
 use crate::{CrateLint, Module, ModuleOrUniformRoot, ParentScope, PerNS, ScopeSet, Weak};
 use crate::{NameBinding, NameBindingKind, PathResult, PrivacyError, ToNameBinding};
 
-use errors::{pluralize, Applicability};
-
-use rustc::hir::def::{self, Export, PartialRes};
-use rustc::hir::def_id::DefId;
+use errors::{pluralize, struct_span_err, Applicability};
+use rustc::hir::exports::Export;
 use rustc::lint::builtin::BuiltinLintDiagnostics;
 use rustc::lint::builtin::{PUB_USE_OF_PRIVATE_EXTERN_CRATE, UNUSED_IMPORTS};
 use rustc::session::DiagnosticMessageId;
 use rustc::ty;
-use rustc::util::nodemap::FxHashSet;
 use rustc::{bug, span_bug};
+use rustc_data_structures::fx::FxHashSet;
 use rustc_data_structures::ptr_key::PtrKey;
-
+use rustc_hir::def::{self, PartialRes};
+use rustc_hir::def_id::DefId;
+use rustc_span::hygiene::ExpnId;
+use rustc_span::symbol::kw;
+use rustc_span::{MultiSpan, Span};
 use syntax::ast::{Ident, Name, NodeId};
-use syntax::symbol::kw;
+use syntax::unwrap_or;
 use syntax::util::lev_distance::find_best_match_for_name;
-use syntax::{struct_span_err, unwrap_or};
-use syntax_pos::hygiene::ExpnId;
-use syntax_pos::{MultiSpan, Span};
 
 use rustc_error_codes::*;