|
14 | 14 | //! any imports resolved.
|
15 | 15 |
|
16 | 16 | 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; |
20 | 20 | use Module;
|
21 | 21 | use ModuleKind::*;
|
22 | 22 | use Namespace::{TypeNS, ValueNS};
|
23 | 23 | use NameBindings;
|
| 24 | +use {names_to_string, module_to_string}; |
24 | 25 | use ParentLink::{self, ModuleParentLink, BlockParentLink};
|
25 | 26 | use Resolver;
|
26 |
| -use Shadowable; |
| 27 | +use resolve_imports::Shadowable; |
27 | 28 | use TypeNsDef;
|
28 | 29 |
|
29 | 30 | use self::DuplicateCheckingMode::*;
|
@@ -381,7 +382,7 @@ impl<'a, 'b:'a, 'tcx:'b> GraphBuilder<'a, 'b, 'tcx> {
|
381 | 382 | false,
|
382 | 383 | true));
|
383 | 384 | debug!("(build reduced graph for item) found extern `{}`",
|
384 |
| - self.module_to_string(&*external_module)); |
| 385 | + module_to_string(&*external_module)); |
385 | 386 | self.check_for_conflicts_between_external_crates(&**parent, name, sp);
|
386 | 387 | parent.external_module_children.borrow_mut()
|
387 | 388 | .insert(name, external_module.clone());
|
@@ -836,7 +837,7 @@ impl<'a, 'b:'a, 'tcx:'b> GraphBuilder<'a, 'b, 'tcx> {
|
836 | 837 | /// Builds the reduced graph rooted at the given external module.
|
837 | 838 | fn populate_external_module(&mut self, module: &Rc<Module>) {
|
838 | 839 | debug!("(populating external module) attempting to populate {}",
|
839 |
| - self.module_to_string(&**module)); |
| 840 | + module_to_string(&**module)); |
840 | 841 |
|
841 | 842 | let def_id = match module.def_id.get() {
|
842 | 843 | None => {
|
@@ -903,7 +904,7 @@ impl<'a, 'b:'a, 'tcx:'b> GraphBuilder<'a, 'b, 'tcx> {
|
903 | 904 | match subclass {
|
904 | 905 | SingleImport(target, _) => {
|
905 | 906 | 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), |
907 | 908 | token::get_name(target));
|
908 | 909 |
|
909 | 910 | let mut import_resolutions = module_.import_resolutions.borrow_mut();
|
|
0 commit comments