Skip to content
Permalink
Browse files

Rename `rustc_resolve/resolve_imports.rs` -> `rustc_resolve/imports.rs`

  • Loading branch information
petrochenkov committed Dec 29, 2019
1 parent a2823e3 commit 7608f21b278d9aadcdebbb6d99760d70c52d5750
@@ -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::{
@@ -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;
@@ -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};
File renamed without changes.
@@ -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::*;

@@ -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,
@@ -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};

0 comments on commit 7608f21

Please sign in to comment.
You can’t perform that action at this time.