From f9f238e6b8fcfbe4ab8af2b48cebf597d47d308b Mon Sep 17 00:00:00 2001 From: Aaron Hill Date: Mon, 19 Jul 2021 09:33:35 -0500 Subject: [PATCH] Remove special case for `ExprKind::Paren` in `MutVisitor` The special case breaks several useful invariants (`ExpnId`s are globally unique, and never change). This special case was added back in 2016 in https://github.com/rust-lang/rust/pull/34355 --- compiler/rustc_ast/src/mut_visit.rs | 6 ------ src/test/ui/lint/issue-87274-paren-parent.rs | 9 +++++++++ src/test/ui/lint/issue-87274-paren-parent.stderr | 10 ++++++++++ 3 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 src/test/ui/lint/issue-87274-paren-parent.rs create mode 100644 src/test/ui/lint/issue-87274-paren-parent.stderr diff --git a/compiler/rustc_ast/src/mut_visit.rs b/compiler/rustc_ast/src/mut_visit.rs index 296766f8019..87950b44083 100644 --- a/compiler/rustc_ast/src/mut_visit.rs +++ b/compiler/rustc_ast/src/mut_visit.rs @@ -1347,12 +1347,6 @@ pub fn noop_visit_expr( } ExprKind::Paren(expr) => { vis.visit_expr(expr); - - // Nodes that are equal modulo `Paren` sugar no-ops should have the same IDs. - *id = expr.id; - vis.visit_span(span); - visit_thin_attrs(attrs, vis); - return; } ExprKind::Yield(expr) => { visit_opt(expr, |expr| vis.visit_expr(expr)); diff --git a/src/test/ui/lint/issue-87274-paren-parent.rs b/src/test/ui/lint/issue-87274-paren-parent.rs new file mode 100644 index 00000000000..0141c5a252f --- /dev/null +++ b/src/test/ui/lint/issue-87274-paren-parent.rs @@ -0,0 +1,9 @@ +// check-pass +// Tests that we properly lint at 'paren' expressions + +fn foo() -> Result<(), String> { + (try!(Ok::(1))); //~ WARN use of deprecated macro `try` + Ok(()) +} + +fn main() {} diff --git a/src/test/ui/lint/issue-87274-paren-parent.stderr b/src/test/ui/lint/issue-87274-paren-parent.stderr new file mode 100644 index 00000000000..f06024298bc --- /dev/null +++ b/src/test/ui/lint/issue-87274-paren-parent.stderr @@ -0,0 +1,10 @@ +warning: use of deprecated macro `try`: use the `?` operator instead + --> $DIR/issue-87274-paren-parent.rs:5:6 + | +LL | (try!(Ok::(1))); + | ^^^ + | + = note: `#[warn(deprecated)]` on by default + +warning: 1 warning emitted +