From a2eca35c15a1d594dea89543baa38499249f50ee Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Mon, 2 Dec 2024 18:36:29 -0800 Subject: [PATCH] Visit BinOp span in MutVisitor::visit_expr --- compiler/rustc_ast/src/mut_visit.rs | 3 ++- tests/ui-fulldeps/pprust-parenthesis-insertion.rs | 7 ------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/compiler/rustc_ast/src/mut_visit.rs b/compiler/rustc_ast/src/mut_visit.rs index 0aceed45028..1e02dc8fb24 100644 --- a/compiler/rustc_ast/src/mut_visit.rs +++ b/compiler/rustc_ast/src/mut_visit.rs @@ -1628,9 +1628,10 @@ pub fn walk_expr(vis: &mut T, Expr { kind, id, span, attrs, token visit_thin_exprs(vis, call_args); vis.visit_span(span); } - ExprKind::Binary(_binop, lhs, rhs) => { + ExprKind::Binary(binop, lhs, rhs) => { vis.visit_expr(lhs); vis.visit_expr(rhs); + vis.visit_span(&mut binop.span); } ExprKind::Unary(_unop, ohs) => vis.visit_expr(ohs), ExprKind::Cast(expr, ty) => { diff --git a/tests/ui-fulldeps/pprust-parenthesis-insertion.rs b/tests/ui-fulldeps/pprust-parenthesis-insertion.rs index fd6644d73c1..75caea057ed 100644 --- a/tests/ui-fulldeps/pprust-parenthesis-insertion.rs +++ b/tests/ui-fulldeps/pprust-parenthesis-insertion.rs @@ -165,13 +165,6 @@ impl MutVisitor for Normalize { *span = DUMMY_SP; } - fn visit_expr(&mut self, expr: &mut P) { - if let ExprKind::Binary(binop, _left, _right) = &mut expr.kind { - self.visit_span(&mut binop.span); - } - mut_visit::walk_expr(self, expr); - } - fn flat_map_stmt(&mut self, mut stmt: Stmt) -> SmallVec<[Stmt; 1]> { self.visit_span(&mut stmt.span); mut_visit::walk_flat_map_stmt(self, stmt)