Remove P<> from visit_method_receiver_expr

Author: maxcabrajac

compiler/rustc_ast/src/mut_visit.rs

@@ -162,7 +162,7 @@ pub trait MutVisitor: Sized {
 
     /// This method is a hack to workaround unstable of `stmt_expr_attributes`.
     /// It can be removed once that feature is stabilized.
-    fn visit_method_receiver_expr(&mut self, ex: &mut P<Expr>) {
+    fn visit_method_receiver_expr(&mut self, ex: &mut Expr) {
         self.visit_expr(ex)
     }
 

compiler/rustc_builtin_macros/src/cfg_eval.rs

@@ -215,7 +215,7 @@ impl MutVisitor for CfgEval<'_> {
     }
 
     #[instrument(level = "trace", skip(self))]
-    fn visit_method_receiver_expr(&mut self, expr: &mut P<ast::Expr>) {
+    fn visit_method_receiver_expr(&mut self, expr: &mut ast::Expr) {
         self.0.configure_expr(expr, true);
         mut_visit::walk_expr(self, expr);
     }

compiler/rustc_expand/src/expand.rs

@@ -2184,11 +2184,11 @@ impl<'a, 'b> MutVisitor for InvocationCollector<'a, 'b> {
         self.visit_node(node)
     }
 
-    fn visit_method_receiver_expr(&mut self, node: &mut P<ast::Expr>) {
+    fn visit_method_receiver_expr(&mut self, node: &mut ast::Expr) {
         visit_clobber(node, |node| {
-            let mut wrapper = AstNodeWrapper::new(node, MethodReceiverTag);
+            let mut wrapper = AstNodeWrapper::new(P(node), MethodReceiverTag);
             self.visit_node(&mut wrapper);
-            wrapper.wrapped
+            wrapper.wrapped.into_inner()
         })
     }
 

compiler/rustc_expand/src/placeholders.rs

@@ -307,9 +307,11 @@ impl MutVisitor for PlaceholderExpander {
         }
     }
 
-    fn visit_method_receiver_expr(&mut self, expr: &mut P<ast::Expr>) {
+    fn visit_method_receiver_expr(&mut self, expr: &mut ast::Expr) {
         match expr.kind {
-            ast::ExprKind::MacCall(_) => *expr = self.remove(expr.id).make_method_receiver_expr(),
+            ast::ExprKind::MacCall(_) => {
+                *expr = self.remove(expr.id).make_method_receiver_expr().into_inner()
+            }
             _ => walk_expr(self, expr),
         }
     }