user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor module.add_import_directive() -> resolver.add_import_directive().

Browse source
This commit is contained in:
Jeffrey Seyfried 2016-08-17 00:22:03 +00:00
parent aef6971ca9
commit d107d22590
2 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/librustc_resolve/build_reduced_graph.rs
View file

@ -130,7 +130,7 @@ impl<'b> Resolver<'b> {
let subclass = ImportDirectiveSubclass::single(binding.name, source_name);
let span = view_path.span;
parent.add_import_directive(module_path, subclass, span, item.id, vis);
self.add_import_directive(module_path, subclass, span, item.id, vis);
self.unresolved_imports += 1;
}
ViewPathList(_, ref source_items) => {
@ -176,14 +176,14 @@ impl<'b> Resolver<'b> {
};
let subclass = ImportDirectiveSubclass::single(rename, name);
let (span, id) = (source_item.span, source_item.node.id());
parent.add_import_directive(module_path, subclass, span, id, vis);
self.add_import_directive(module_path, subclass, span, id, vis);
self.unresolved_imports += 1;
}
}
ViewPathGlob(_) => {
let subclass = GlobImport { is_prelude: is_prelude };
let span = view_path.span;
parent.add_import_directive(module_path, subclass, span, item.id, vis);
self.add_import_directive(module_path, subclass, span, item.id, vis);
self.unresolved_imports += 1;
}
}

15
src/librustc_resolve/resolve_imports.rs
View file

@ -212,8 +212,11 @@ impl<'a> ::ModuleS<'a> {
Failed(None)
}
}
pub fn add_import_directive(&self,
impl<'a> Resolver<'a> {
// Add an import directive to the current module.
pub fn add_import_directive(&mut self,
module_path: Vec<Name>,
subclass: ImportDirectiveSubclass,
span: Span,
@ -228,23 +231,21 @@ impl<'a> ::ModuleS<'a> {
vis: vis,
});
self.unresolved_imports.borrow_mut().push(directive);
self.current_module.unresolved_imports.borrow_mut().push(directive);
match directive.subclass {
SingleImport { target, .. } => {
for &ns in &[ValueNS, TypeNS] {
self.resolution(target, ns).borrow_mut().single_imports
.add_directive(directive);
let mut resolution = self.current_module.resolution(target, ns).borrow_mut();
resolution.single_imports.add_directive(directive);
}
}
// We don't add prelude imports to the globs since they only affect lexical scopes,
// which are not relevant to import resolution.
GlobImport { is_prelude: true } => {}
GlobImport { .. } => self.globs.borrow_mut().push(directive),
GlobImport { .. } => self.current_module.globs.borrow_mut().push(directive),
}
}
}
impl<'a> Resolver<'a> {
// Given a binding and an import directive that resolves to it,
// return the corresponding binding defined by the import directive.
fn import(&mut self, binding: &'a NameBinding<'a>, directive: &'a ImportDirective<'a>)