Unify associated item visitor.

Centril · Centril · commit 0d8a9d74e3bb · 2019-12-12T18:00:00.000+01:00
diff --git a/src/librustc/hir/lowering.rs b/src/librustc/hir/lowering.rs
@@ -484,19 +484,19 @@ impl<'a> LoweringContext<'a> {
                     TraitItemKind::Method(_, None) => {
                         // Ignore patterns in trait methods without bodies
                         self.with_hir_id_owner(None, |this| {
-                            visit::walk_trait_item(this, item)
+                            visit::walk_assoc_item(this, item)
                         });
                     }
                     _ => self.with_hir_id_owner(Some(item.id), |this| {
-                        visit::walk_trait_item(this, item);
+                        visit::walk_assoc_item(this, item);
                     })
                 }
             }
 
             fn visit_impl_item(&mut self, item: &'tcx ImplItem) {
                 self.lctx.allocate_hir_id_counter(item.id);
                 self.with_hir_id_owner(Some(item.id), |this| {
-                    visit::walk_impl_item(this, item);
+                    visit::walk_assoc_item(this, item);
                 });
             }
 
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_trait_item(self, item);
+        visit::walk_assoc_item(self, item);
     }
 
     fn visit_impl_item(&mut self, item: &'tcx ImplItem) {
@@ -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_impl_item(self, item);
+        visit::walk_assoc_item(self, item);
     }
 }
 
diff --git a/src/librustc/lint/context.rs b/src/librustc/lint/context.rs
@@ -1252,15 +1252,15 @@ impl<'a, T: EarlyLintPass> ast_visit::Visitor<'a> for EarlyContextAndPass<'a, T>
     fn visit_trait_item(&mut self, trait_item: &'a ast::TraitItem) {
         self.with_lint_attrs(trait_item.id, &trait_item.attrs, |cx| {
             run_early_pass!(cx, check_trait_item, trait_item);
-            ast_visit::walk_trait_item(cx, trait_item);
+            ast_visit::walk_assoc_item(cx, trait_item);
             run_early_pass!(cx, check_trait_item_post, trait_item);
         });
     }
 
     fn visit_impl_item(&mut self, impl_item: &'a ast::ImplItem) {
         self.with_lint_attrs(impl_item.id, &impl_item.attrs, |cx| {
             run_early_pass!(cx, check_impl_item, impl_item);
-            ast_visit::walk_impl_item(cx, impl_item);
+            ast_visit::walk_assoc_item(cx, impl_item);
             run_early_pass!(cx, check_impl_item_post, impl_item);
         });
     }
diff --git a/src/librustc_passes/ast_validation.rs b/src/librustc_passes/ast_validation.rs
@@ -772,28 +772,28 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
             |this| visit::walk_enum_def(this, enum_definition, generics, item_id))
     }
 
