Skip to content

Commit 2df1ceb

Browse files
committed
resolve: factor out resolve imports to its own module
1 parent 432011d commit 2df1ceb

File tree

4 files changed

+1118
-1063
lines changed

4 files changed

+1118
-1063
lines changed

src/librustc_resolve/build_reduced_graph.rs

+8-7
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,17 @@
1414
//! any imports resolved.
1515
1616
use {DefModifiers, PUBLIC, IMPORTABLE};
17-
use ImportDirective;
18-
use ImportDirectiveSubclass::{self, SingleImport, GlobImport};
19-
use ImportResolution;
17+
use resolve_imports::ImportDirective;
18+
use resolve_imports::ImportDirectiveSubclass::{self, SingleImport, GlobImport};
19+
use resolve_imports::ImportResolution;
2020
use Module;
2121
use ModuleKind::*;
2222
use Namespace::{TypeNS, ValueNS};
2323
use NameBindings;
24+
use {names_to_string, module_to_string};
2425
use ParentLink::{self, ModuleParentLink, BlockParentLink};
2526
use Resolver;
26-
use Shadowable;
27+
use resolve_imports::Shadowable;
2728
use TypeNsDef;
2829

2930
use self::DuplicateCheckingMode::*;
@@ -381,7 +382,7 @@ impl<'a, 'b:'a, 'tcx:'b> GraphBuilder<'a, 'b, 'tcx> {
381382
false,
382383
true));
383384
debug!("(build reduced graph for item) found extern `{}`",
384-
self.module_to_string(&*external_module));
385+
module_to_string(&*external_module));
385386
self.check_for_conflicts_between_external_crates(&**parent, name, sp);
386387
parent.external_module_children.borrow_mut()
387388
.insert(name, external_module.clone());
@@ -836,7 +837,7 @@ impl<'a, 'b:'a, 'tcx:'b> GraphBuilder<'a, 'b, 'tcx> {
836837
/// Builds the reduced graph rooted at the given external module.
837838
fn populate_external_module(&mut self, module: &Rc<Module>) {
838839
debug!("(populating external module) attempting to populate {}",
839-
self.module_to_string(&**module));
840+
module_to_string(&**module));
840841

841842
let def_id = match module.def_id.get() {
842843
None => {
@@ -903,7 +904,7 @@ impl<'a, 'b:'a, 'tcx:'b> GraphBuilder<'a, 'b, 'tcx> {
903904
match subclass {
904905
SingleImport(target, _) => {
905906
debug!("(building import directive) building import directive: {}::{}",
906-
self.names_to_string(&module_.imports.borrow().last().unwrap().module_path),
907+
names_to_string(&module_.imports.borrow().last().unwrap().module_path),
907908
token::get_name(target));
908909

909910
let mut import_resolutions = module_.import_resolutions.borrow_mut();

0 commit comments

Comments
 (0)