Rollup merge of #97794 - eltociear:patch-13, r=matthiaskrgr

[rust.git] / clippy_lints / src / double_parens.rs

diff --git a/clippy_lints/src/double_parens.rs b/clippy_lints/src/double_parens.rs
index 702931c05327e6d30d8ae8c2005a39c107372135..a33ef5ce6e37c5a30b4c9586ffe5590bfba66235 100644 (file)
--- a/clippy_lints/src/double_parens.rs
+++ b/clippy_lints/src/double_parens.rs
@@ -1,55 +1,72 @@
-use crate::syntax::ast::*;
-use crate::rustc::lint::{EarlyContext, EarlyLintPass, LintArray, LintPass};
-use crate::rustc::{declare_tool_lint, lint_array};
-use crate::utils::span_lint;
+use clippy_utils::diagnostics::span_lint;
+use rustc_ast::ast::{Expr, ExprKind};
+use rustc_lint::{EarlyContext, EarlyLintPass};
+use rustc_session::{declare_lint_pass, declare_tool_lint};
 
-/// **What it does:** Checks for unnecessary double parentheses.
-///
-/// **Why is this bad?** This makes code harder to read and might indicate a
-/// mistake.
-///
-/// **Known problems:** None.
-///
-/// **Example:**
-/// ```rust
-/// ((0))
-/// foo((0))
-/// ((1, 2))
-/// ```
 declare_clippy_lint! {
+    /// ### What it does
+    /// Checks for unnecessary double parentheses.
+    ///
+    /// ### Why is this bad?
+    /// This makes code harder to read and might indicate a
+    /// mistake.
+    ///
+    /// ### Example
+    /// ```rust
+    /// fn simple_double_parens() -> i32 {
+    ///     ((0))
+    /// }
+    ///
+    /// # fn foo(bar: usize) {}
+    /// foo((0));
+    /// ```
+    ///
+    /// Use instead:
+    /// ```rust
+    /// fn simple_no_parens() -> i32 {
+    ///     0
+    /// }
+    ///
+    /// # fn foo(bar: usize) {}
+    /// foo(0);
+    /// ```
+    #[clippy::version = "pre 1.29.0"]
     pub DOUBLE_PARENS,
     complexity,
     "Warn on unnecessary double parentheses"
 }
 
-#[derive(Copy, Clone)]
-pub struct DoubleParens;
-
-impl LintPass for DoubleParens {
-    fn get_lints(&self) -> LintArray {
-        lint_array!(DOUBLE_PARENS)
-    }
-}
+declare_lint_pass!(DoubleParens => [DOUBLE_PARENS]);
 
 impl EarlyLintPass for DoubleParens {
     fn check_expr(&mut self, cx: &EarlyContext<'_>, expr: &Expr) {
-        match expr.node {
-            ExprKind::Paren(ref in_paren) => match in_paren.node {
+        if expr.span.from_expansion() {
+            return;
+        }
+
+        let msg: &str = "consider removing unnecessary double parentheses";
+
+        match expr.kind {
+            ExprKind::Paren(ref in_paren) => match in_paren.kind {
                 ExprKind::Paren(_) | ExprKind::Tup(_) => {
-                    span_lint(cx, DOUBLE_PARENS, expr.span, "Consider removing unnecessary double parentheses");
+                    span_lint(cx, DOUBLE_PARENS, expr.span, msg);
                 },
                 _ => {},
             },
-            ExprKind::Call(_, ref params) => if params.len() == 1 {
-                let param = &params[0];
-                if let ExprKind::Paren(_) = param.node {
-                    span_lint(cx, DOUBLE_PARENS, param.span, "Consider removing unnecessary double parentheses");
+            ExprKind::Call(_, ref params) => {
+                if params.len() == 1 {
+                    let param = &params[0];
+                    if let ExprKind::Paren(_) = param.kind {
+                        span_lint(cx, DOUBLE_PARENS, param.span, msg);
+                    }
                 }
             },
-            ExprKind::MethodCall(_, ref params) => if params.len() == 2 {
-                let param = &params[1];
-                if let ExprKind::Paren(_) = param.node {
-                    span_lint(cx, DOUBLE_PARENS, param.span, "Consider removing unnecessary double parentheses");
+            ExprKind::MethodCall(_, ref params, _) => {
+                if params.len() == 2 {
+                    let param = &params[1];
+                    if let ExprKind::Paren(_) = param.kind {
+                        span_lint(cx, DOUBLE_PARENS, param.span, msg);
+                    }
                 }
             },
             _ => {},