make visitor uses more robust

Centril · Centril · commit 054458b48db8 · 2019-12-12T18:05:05.000+01:00
diff --git a/src/librustc/hir/lowering/item.rs b/src/librustc/hir/lowering/item.rs
@@ -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);
     }
 }
 
diff --git a/src/librustc_resolve/late.rs b/src/librustc_resolve/late.rs
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ impl<'tcx, 'interner> Visitor<'tcx> for ItemLowerer<'tcx, 'interner> {`
`94`	`94`	`lctx.modules.get_mut(&lctx.current_module).unwrap().trait_items.insert(id);`
`95`	`95`	`});`
`96`	`96`
`97`		`- visit::walk_assoc_item(self, item);`
	`97`	`+ visit::walk_trait_item(self, item);`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`fn visit_impl_item(&mut self, item: &'tcx AssocItem) {`
`@@ -104,7 +104,7 @@ impl<'tcx, 'interner> Visitor<'tcx> for ItemLowerer<'tcx, 'interner> {`
`104`	`104`	`lctx.impl_items.insert(id, hir_item);`
`105`	`105`	`lctx.modules.get_mut(&lctx.current_module).unwrap().impl_items.insert(id);`
`106`	`106`	`});`
`107`		`- visit::walk_assoc_item(self, item);`
	`107`	`+ visit::walk_impl_item(self, item);`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`
Original file line number	Diff line number	Diff line change
`@@ -819,10 +819,10 @@ impl<'a, 'b> LateResolutionVisitor<'a, '_> {`
`819`	`819`	`}`
`820`	`820`	`}`
`821`	`821`	`AssocItemKind::Fn(_, _) => {`
`822`		`- visit::walk_assoc_item(this, trait_item)`
	`822`	`+ visit::walk_trait_item(this, trait_item)`
`823`	`823`	`}`
`824`	`824`	`AssocItemKind::TyAlias(..) => {`
`825`		`- visit::walk_assoc_item(this, trait_item)`
	`825`	`+ visit::walk_trait_item(this, trait_item)`
`826`	`826`	`}`
`827`	`827`	`AssocItemKind::Macro(_) => {`
`828`	`828`	`panic!("unexpanded macro in resolve!")`
`@@ -1106,7 +1106,7 @@ impl<'a, 'b> LateResolutionVisitor<'a, '_> {`
`1106`	`1106`	`);`
`1107`	`1107`
`1108`	`1108`	`this.with_constant_rib(\|this\| {`
`1109`		`- visit::walk_assoc_item(this, impl_item)`
	`1109`	`+ visit::walk_impl_item(this, impl_item)`
`1110`	`1110`	`});`
`1111`	`1111`	`}`
`1112`	`1112`	`AssocItemKind::Fn(..) => {`
`@@ -1117,7 +1117,7 @@ impl<'a, 'b> LateResolutionVisitor<'a, '_> {`
`1117`	`1117`	`impl_item.span,`
`1118`	`1118`	`\|n, s\| MethodNotMemberOfTrait(n, s));`
`1119`	`1119`
`1120`		`- visit::walk_assoc_item(this, impl_item);`
	`1120`	`+ visit::walk_impl_item(this, impl_item);`
`1121`	`1121`	`}`
`1122`	`1122`	`AssocItemKind::TyAlias(_, Some(ref ty)) => {`
`1123`	`1123`	`// If this is a trait impl, ensure the type`