X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=clippy_lints%2Fsrc%2Fdouble_parens.rs;h=d08981e8badc7e482b8d3c97a608d16806deec53;hb=920cdb59e1edf2c4cb2f266fa521f12c1b97a499;hp=3b476b81707fec6cfe3b5dbf7a9359641ff1d2d2;hpb=3f62fc3a7e2539e6bfeccbf1cce36ed83e8ab18a;p=rust.git

diff --git a/clippy_lints/src/double_parens.rs b/clippy_lints/src/double_parens.rs
index 3b476b81707..d08981e8bad 100644
--- a/clippy_lints/src/double_parens.rs
+++ b/clippy_lints/src/double_parens.rs
@@ -1,53 +1,38 @@
-// Copyright 2014-2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use crate::utils::{in_macro, span_lint};
-use rustc::lint::{EarlyContext, EarlyLintPass, LintArray, LintPass};
-use rustc::{declare_tool_lint, lint_array};
+use crate::utils::span_lint;
+use rustc_lint::{EarlyContext, EarlyLintPass};
+use rustc_session::{declare_lint_pass, 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,
@@ -61,7 +46,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,
@@ -74,7 +59,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,