OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refactor away populate_external_module

Browse Source
This commit is contained in:
Jeffrey Seyfried 2016-03-01 02:36:31 +00:00
parent 7bc6c75d0f
commit ff014a3a10
1 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/librustc_resolve/build_reduced_graph.rs
View File

@ -19,7 +19,6 @@ use resolve_imports::ImportDirectiveSubclass::{self, SingleImport, GlobImport};
use Module; use Module;
use Namespace::{self, TypeNS, ValueNS}; use Namespace::{self, TypeNS, ValueNS};
use {NameBinding, NameBindingKind}; use {NameBinding, NameBindingKind};
use module_to_string;
use ParentLink::{ModuleParentLink, BlockParentLink}; use ParentLink::{ModuleParentLink, BlockParentLink};
use Resolver; use Resolver;
use {resolve_error, resolve_struct_error, ResolutionError}; use {resolve_error, resolve_struct_error, ResolutionError};
@ -547,34 +546,14 @@ impl<'a, 'b:'a, 'tcx:'b> GraphBuilder<'a, 'b, 'tcx> {
} }
} }
/// Builds the reduced graph rooted at the given external module.
fn populate_external_module(&mut self, module: Module<'b>) {
debug!("(populating external module) attempting to populate {}",
module_to_string(module));
let def_id = match module.def_id() {
None => {
debug!("(populating external module) ... no def ID!");
return;
}
Some(def_id) => def_id,
};
for child in self.session.cstore.item_children(def_id) {
debug!("(populating external module) ... found ident: {}",
child.name);
self.build_reduced_graph_for_external_crate_def(module, child);
}
module.populated.set(true)
}
/// Ensures that the reduced graph rooted at the given external module /// Ensures that the reduced graph rooted at the given external module
/// is built, building it if it is not. /// is built, building it if it is not.
fn populate_module_if_necessary(&mut self, module: Module<'b>) { fn populate_module_if_necessary(&mut self, module: Module<'b>) {
if !module.populated.get() { if module.populated.get() { return }
self.populate_external_module(module) for child in self.session.cstore.item_children(module.def_id().unwrap()) {
self.build_reduced_graph_for_external_crate_def(module, child);
} }
assert!(module.populated.get()) module.populated.set(true)
} }
/// Builds the reduced graph rooted at the 'use' directive for an external /// Builds the reduced graph rooted at the 'use' directive for an external