From 7608f21b278d9aadcdebbb6d99760d70c52d5750 Mon Sep 17 00:00:00 2001
From: Vadim Petrochenkov <vadim.petrochenkov@gmail.com>
Date: Sun, 29 Dec 2019 19:42:23 +0300
Subject: [PATCH] Rename `rustc_resolve/resolve_imports.rs` ->
 `rustc_resolve/imports.rs`

---
 src/librustc_resolve/build_reduced_graph.rs             | 4 ++--
 src/librustc_resolve/check_unused.rs                    | 2 +-
 src/librustc_resolve/diagnostics.rs                     | 2 +-
 src/librustc_resolve/{resolve_imports.rs => imports.rs} | 0
 src/librustc_resolve/late.rs                            | 2 +-
 src/librustc_resolve/lib.rs                             | 4 ++--
 src/librustc_resolve/macros.rs                          | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)
 rename src/librustc_resolve/{resolve_imports.rs => imports.rs} (100%)

diff --git a/src/librustc_resolve/build_reduced_graph.rs b/src/librustc_resolve/build_reduced_graph.rs
index 786f1faaecb..388b00e9911 100644
--- a/src/librustc_resolve/build_reduced_graph.rs
+++ b/src/librustc_resolve/build_reduced_graph.rs
@@ -6,9 +6,9 @@
 //! Imports are also considered items and placed into modules here, but not resolved yet.
 
 use crate::def_collector::collect_definitions;
+use crate::imports::ImportDirective;
+use crate::imports::ImportDirectiveSubclass::{self, GlobImport, SingleImport};
 use crate::macros::{LegacyBinding, LegacyScope};
-use crate::resolve_imports::ImportDirective;
-use crate::resolve_imports::ImportDirectiveSubclass::{self, GlobImport, SingleImport};
 use crate::Namespace::{self, MacroNS, TypeNS, ValueNS};
 use crate::{CrateLint, Determinacy, PathResult, ResolutionError, VisResolutionError};
 use crate::{
diff --git a/src/librustc_resolve/check_unused.rs b/src/librustc_resolve/check_unused.rs
index b32a6373742..93217aa1477 100644
--- a/src/librustc_resolve/check_unused.rs
+++ b/src/librustc_resolve/check_unused.rs
@@ -23,7 +23,7 @@
 //  - `check_crate` finally emits the diagnostics based on the data generated
 //    in the last step
 
-use crate::resolve_imports::ImportDirectiveSubclass;
+use crate::imports::ImportDirectiveSubclass;
 use crate::Resolver;
 
 use errors::pluralize;
diff --git a/src/librustc_resolve/diagnostics.rs b/src/librustc_resolve/diagnostics.rs
index d8a43e8646e..82b9e5347b7 100644
--- a/src/librustc_resolve/diagnostics.rs
+++ b/src/librustc_resolve/diagnostics.rs
@@ -19,8 +19,8 @@ use syntax::util::lev_distance::find_best_match_for_name;
 use syntax_pos::hygiene::MacroKind;
 use syntax_pos::{BytePos, MultiSpan, Span};
 
+use crate::imports::{ImportDirective, ImportDirectiveSubclass, ImportResolver};
 use crate::path_names_to_string;
-use crate::resolve_imports::{ImportDirective, ImportDirectiveSubclass, ImportResolver};
 use crate::VisResolutionError;
 use crate::{BindingError, CrateLint, HasGenericParams, LegacyScope, Module, ModuleOrUniformRoot};
 use crate::{ParentScope, PathResult, ResolutionError, Resolver, Scope, ScopeSet, Segment};
diff --git a/src/librustc_resolve/resolve_imports.rs b/src/librustc_resolve/imports.rs
similarity index 100%
rename from src/librustc_resolve/resolve_imports.rs
rename to src/librustc_resolve/imports.rs
diff --git a/src/librustc_resolve/late.rs b/src/librustc_resolve/late.rs
index 898ab6ae322..ae0a9255497 100644
--- a/src/librustc_resolve/late.rs
+++ b/src/librustc_resolve/late.rs
@@ -3,7 +3,7 @@
 //! So it just walks through the crate and resolves all the expressions, types, etc.
 //!
 //! If you wonder why there's no `early.rs`, that's because it's split into three files -
-//! `build_reduced_graph.rs`, `macros.rs` and `resolve_imports.rs`.
+//! `build_reduced_graph.rs`, `macros.rs` and `imports.rs`.
 
 use RibKind::*;
 
diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs
index f6e836011b2..357176ae090 100644
--- a/src/librustc_resolve/lib.rs
+++ b/src/librustc_resolve/lib.rs
@@ -60,9 +60,9 @@ use std::{cmp, fmt, iter, ptr};
 
 use diagnostics::{extend_span_to_previous_binding, find_span_of_binding_until_next_binding};
 use diagnostics::{ImportSuggestion, Suggestion};
+use imports::{ImportDirective, ImportDirectiveSubclass, ImportResolver, NameResolution};
 use late::{HasGenericParams, PathSource, Rib, RibKind::*};
 use macros::{LegacyBinding, LegacyScope};
-use resolve_imports::{ImportDirective, ImportDirectiveSubclass, ImportResolver, NameResolution};
 
 use rustc_error_codes::*;
 
@@ -72,9 +72,9 @@ mod build_reduced_graph;
 mod check_unused;
 mod def_collector;
 mod diagnostics;
+mod imports;
 mod late;
 mod macros;
-mod resolve_imports;
 
 enum Weak {
     Yes,
diff --git a/src/librustc_resolve/macros.rs b/src/librustc_resolve/macros.rs
index 580dbad5724..d9c3cf0f5f0 100644
--- a/src/librustc_resolve/macros.rs
+++ b/src/librustc_resolve/macros.rs
@@ -1,7 +1,7 @@
 //! A bunch of methods and structures more or less related to resolving macros and
 //! interface provided by `Resolver` to macro expander.
 
-use crate::resolve_imports::ImportResolver;
+use crate::imports::ImportResolver;
 use crate::Namespace::*;
 use crate::{AmbiguityError, AmbiguityErrorMisc, AmbiguityKind, Determinacy};
 use crate::{CrateLint, ParentScope, ResolutionError, Resolver, Scope, ScopeSet, Weak};