-    fn visit_impl_item(&mut self, ii: &'a ImplItem) {
+    fn visit_impl_item(&mut self, ii: &'a AssocItem) {
         match &ii.kind {
-            ImplItemKind::Const(_, body) => {
+            AssocItemKind::Const(_, body) => {
                 self.check_impl_item_provided(ii.span, body, "constant", " = <expr>;");
             }
-            ImplItemKind::Method(sig, body) => {
+            AssocItemKind::Method(sig, body) => {
                 self.check_impl_item_provided(ii.span, body, "function", " { <body> }");
                 self.check_fn_decl(&sig.decl);
             }
-            ImplItemKind::TyAlias(bounds, body) => {
+            AssocItemKind::TyAlias(bounds, body) => {
                 self.check_impl_item_provided(ii.span, body, "type", " = <type>;");
                 self.check_impl_assoc_type_no_bounds(bounds);
             }
             _ => {}
         }
-        visit::walk_impl_item(self, ii);
+        visit::walk_assoc_item(self, ii);
     }
 
-    fn visit_trait_item(&mut self, ti: &'a TraitItem) {
+    fn visit_trait_item(&mut self, ti: &'a AssocItem) {
         self.invalid_visibility(&ti.vis, None);
         self.check_defaultness(ti.span, ti.defaultness);
-        visit::walk_trait_item(self, ti);
+        visit::walk_assoc_item(self, ti);
     }
 }
 
diff --git a/src/librustc_passes/hir_stats.rs b/src/librustc_passes/hir_stats.rs
@@ -316,12 +316,12 @@ impl<'v> ast_visit::Visitor<'v> for StatCollector<'v> {
 
     fn visit_trait_item(&mut self, ti: &'v ast::TraitItem) {
         self.record("TraitItem", Id::None, ti);
-        ast_visit::walk_trait_item(self, ti)
+        ast_visit::walk_assoc_item(self, ti)
     }
 
     fn visit_impl_item(&mut self, ii: &'v ast::ImplItem) {
         self.record("ImplItem", Id::None, ii);
-        ast_visit::walk_impl_item(self, ii)
+        ast_visit::walk_assoc_item(self, ii)
     }
 
     fn visit_param_bound(&mut self, bounds: &'v ast::GenericBound) {
diff --git a/src/librustc_resolve/build_reduced_graph.rs b/src/librustc_resolve/build_reduced_graph.rs
@@ -1190,15 +1190,15 @@ impl<'a, 'b> Visitor<'b> for BuildReducedGraphVisitor<'a, 'b> {
         let expansion = self.parent_scope.expansion;
         self.r.define(parent, item.ident, ns, (res, vis, item.span, expansion));
 
-        visit::walk_trait_item(self, item);
+        visit::walk_assoc_item(self, item);
     }
 
     fn visit_impl_item(&mut self, item: &'b ast::ImplItem) {
         if let ast::ImplItemKind::Macro(..) = item.kind {
             self.visit_invoc(item.id);
         } else {
             self.resolve_visibility(&item.vis);
-            visit::walk_impl_item(self, item);
+            visit::walk_assoc_item(self, item);
         }
     }
 
diff --git a/src/librustc_resolve/def_collector.rs b/src/librustc_resolve/def_collector.rs
@@ -223,7 +223,7 @@ impl<'a> visit::Visitor<'a> for DefCollector<'a> {
         };
 
         let def = self.create_def(ti.id, def_data, ti.span);
-        self.with_parent(def, |this| visit::walk_trait_item(this, ti));
+        self.with_parent(def, |this| visit::walk_assoc_item(this, ti));
     }
 
     fn visit_impl_item(&mut self, ii: &'a ImplItem) {
@@ -249,7 +249,7 @@ impl<'a> visit::Visitor<'a> for DefCollector<'a> {
         };
 
         let def = self.create_def(ii.id, def_data, ii.span);
-        self.with_parent(def, |this| visit::walk_impl_item(this, ii));
+        self.with_parent(def, |this| visit::walk_assoc_item(this, ii));
     }
 
     fn visit_pat(&mut self, pat: &'a Pat) {
diff --git a/src/librustc_resolve/late.rs b/src/librustc_resolve/late.rs
@@ -819,10 +819,10 @@ impl<'a, 'b> LateResolutionVisitor<'a, '_> {
                                                 }
                                             }
                                             TraitItemKind::Method(_, _) => {
-                                                visit::walk_trait_item(this, trait_item)
+                                                visit::walk_assoc_item(this, trait_item)
                                             }
                                             TraitItemKind::TyAlias(..) => {
-                                                visit::walk_trait_item(this, trait_item)
+                                                visit::walk_assoc_item(this, trait_item)
                                             }
                                             TraitItemKind::Macro(_) => {
                                                 panic!("unexpanded macro in resolve!")
@@ -1106,7 +1106,7 @@ impl<'a, 'b> LateResolutionVisitor<'a, '_> {
                                                 );
 
                                                 this.with_constant_rib(|this| {
-                                                    visit::walk_impl_item(this, impl_item)
+                                                    visit::walk_assoc_item(this, impl_item)
                                                 });
                                             }
                                             ImplItemKind::Method(..) => {
@@ -1117,7 +1117,7 @@ impl<'a, 'b> LateResolutionVisitor<'a, '_> {
                                                                       impl_item.span,
                                                     |n, s| MethodNotMemberOfTrait(n, s));
 
-                                                visit::walk_impl_item(this, impl_item);
+                                                visit::walk_assoc_item(this, impl_item);
                                             }
                                             ImplItemKind::TyAlias(_, Some(ref ty)) => {
                                                 // If this is a trait impl, ensure the type
diff --git a/src/libsyntax/feature_gate/check.rs b/src/libsyntax/feature_gate/check.rs
@@ -595,7 +595,7 @@ impl<'a> Visitor<'a> for PostExpansionVisitor<'a> {
             }
             _ => {}
         }
