Add AssocCtxt

Author: maxcabrajac

compiler/rustc_ast/src/mut_visit.rs

@@ -37,7 +37,7 @@ impl<A: Array> ExpectOne<A> for SmallVec<A> {
 }
 
 pub trait WalkItemKind {
-    fn walk(&mut self, span: Span, id: NodeId, ident: &mut Ident, visibility: &mut Visibility, visitor: &mut impl MutVisitor);
+    fn walk(&mut self, span: Span, id: NodeId, ident: &mut Ident, visibility: &mut Visibility, ctxt: AssocCtxt, visitor: &mut impl MutVisitor);
 }
 
 pub trait MutVisitor: Sized {
@@ -114,9 +114,9 @@ pub trait MutVisitor: Sized {
     fn flat_map_assoc_item(
         &mut self,
         i: P<AssocItem>,
-        _ctxt: AssocCtxt,
+        ctxt: AssocCtxt,
     ) -> SmallVec<[P<AssocItem>; 1]> {
-        walk_flat_map_item(self, i)
+        walk_flat_map_assoc_item(self, i, ctxt)
     }
 
     fn visit_fn_decl(&mut self, d: &mut P<FnDecl>) {
@@ -1086,13 +1086,14 @@ pub fn walk_item_kind(
     id: NodeId,
     ident: &mut Ident,
     visibility: &mut Visibility,
+    ctxt: AssocCtxt,
     vis: &mut impl MutVisitor,
 ) {
-    kind.walk(span, id, ident, visibility, vis)
+    kind.walk(span, id, ident, visibility, ctxt, vis)
 }
 
 impl WalkItemKind for ItemKind {
-    fn walk(&mut self, span: Span, id: NodeId, ident: &mut Ident, visibility: &mut Visibility, vis: &mut impl MutVisitor) {
+    fn walk(&mut self, span: Span, id: NodeId, ident: &mut Ident, visibility: &mut Visibility, _ctxt: AssocCtxt, vis: &mut impl MutVisitor) {
         match self {
             ItemKind::ExternCrate(_orig_name) => {}
             ItemKind::Use(use_tree) => vis.visit_use_tree(use_tree),
@@ -1204,15 +1205,15 @@ impl WalkItemKind for ItemKind {
 }
 
 impl WalkItemKind for AssocItemKind {
-    fn walk(&mut self, span: Span, id: NodeId, ident: &mut Ident, visibility: &mut Visibility, visitor: &mut impl MutVisitor) {
+    fn walk(&mut self, span: Span, id: NodeId, ident: &mut Ident, visibility: &mut Visibility, ctxt: AssocCtxt, visitor: &mut impl MutVisitor) {
         match self {
             AssocItemKind::Const(item) => {
                 visit_const_item(item, visitor);
             }
             AssocItemKind::Fn(box Fn { defaultness, generics, sig, body }) => {
                 visit_defaultness(visitor, defaultness);
                 // TODO: use AssocCtxt
-                visitor.visit_fn(FnKind::Fn(FnCtxt::Free, ident, sig, visibility, generics, body), span, id);
+                visitor.visit_fn(FnKind::Fn(FnCtxt::Assoc(ctxt), ident, sig, visibility, generics, body), span, id);
             }
             AssocItemKind::Type(box TyAlias {
                 defaultness,
@@ -1292,24 +1293,31 @@ pub fn walk_crate<T: MutVisitor>(vis: &mut T, krate: &mut Crate) {
     vis.visit_span(inject_use_span);
 }
 
-/// Mutates one item, returning the item again.
 pub fn walk_flat_map_item<K: WalkItemKind>(
+    visitor: &mut impl MutVisitor,
+    item: P<Item<K>>,
+) -> SmallVec<[P<Item<K>>; 1]> {
+    walk_flat_map_assoc_item(visitor, item, AssocCtxt::Trait /* ignored */)
+}
+
+pub fn walk_flat_map_assoc_item<K: WalkItemKind>(
     visitor: &mut impl MutVisitor,
     mut item: P<Item<K>>,
+    ctxt: AssocCtxt,
 ) -> SmallVec<[P<Item<K>>; 1]> {
     let Item { ident, attrs, id, kind, vis, span, tokens } = item.deref_mut();
     visitor.visit_id(id);
     visit_attrs(visitor, attrs);
     visitor.visit_vis(vis);
     visitor.visit_ident(ident);
-    kind.walk(*span, *id, ident, vis, visitor);
+    kind.walk(*span, *id, ident, vis, ctxt, visitor);
     visit_lazy_tts(visitor, tokens);
     visitor.visit_span(span);
     smallvec![item]
 }
 
 impl WalkItemKind for ForeignItemKind {
-    fn walk(&mut self, span: Span, id: NodeId, ident: &mut Ident, visibility: &mut Visibility, visitor: &mut impl MutVisitor) {
+    fn walk(&mut self, span: Span, id: NodeId, ident: &mut Ident, visibility: &mut Visibility, _ctxt: AssocCtxt, visitor: &mut impl MutVisitor) {
         match self {
             ForeignItemKind::Static(box StaticItem { ty, mutability: _, expr, safety: _ }) => {
                 visitor.visit_ty(ty);

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::{Visitor, walk_item};
+use rustc_ast::visit::{walk_item, AssocCtxt, Visitor};
 use rustc_ast::{ModKind, attr};
 use rustc_errors::DiagCtxtHandle;
 use rustc_expand::base::{ExtCtxt, ResolverExpand};
@@ -144,7 +144,7 @@ impl<'a> MutVisitor for TestHarnessGenerator<'a> {
             item.kind
         {
             let prev_tests = mem::take(&mut self.tests);
-            walk_item_kind(&mut item.kind, item.span, item.id, &mut item.ident, &mut item.vis, self);
+            walk_item_kind(&mut item.kind, item.span, item.id, &mut item.ident, &mut item.vis, AssocCtxt::Trait /* ignored */, self);
             self.add_test_cases(item.id, span, prev_tests);
         } else {
             // But in those cases, we emit a lint to warn the user of these missing tests.