Skip to content

Commit 210109c

Browse files
committed
Include the crate root in the ribs
1 parent 7f3491c commit 210109c

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

src/librustc_resolve/lib.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1168,8 +1168,8 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
11681168
unresolved_imports: 0,
11691169

11701170
current_module: graph_root,
1171-
value_ribs: Vec::new(),
1172-
type_ribs: Vec::new(),
1171+
value_ribs: vec![Rib::new(ModuleRibKind(graph_root))],
1172+
type_ribs: vec![Rib::new(ModuleRibKind(graph_root))],
11731173
label_ribs: Vec::new(),
11741174

11751175
current_trait_ref: None,
@@ -2712,10 +2712,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
27122712
}
27132713

27142714
if check_ribs {
2715-
match self.resolve_identifier_in_local_ribs(identifier, namespace, record_used) {
2716-
Some(def) => return Some(def),
2717-
None => {}
2718-
}
2715+
return self.resolve_identifier_in_local_ribs(identifier, namespace, record_used);
27192716
}
27202717

27212718
// Check the items.

0 commit comments

Comments
 (0)