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 5ede0564b1ae50759dd12b1c0c8ed49e26582615..72de895f350f83ac139b3481662b54c7aafa3b84 100644 (file)
--- a/src/librustc_resolve/imports.rs
+++ b/src/librustc_resolve/imports.rs
@@ -11,8 +11,7 @@
 use crate::{CrateLint, Module, ModuleOrUniformRoot, ParentScope, PerNS, ScopeSet, Weak};
 use crate::{NameBinding, NameBindingKind, PathResult, PrivacyError, ToNameBinding};
 
-use errors::{pluralize, Applicability};
-
+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};
@@ -27,8 +26,8 @@
 use rustc_span::symbol::kw;
 use rustc_span::{MultiSpan, Span};
 use syntax::ast::{Ident, Name, NodeId};
+use syntax::unwrap_or;
 use syntax::util::lev_distance::find_best_match_for_name;
-use syntax::{struct_span_err, unwrap_or};
 
 use rustc_error_codes::*;