Add WalkItemKind::Ctxt so AssocCtxt is not sent to non-Assoc ItemKinds

Author: maxcabrajac

compiler/rustc_ast/src/mut_visit.rs

@@ -37,13 +37,14 @@ impl<A: Array> ExpectOne<A> for SmallVec<A> {
 }
 
 pubtraitWalkItemKind{
+typeCtxt;
 fnwalk(
 &mutself,
 span:Span,
 id:NodeId,
 ident:&mutIdent,
 visibility:&mutVisibility,
-ctxt:AssocCtxt,
+ctxt:Self::Ctxt,
 visitor:&mutimplMutVisitor,
 );
 }
@@ -1088,26 +1089,27 @@ pub fn walk_block<T: MutVisitor>(vis: &mut T, block: &mut P<Block>) {
  vis.visit_span(span);
 }
 
-pubfnwalk_item_kind(
-kind:&mutimplWalkItemKind,
+pubfnwalk_item_kind<K:WalkItemKind>(
+kind:&mutK,
 span:Span,
 id:NodeId,
 ident:&mutIdent,
 visibility:&mutVisibility,
-ctxt:AssocCtxt,
+ctxt:K::Ctxt,
 vis:&mutimplMutVisitor,
 ){
  kind.walk(span, id, ident, visibility, ctxt, vis)
 }
 
 implWalkItemKindforItemKind{
+typeCtxt = ();
 fnwalk(
 &mutself,
 span:Span,
 id:NodeId,
 ident:&mutIdent,
 visibility:&mutVisibility,
-_ctxt:AssocCtxt,
+_ctxt:Self::Ctxt,
 vis:&mutimplMutVisitor,
 ){
 matchself{
@@ -1225,13 +1227,14 @@ impl WalkItemKind for ItemKind {
 }
 
 implWalkItemKindforAssocItemKind{
+typeCtxt = AssocCtxt;
 fnwalk(
 &mutself,
 span:Span,
 id:NodeId,
 ident:&mutIdent,
 visibility:&mutVisibility,
-ctxt:AssocCtxt,
+ctxt:Self::Ctxt,
 visitor:&mutimplMutVisitor,
 ){
 matchself{
@@ -1324,17 +1327,17 @@ pub fn walk_crate<T: MutVisitor>(vis: &mut T, krate: &mut Crate) {
  vis.visit_span(inject_use_span);
 }
 
-pubfnwalk_flat_map_item<K:WalkItemKind>(
+pubfnwalk_flat_map_item<K:WalkItemKind<Ctxt = ()>>(
 visitor:&mutimplMutVisitor,
 item:P<Item<K>>,
 ) -> SmallVec<[P<Item<K>>;1]>{
-walk_flat_map_assoc_item(visitor, item,AssocCtxt::Trait/* ignored */)
+walk_flat_map_assoc_item(visitor, item,())
 }
 
 pubfnwalk_flat_map_assoc_item<K:WalkItemKind>(
 visitor:&mutimplMutVisitor,
 mutitem:P<Item<K>>,
-ctxt:AssocCtxt,
+ctxt:K::Ctxt,
 ) -> SmallVec<[P<Item<K>>;1]>{
 letItem{ ident, attrs, id, kind, vis, span, tokens } = item.deref_mut();
  visitor.visit_id(id);
@@ -1348,13 +1351,14 @@ pub fn walk_flat_map_assoc_item<K: WalkItemKind>(
 }
 
 implWalkItemKindforForeignItemKind{
+typeCtxt = ();
 fnwalk(
 &mutself,
 span:Span,
 id:NodeId,
 ident:&mutIdent,
 visibility:&mutVisibility,
-_ctxt:AssocCtxt,
+_ctxt:Self::Ctxt,
 visitor:&mutimplMutVisitor,
 ){
 matchself{

compiler/rustc_ast/src/visit.rs

@@ -113,10 +113,11 @@ pub enum LifetimeCtxt {
 }
 
 pubtraitWalkItemKind:Sized{
+typeCtxt;
 fnwalk<'a,V:Visitor<'a>>(
 &'aself,
 item:&'aItem<Self>,
-ctxt:AssocCtxt,
+ctxt:Self::Ctxt,
 visitor:&mutV,
 ) -> V::Result;
 }
@@ -337,10 +338,11 @@ pub fn walk_trait_ref<'a, V: Visitor<'a>>(visitor: &mut V, trait_ref: &'a TraitR
 }
 
 implWalkItemKindforItemKind{
+typeCtxt = ();
 fnwalk<'a,V:Visitor<'a>>(
 &'aself,
 item:&'aItem<Self>,
-_ctxt:AssocCtxt,
+_ctxt:Self::Ctxt,
 visitor:&mutV,
 ) -> V::Result{
 letItem{ id, span, vis, ident, .. } = item;
@@ -449,9 +451,9 @@ impl WalkItemKind for ItemKind {
 
 pubfnwalk_item<'a,V:Visitor<'a>>(
 visitor:&mutV,
-item:&'aItem<implWalkItemKind>,
+item:&'aItem<implWalkItemKind<Ctxt = ()>>,
 ) -> V::Result{
-walk_assoc_item(visitor, item,AssocCtxt::Trait/*ignored*/)
+walk_assoc_item(visitor, item,())
 }
 
 pubfnwalk_enum_def<'a,V:Visitor<'a>>(
@@ -681,10 +683,11 @@ pub fn walk_pat<'a, V: Visitor<'a>>(visitor: &mut V, pattern: &'a Pat) -> V::Res
 }
 
 implWalkItemKindforForeignItemKind{
+typeCtxt = ();
 fnwalk<'a,V:Visitor<'a>>(
 &'aself,
 item:&'aItem<Self>,
-_ctxt:AssocCtxt,
+_ctxt:Self::Ctxt,
 visitor:&mutV,
 ) -> V::Result{
 letItem{ id, span, ident, vis, .. } = item;
@@ -844,10 +847,11 @@ pub fn walk_fn<'a, V: Visitor<'a>>(visitor: &mut V, kind: FnKind<'a>) -> V::Resu
 }
 
 implWalkItemKindforAssocItemKind{
+typeCtxt = AssocCtxt;
 fnwalk<'a,V:Visitor<'a>>(
 &'aself,
 item:&'aItem<Self>,
-ctxt:AssocCtxt,
+ctxt:Self::Ctxt,
 visitor:&mutV,
 ) -> V::Result{
 letItem{ id, span, ident, vis, .. } = item;
@@ -906,10 +910,10 @@ impl WalkItemKind for AssocItemKind {
 }
 }
 
-pubfnwalk_assoc_item<'a,V:Visitor<'a>>(
+pubfnwalk_assoc_item<'a,V:Visitor<'a>,K:WalkItemKind>(
 visitor:&mutV,
-item:&'aItem<implWalkItemKind>,
-ctxt:AssocCtxt,
+item:&'aItem<K>,
+ctxt:K::Ctxt,
 ) -> V::Result{
 letItem{id: _,span: _, ident, vis, attrs, kind,tokens: _ } = item;
 walk_list!(visitor, visit_attribute, attrs);

compiler/rustc_builtin_macros/src/cfg_eval.rs

@@ -247,10 +247,10 @@ impl MutVisitor for CfgEval<'_> {
 fnflat_map_assoc_item(
 &mutself,
 item:P<ast::AssocItem>,
-_ctxt:AssocCtxt,
+ctxt:AssocCtxt,
 ) -> SmallVec<[P<ast::AssocItem>;1]>{
 let item = configure!(self, item);
- mut_visit::walk_flat_map_item(self, item)
+ mut_visit::walk_flat_map_assoc_item(self, item, ctxt)
 }
 
 fnflat_map_foreign_item(

compiler/rustc_builtin_macros/src/test_harness.rs

@@ -6,7 +6,7 @@ use rustc_ast as ast;
 use rustc_ast::entry::EntryPointType;
 use rustc_ast::mut_visit::*;
 use rustc_ast::ptr::P;
-use rustc_ast::visit::{AssocCtxt,Visitor, walk_item};
+use rustc_ast::visit::{Visitor, walk_item};
 use rustc_ast::{ModKind, attr};
 use rustc_errors::DiagCtxtHandle;
 use rustc_expand::base::{ExtCtxt,ResolverExpand};
@@ -150,7 +150,7 @@ impl<'a> MutVisitor for TestHarnessGenerator<'a> {
  item.id,
 &mut item.ident,
 &mut item.vis,
-AssocCtxt::Trait,/* ignored */
+(),
 self,
 );
 self.add_test_cases(item.id, span, prev_tests);

compiler/rustc_expand/src/expand.rs

@@ -1303,7 +1303,7 @@ impl InvocationCollectorNode for AstNodeWrapper<P<ast::AssocItem>, TraitItemTag>
  fragment.make_trait_items()
 }
 fnwalk_flat_map<V:MutVisitor>(self,visitor:&mutV) -> Self::OutputTy{
-walk_flat_map_item(visitor,self.wrapped)
+walk_flat_map_assoc_item(visitor,self.wrapped,AssocCtxt::Trait)
 }
 fnis_mac_call(&self) -> bool{
 matches!(self.wrapped.kind,AssocItemKind::MacCall(..))
@@ -1344,7 +1344,7 @@ impl InvocationCollectorNode for AstNodeWrapper<P<ast::AssocItem>, ImplItemTag>
  fragment.make_impl_items()
 }
 fnwalk_flat_map<V:MutVisitor>(self,visitor:&mutV) -> Self::OutputTy{
-walk_flat_map_item(visitor,self.wrapped)
+walk_flat_map_assoc_item(visitor,self.wrapped,AssocCtxt::Impl)
 }
 fnis_mac_call(&self) -> bool{
 matches!(self.wrapped.kind,AssocItemKind::MacCall(..))

compiler/rustc_expand/src/placeholders.rs

@@ -286,7 +286,7 @@ impl MutVisitor for PlaceholderExpander {
 AssocCtxt::Impl => it.make_impl_items(),
 }
 }
- _ => walk_flat_map_item(self, item),
+ _ => walk_flat_map_assoc_item(self, item, ctxt),
 }
 }
 

compiler/rustc_resolve/src/build_reduced_graph.rs

@@ -1324,7 +1324,7 @@ impl<'a, 'ra, 'tcx> Visitor<'a> for BuildReducedGraphVisitor<'a, 'ra, 'tcx> {
 // This way they can use `macro_rules` defined later.
 self.visit_vis(&item.vis);
 self.visit_ident(&item.ident);
- item.kind.walk(item,AssocCtxt::Trait,self);
+ item.kind.walk(item,(),self);
  visit::walk_list!(self, visit_attribute,&item.attrs);
 }
  _ => visit::walk_item(self, item),