Make def_collector a MutVisitor.

Author: cjgillot

compiler/rustc_ast/src/visit.rs

@@ -527,7 +527,7 @@ macro_rules! common_visitor_and_walkers {
             }
         }
 
-        fn visit_defaultness<$($lt,)? V: $Visitor$(<$lt>)?>(vis: &mut V, defaultness: &$($lt)? $($mut)? Defaultness) -> V::Result {
+        pub fn visit_defaultness<$($lt,)? V: $Visitor$(<$lt>)?>(vis: &mut V, defaultness: &$($lt)? $($mut)? Defaultness) -> V::Result {
             match defaultness {
                 Defaultness::Default(span) => visit_span(vis, span),
                 Defaultness::Final => {
@@ -808,7 +808,7 @@ macro_rules! common_visitor_and_walkers {
             visit_foreign_items(vis, items)
         }
 
-        fn walk_define_opaques<$($lt,)? V: $Visitor$(<$lt>)?>(
+        pub fn walk_define_opaques<$($lt,)? V: $Visitor$(<$lt>)?>(
             visitor: &mut V,
             define_opaque: &$($lt)? $($mut)? Option<ThinVec<(NodeId, Path)>>,
         ) -> V::Result {
@@ -1226,6 +1226,27 @@ macro_rules! common_visitor_and_walkers {
             V::Result::output()
         }
 
+        pub fn walk_stmt<$($lt,)? V: $Visitor$(<$lt>)?>(
+            vis: &mut V,
+            statement: &$($lt)? $($mut)? Stmt,
+        ) -> V::Result {
+            let Stmt { id, kind, span } = statement;
+            try_visit!(visit_id(vis, id));
+            match kind {
+                StmtKind::Let(local) => try_visit!(vis.visit_local(local)),
+                StmtKind::Item(item) => try_visit!(vis.visit_item(item)),
+                StmtKind::Expr(expr) | StmtKind::Semi(expr) => try_visit!(vis.visit_expr(expr)),
+                StmtKind::Empty => {}
+                StmtKind::MacCall(mac) => {
+                    let MacCallStmt { mac, attrs, style: _, tokens: _ } = &$($mut)? **mac;
+                    walk_list!(vis, visit_attribute, attrs);
+                    try_visit!(vis.visit_mac_call(mac));
+                }
+            }
+            try_visit!(visit_span(vis, span));
+            V::Result::output()
+        }
+
         pub fn walk_path<$($lt,)? V: $Visitor$(<$lt>)?>(
             vis: &mut V,
             path: &$($lt)? $($mut)? Path,
@@ -1945,20 +1966,3 @@ fn visit_nested_use_tree<'a, V: Visitor<'a>>(
 ) -> V::Result {
     vis.visit_nested_use_tree(nested_tree, nested_id)
 }
-
-pub fn walk_stmt<'a, V: Visitor<'a>>(visitor: &mut V, statement: &'a Stmt) -> V::Result {
-    let Stmt { id, kind, span: _ } = statement;
-    try_visit!(visit_id(visitor, id));
-    match kind {
-        StmtKind::Let(local) => try_visit!(visitor.visit_local(local)),
-        StmtKind::Item(item) => try_visit!(visitor.visit_item(item)),
-        StmtKind::Expr(expr) | StmtKind::Semi(expr) => try_visit!(visitor.visit_expr(expr)),
-        StmtKind::Empty => {}
-        StmtKind::MacCall(mac) => {
-            let MacCallStmt { mac, attrs, style: _, tokens: _ } = &**mac;
-            walk_list!(visitor, visit_attribute, attrs);
-            try_visit!(visitor.visit_mac_call(mac));
-        }
-    }
-    V::Result::output()
-}

compiler/rustc_expand/src/base.rs

@@ -1066,7 +1066,7 @@ pub trait ResolverExpand {
     fn visit_ast_fragment_with_placeholders(
         &mut self,
         expn_id: LocalExpnId,
-        fragment: &AstFragment,
+        fragment: &mut AstFragment,
     );
     fn register_builtin_macro(&mut self, name: Symbol, ext: SyntaxExtensionKind);
 

compiler/rustc_expand/src/expand.rs

@@ -137,7 +137,7 @@ macro_rules! ast_fragments {
                 T::fragment_to_output(self)
             }
 
-            pub(crate) fn mut_visit_with(&mut self, vis: &mut impl MutVisitor) {
+            pub fn mut_visit_with(&mut self, vis: &mut impl MutVisitor) {
                 match self {
                     AstFragment::OptExpr(opt_expr) => {
                         if let Some(expr) = opt_expr.take() {
@@ -664,7 +664,7 @@ impl<'a, 'b> MacroExpander<'a, 'b> {
         if self.monotonic {
             self.cx
                 .resolver
-                .visit_ast_fragment_with_placeholders(self.cx.current_expansion.id, &fragment);
+                .visit_ast_fragment_with_placeholders(self.cx.current_expansion.id, &mut fragment);
 
             if self.cx.sess.opts.incremental.is_some() {
                 for (invoc, _) in invocations.iter_mut() {

compiler/rustc_resolve/src/build_reduced_graph.rs

@@ -179,7 +179,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
 
     pub(crate) fn build_reduced_graph(
         &mut self,
-        fragment: &AstFragment,
+        fragment: &mut AstFragment,
         parent_scope: ParentScope<'ra>,
     ) -> MacroRulesScopeRef<'ra> {
         collect_definitions(self, fragment, parent_scope.expansion);