-        visit::walk_trait_item(self, ti)
+        visit::walk_assoc_item(self, ti)
     }
 
     fn visit_impl_item(&mut self, ii: &'a ast::ImplItem) {
@@ -620,7 +620,7 @@ impl<'a> Visitor<'a> for PostExpansionVisitor<'a> {
             }
             _ => {}
         }
-        visit::walk_impl_item(self, ii)
+        visit::walk_assoc_item(self, ii)
     }
 
     fn visit_vis(&mut self, vis: &'a ast::Visibility) {
diff --git a/src/libsyntax/util/node_count.rs b/src/libsyntax/util/node_count.rs
@@ -75,11 +75,11 @@ impl<'ast> Visitor<'ast> for NodeCounter {
     }
     fn visit_trait_item(&mut self, ti: &TraitItem) {
         self.count += 1;
-        walk_trait_item(self, ti)
+        walk_assoc_item(self, ti)
     }
     fn visit_impl_item(&mut self, ii: &ImplItem) {
         self.count += 1;
-        walk_impl_item(self, ii)
+        walk_assoc_item(self, ii)
     }
     fn visit_trait_ref(&mut self, t: &TraitRef) {
         self.count += 1;
diff --git a/src/libsyntax/visit.rs b/src/libsyntax/visit.rs
@@ -83,8 +83,8 @@ pub trait Visitor<'ast>: Sized {
     fn visit_fn(&mut self, fk: FnKind<'ast>, fd: &'ast FnDecl, s: Span, _: NodeId) {
         walk_fn(self, fk, fd, s)
     }
-    fn visit_trait_item(&mut self, ti: &'ast TraitItem) { walk_trait_item(self, ti) }
-    fn visit_impl_item(&mut self, ii: &'ast ImplItem) { walk_impl_item(self, ii) }
+    fn visit_trait_item(&mut self, i: &'ast AssocItem) { walk_assoc_item(self, i) }
+    fn visit_impl_item(&mut self, i: &'ast AssocItem) { walk_assoc_item(self, i) }
     fn visit_trait_ref(&mut self, t: &'ast TraitRef) { walk_trait_ref(self, t) }
     fn visit_param_bound(&mut self, bounds: &'ast GenericBound) {
         walk_param_bound(self, bounds)
@@ -581,57 +581,29 @@ pub fn walk_fn<'a, V>(visitor: &mut V, kind: FnKind<'a>, declaration: &'a FnDecl
     }
 }
 
-pub fn walk_trait_item<'a, V: Visitor<'a>>(visitor: &mut V, trait_item: &'a TraitItem) {
-    visitor.visit_vis(&trait_item.vis);
-    visitor.visit_ident(trait_item.ident);
-    walk_list!(visitor, visit_attribute, &trait_item.attrs);
-    visitor.visit_generics(&trait_item.generics);
-    match trait_item.kind {
-        TraitItemKind::Const(ref ty, ref default) => {
-            visitor.visit_ty(ty);
-            walk_list!(visitor, visit_expr, default);
-        }
-        TraitItemKind::Method(ref sig, None) => {
-            visitor.visit_fn_header(&sig.header);
-            walk_fn_decl(visitor, &sig.decl);
-        }
-        TraitItemKind::Method(ref sig, Some(ref body)) => {
-            visitor.visit_fn(FnKind::Method(trait_item.ident, sig, &trait_item.vis, body),
-                             &sig.decl, trait_item.span, trait_item.id);
-        }
-        TraitItemKind::TyAlias(ref bounds, ref default) => {
-            walk_list!(visitor, visit_param_bound, bounds);
-            walk_list!(visitor, visit_ty, default);
-        }
-        TraitItemKind::Macro(ref mac) => {
-            visitor.visit_mac(mac);
-        }
-    }
-}
-
-pub fn walk_impl_item<'a, V: Visitor<'a>>(visitor: &mut V, impl_item: &'a ImplItem) {
-    visitor.visit_vis(&impl_item.vis);
-    visitor.visit_ident(impl_item.ident);
-    walk_list!(visitor, visit_attribute, &impl_item.attrs);
-    visitor.visit_generics(&impl_item.generics);
-    match impl_item.kind {
-        ImplItemKind::Const(ref ty, ref expr) => {
+pub fn walk_assoc_item<'a, V: Visitor<'a>>(visitor: &mut V, item: &'a AssocItem) {
+    visitor.visit_vis(&item.vis);
+    visitor.visit_ident(item.ident);
+    walk_list!(visitor, visit_attribute, &item.attrs);
+    visitor.visit_generics(&item.generics);
+    match item.kind {
+        AssocItemKind::Const(ref ty, ref expr) => {
             visitor.visit_ty(ty);
             walk_list!(visitor, visit_expr, expr);
         }
-        ImplItemKind::Method(ref sig, None) => {
+        AssocItemKind::Method(ref sig, None) => {
             visitor.visit_fn_header(&sig.header);
             walk_fn_decl(visitor, &sig.decl);
         }
-        ImplItemKind::Method(ref sig, Some(ref body)) => {
-            visitor.visit_fn(FnKind::Method(impl_item.ident, sig, &impl_item.vis, body),
-                             &sig.decl, impl_item.span, impl_item.id);
+        AssocItemKind::Method(ref sig, Some(ref body)) => {
+            visitor.visit_fn(FnKind::Method(item.ident, sig, &item.vis, body),
+                             &sig.decl, item.span, item.id);
         }
-        ImplItemKind::TyAlias(ref bounds, ref ty) => {
+        AssocItemKind::TyAlias(ref bounds, ref ty) => {
             walk_list!(visitor, visit_param_bound, bounds);
             walk_list!(visitor, visit_ty, ty);
         }
-        ImplItemKind::Macro(ref mac) => {
+        AssocItemKind::Macro(ref mac) => {
             visitor.visit_mac(mac);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -484,19 +484,19 @@ impl<'a> LoweringContext<'a> {`
`484`	`484`	`TraitItemKind::Method(_, None) => {`
`485`	`485`	`// Ignore patterns in trait methods without bodies`
`486`	`486`	`self.with_hir_id_owner(None, \|this\| {`
`487`		`- visit::walk_trait_item(this, item)`
	`487`	`+ visit::walk_assoc_item(this, item)`
`488`	`488`	`});`
`489`	`489`	`}`
`490`	`490`	`_ => self.with_hir_id_owner(Some(item.id), \|this\| {`
`491`		`- visit::walk_trait_item(this, item);`
	`491`	`+ visit::walk_assoc_item(this, item);`
`492`	`492`	`})`
`493`	`493`	`}`
`494`	`494`	`}`
`495`	`495`
`496`	`496`	`fn visit_impl_item(&mut self, item: &'tcx ImplItem) {`
`497`	`497`	`self.lctx.allocate_hir_id_counter(item.id);`
`498`	`498`	`self.with_hir_id_owner(Some(item.id), \|this\| {`
`499`		`- visit::walk_impl_item(this, item);`
	`499`	`+ visit::walk_assoc_item(this, item);`
`500`	`500`	`});`
`501`	`501`	`}`
`502`	`502`
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_trait_item(self, item);`
	`97`	`+ visit::walk_assoc_item(self, item);`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`fn visit_impl_item(&mut self, item: &'tcx ImplItem) {`
`@@ -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_impl_item(self, item);`
	`107`	`+ visit::walk_assoc_item(self, item);`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`
Original file line number	Diff line number	Diff line change
`@@ -772,28 +772,28 @@ impl<'a> Visitor<'a> for AstValidator<'a> {`
`772`	`772`	`\|this\| visit::walk_enum_def(this, enum_definition, generics, item_id))`
`773`	`773`	`}`
`774`	`774`
`775`		`- fn visit_impl_item(&mut self, ii: &'a ImplItem) {`
	`775`	`+ fn visit_impl_item(&mut self, ii: &'a AssocItem) {`
`776`	`776`	`match &ii.kind {`
`777`		`- ImplItemKind::Const(_, body) => {`
	`777`	`+ AssocItemKind::Const(_, body) => {`
`778`	`778`	`self.check_impl_item_provided(ii.span, body, "constant", " = <expr>;");`
`779`	`779`	`}`
`780`		`- ImplItemKind::Method(sig, body) => {`
	`780`	`+ AssocItemKind::Method(sig, body) => {`
`781`	`781`	`self.check_impl_item_provided(ii.span, body, "function", " { <body> }");`
`782`	`782`	`self.check_fn_decl(&sig.decl);`
`783`	`783`	`}`
`784`		`- ImplItemKind::TyAlias(bounds, body) => {`
	`784`	`+ AssocItemKind::TyAlias(bounds, body) => {`
`785`	`785`	`self.check_impl_item_provided(ii.span, body, "type", " = <type>;");`
`786`	`786`	`self.check_impl_assoc_type_no_bounds(bounds);`
`787`	`787`	`}`
`788`	`788`	`_ => {}`
`789`	`789`	`}`
`790`		`- visit::walk_impl_item(self, ii);`
	`790`	`+ visit::walk_assoc_item(self, ii);`
`791`	`791`	`}`
`792`	`792`
`793`		`- fn visit_trait_item(&mut self, ti: &'a TraitItem) {`
	`793`	`+ fn visit_trait_item(&mut self, ti: &'a AssocItem) {`
`794`	`794`	`self.invalid_visibility(&ti.vis, None);`
`795`	`795`	`self.check_defaultness(ti.span, ti.defaultness);`
`796`		`- visit::walk_trait_item(self, ti);`
	`796`	`+ visit::walk_assoc_item(self, ti);`
`797`	`797`	`}`
`798`	`798`	`}`
`799`	`799`
Original file line number	Diff line number	Diff line change
`@@ -316,12 +316,12 @@ impl<'v> ast_visit::Visitor<'v> for StatCollector<'v> {`
`316`	`316`
`317`	`317`	`fn visit_trait_item(&mut self, ti: &'v ast::TraitItem) {`
`318`	`318`	`self.record("TraitItem", Id::None, ti);`
`319`		`- ast_visit::walk_trait_item(self, ti)`
	`319`	`+ ast_visit::walk_assoc_item(self, ti)`
`320`	`320`	`}`
`321`	`321`
`322`	`322`	`fn visit_impl_item(&mut self, ii: &'v ast::ImplItem) {`
`323`	`323`	`self.record("ImplItem", Id::None, ii);`
`324`		`- ast_visit::walk_impl_item(self, ii)`
	`324`	`+ ast_visit::walk_assoc_item(self, ii)`
`325`	`325`	`}`
`326`	`326`
`327`	`327`	`fn visit_param_bound(&mut self, bounds: &'v ast::GenericBound) {`
Original file line number	Diff line number	Diff line change
`@@ -1190,15 +1190,15 @@ impl<'a, 'b> Visitor<'b> for BuildReducedGraphVisitor<'a, 'b> {`
`1190`	`1190`	`let expansion = self.parent_scope.expansion;`
`1191`	`1191`	`self.r.define(parent, item.ident, ns, (res, vis, item.span, expansion));`
`1192`	`1192`
`1193`		`- visit::walk_trait_item(self, item);`
	`1193`	`+ visit::walk_assoc_item(self, item);`
`1194`	`1194`	`}`
`1195`	`1195`
`1196`	`1196`	`fn visit_impl_item(&mut self, item: &'b ast::ImplItem) {`
`1197`	`1197`	`if let ast::ImplItemKind::Macro(..) = item.kind {`
`1198`	`1198`	`self.visit_invoc(item.id);`
`1199`	`1199`	`} else {`
`1200`	`1200`	`self.resolve_visibility(&item.vis);`
`1201`		`- visit::walk_impl_item(self, item);`
	`1201`	`+ visit::walk_assoc_item(self, item);`
`1202`	`1202`	`}`
`1203`	`1203`	`}`
`1204`	`1204`
Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ impl<'a> visit::Visitor<'a> for DefCollector<'a> {`
`223`	`223`	`};`
`224`	`224`
`225`	`225`	`let def = self.create_def(ti.id, def_data, ti.span);`
`226`		`- self.with_parent(def, \|this\| visit::walk_trait_item(this, ti));`
	`226`	`+ self.with_parent(def, \|this\| visit::walk_assoc_item(this, ti));`
`227`	`227`	`}`
`228`	`228`
`229`	`229`	`fn visit_impl_item(&mut self, ii: &'a ImplItem) {`
`@@ -249,7 +249,7 @@ impl<'a> visit::Visitor<'a> for DefCollector<'a> {`
`249`	`249`	`};`
`250`	`250`
`251`	`251`	`let def = self.create_def(ii.id, def_data, ii.span);`
`252`		`- self.with_parent(def, \|this\| visit::walk_impl_item(this, ii));`
	`252`	`+ self.with_parent(def, \|this\| visit::walk_assoc_item(this, ii));`
`253`	`253`	`}`
`254`	`254`
`255`	`255`	`fn visit_pat(&mut self, pat: &'a Pat) {`
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`	`TraitItemKind::Method(_, _) => {`
`822`		`- visit::walk_trait_item(this, trait_item)`
	`822`	`+ visit::walk_assoc_item(this, trait_item)`
`823`	`823`	`}`
`824`	`824`	`TraitItemKind::TyAlias(..) => {`
`825`		`- visit::walk_trait_item(this, trait_item)`
	`825`	`+ visit::walk_assoc_item(this, trait_item)`
`826`	`826`	`}`
`827`	`827`	`TraitItemKind::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_impl_item(this, impl_item)`
	`1109`	`+ visit::walk_assoc_item(this, impl_item)`
`1110`	`1110`	`});`
`1111`	`1111`	`}`
`1112`	`1112`	`ImplItemKind::Method(..) => {`
`@@ -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_impl_item(this, impl_item);`
	`1120`	`+ visit::walk_assoc_item(this, impl_item);`
`1121`	`1121`	`}`
`1122`	`1122`	`ImplItemKind::TyAlias(_, Some(ref ty)) => {`
`1123`	`1123`	`// If this is a trait impl, ensure the type`
Original file line number	Diff line number	Diff line change
`@@ -595,7 +595,7 @@ impl<'a> Visitor<'a> for PostExpansionVisitor<'a> {`
`595`	`595`	`}`
`596`	`596`	`_ => {}`
`597`	`597`	`}`
`598`		`- visit::walk_trait_item(self, ti)`
	`598`	`+ visit::walk_assoc_item(self, ti)`
`599`	`599`	`}`
`600`	`600`
`601`	`601`	`fn visit_impl_item(&mut self, ii: &'a ast::ImplItem) {`
`@@ -620,7 +620,7 @@ impl<'a> Visitor<'a> for PostExpansionVisitor<'a> {`
`620`	`620`	`}`
`621`	`621`	`_ => {}`
`622`	`622`	`}`
`623`		`- visit::walk_impl_item(self, ii)`
	`623`	`+ visit::walk_assoc_item(self, ii)`
`624`	`624`	`}`
`625`	`625`
`626`	`626`	`fn visit_vis(&mut self, vis: &'a ast::Visibility) {`
Original file line number	Diff line number	Diff line change
`@@ -75,11 +75,11 @@ impl<'ast> Visitor<'ast> for NodeCounter {`
`75`	`75`	`}`
`76`	`76`	`fn visit_trait_item(&mut self, ti: &TraitItem) {`
`77`	`77`	`self.count += 1;`
`78`		`- walk_trait_item(self, ti)`
	`78`	`+ walk_assoc_item(self, ti)`
`79`	`79`	`}`
`80`	`80`	`fn visit_impl_item(&mut self, ii: &ImplItem) {`
`81`	`81`	`self.count += 1;`
`82`		`- walk_impl_item(self, ii)`
	`82`	`+ walk_assoc_item(self, ii)`
`83`	`83`	`}`
`84`	`84`	`fn visit_trait_ref(&mut self, t: &TraitRef) {`
`85`	`85`	`self.count += 1;`