mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make visitor uses more robust

Browse Source
This commit is contained in:
Mazdak Farrokhzad 2019-12-11 11:14:13 +01:00
parent 74d4fbc5f5
commit 054458b48d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/librustc/hir/lowering/item.rs
View File

@ -94,7 +94,7 @@ impl<'tcx, 'interner> Visitor<'tcx> for ItemLowerer<'tcx, 'interner> {
lctx.modules.get_mut(&lctx.current_module).unwrap().trait_items.insert(id);
});
visit::walk_assoc_item(self, item);
visit::walk_trait_item(self, item);
}
fn visit_impl_item(&mut self, item: &'tcx AssocItem) {
@ -104,7 +104,7 @@ impl<'tcx, 'interner> Visitor<'tcx> for ItemLowerer<'tcx, 'interner> {
lctx.impl_items.insert(id, hir_item);
lctx.modules.get_mut(&lctx.current_module).unwrap().impl_items.insert(id);
});
visit::walk_assoc_item(self, item);
visit::walk_impl_item(self, item);
}
}

8
src/librustc_resolve/late.rs
View File

@ -819,10 +819,10 @@ impl<'a, 'b> LateResolutionVisitor<'a, '_> {
}
}
AssocItemKind::Fn(_, _) => {
visit::walk_assoc_item(this, trait_item)
visit::walk_trait_item(this, trait_item)
}
AssocItemKind::TyAlias(..) => {
visit::walk_assoc_item(this, trait_item)
visit::walk_trait_item(this, trait_item)
}
AssocItemKind::Macro(_) => {
panic!("unexpanded macro in resolve!")
@ -1106,7 +1106,7 @@ impl<'a, 'b> LateResolutionVisitor<'a, '_> {
);
this.with_constant_rib(|this| {
visit::walk_assoc_item(this, impl_item)
visit::walk_impl_item(this, impl_item)
});
}
AssocItemKind::Fn(..) => {
@ -1117,7 +1117,7 @@ impl<'a, 'b> LateResolutionVisitor<'a, '_> {
impl_item.span,
|n, s| MethodNotMemberOfTrait(n, s));
visit::walk_assoc_item(this, impl_item);
visit::walk_impl_item(this, impl_item);
}
AssocItemKind::TyAlias(_, Some(ref ty)) => {
// If this is a trait impl, ensure the type