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

Include the crate root in the ribs

Browse Source
This commit is contained in:
Jeffrey Seyfried 2016-02-26 05:39:33 +00:00
parent 7f3491c39d
commit 210109cf7b
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/librustc_resolve/lib.rs
View File

@ -1168,8 +1168,8 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
unresolved_imports: 0,
current_module: graph_root,
value_ribs: Vec::new(),
type_ribs: Vec::new(),
value_ribs: vec![Rib::new(ModuleRibKind(graph_root))],
type_ribs: vec![Rib::new(ModuleRibKind(graph_root))],
label_ribs: Vec::new(),
current_trait_ref: None,
@ -2712,10 +2712,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
}
if check_ribs {
match self.resolve_identifier_in_local_ribs(identifier, namespace, record_used) {
Some(def) => return Some(def),
None => {}
}
return self.resolve_identifier_in_local_ribs(identifier, namespace, record_used);
}
// Check the items.