rustup https://github.com/rust-lang/rust/pull/67455

[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 38381b069f073294ca673c15d665701f369222b1..52a5e2a1a49d6c21ed94bb145e0683f2bf892acf 100644 (file)
--- a/clippy_lints/src/double_parens.rs
+++ b/clippy_lints/src/double_parens.rs
@@ -1,44 +1,39 @@
-use crate::utils::{in_macro, span_lint};
+use crate::utils::span_lint;
+use rustc::declare_lint_pass;
 use rustc::lint::{EarlyContext, EarlyLintPass, LintArray, LintPass};
-use rustc::{declare_tool_lint, lint_array};
+use rustc_session::declare_tool_lint;
 use syntax::ast::*;
 
-/// **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.
+    ///
+    /// **Known problems:** None.
+    ///
+    /// **Example:**
+    /// ```rust
+    /// # fn foo(bar: usize) {}
+    /// ((0));
+    /// foo((0));
+    /// ((1, 2));
+    /// ```
     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) {
-        if in_macro(expr.span) {
+        if expr.span.from_expansion() {
             return;
         }
 
-        match expr.node {
-            ExprKind::Paren(ref in_paren) => match in_paren.node {
+        match expr.kind {
+            ExprKind::Paren(ref in_paren) => match in_paren.kind {
                 ExprKind::Paren(_) | ExprKind::Tup(_) => {
                     span_lint(
                         cx,
@@ -52,7 +47,7 @@ fn check_expr(&mut self, cx: &EarlyContext<'_>, expr: &Expr) {
             ExprKind::Call(_, ref params) => {
                 if params.len() == 1 {
                     let param = &params[0];
-                    if let ExprKind::Paren(_) = param.node {
+                    if let ExprKind::Paren(_) = param.kind {
                         span_lint(
                             cx,
                             DOUBLE_PARENS,
@@ -65,7 +60,7 @@ fn check_expr(&mut self, cx: &EarlyContext<'_>, expr: &Expr) {
             ExprKind::MethodCall(_, ref params) => {
                 if params.len() == 2 {
                     let param = &params[1];
-                    if let ExprKind::Paren(_) = param.node {
+                    if let ExprKind::Paren(_) = param.kind {
                         span_lint(
                             cx,
                             DOUBLE_PARENS,