Use span_suggestion_with_applicability instead of span_suggestion

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

diff --git a/clippy_lints/src/collapsible_if.rs b/clippy_lints/src/collapsible_if.rs
index 9d23d32c81ae33a4dc3280284c9446210ed0108c..c139b0f0c1f15029542e8e332ae00306235b7859 100644 (file)
--- a/clippy_lints/src/collapsible_if.rs
+++ b/clippy_lints/src/collapsible_if.rs
@@ -2,7 +2,7 @@
 //!
 //! For example, the lint would catch:
 //!
-//! ```rust
+//! ```rust,ignore
 //! if x {
 //!     if y {
 //!         println!("Hello world");
@@ -12,14 +12,18 @@
 //!
 //! This lint is **warn** by default
 
-use rustc::lint::*;
-use syntax::ast;
+use crate::rustc::lint::{EarlyContext, EarlyLintPass, LintArray, LintPass};
+use crate::rustc::{declare_tool_lint, lint_array};
+use if_chain::if_chain;
+use crate::syntax::ast;
 
-use utils::{in_macro, snippet_block, span_lint_and_then};
-use utils::sugg::Sugg;
+use crate::utils::{in_macro, snippet_block, span_lint_and_sugg, span_lint_and_then};
+use crate::utils::sugg::Sugg;
+use crate::rustc_errors::Applicability;
 
 /// **What it does:** Checks for nested `if` statements which can be collapsed
-/// by `&&`-combining their conditions and for `else { if ... }` expressions that
+/// by `&&`-combining their conditions and for `else { if ... }` expressions
+/// that
 /// can be collapsed to `else if ...`.
 ///
 /// **Why is this bad?** Each `if`-statement adds one level of nesting, which
@@ -28,7 +32,7 @@
 /// **Known problems:** None.
 ///
 /// **Example:**
-/// ```rust
+/// ```rust,ignore
 /// if x {
 ///     if y {
 ///         …
@@ -48,7 +52,7 @@
 ///
 /// Should be written:
 ///
-/// ```rust
+/// ```rust.ignore
 /// if x && y {
 ///     …
 /// }
@@ -61,13 +65,13 @@
 ///     …
 /// }
 /// ```
-declare_lint! {
+declare_clippy_lint! {
     pub COLLAPSIBLE_IF,
-    Warn,
+    style,
     "`if`s that can be collapsed (e.g. `if x { if y { ... } }` and `else { if x { ... } }`)"
 }
 
-#[derive(Copy,Clone)]
+#[derive(Copy, Clone)]
 pub struct CollapsibleIf;
 
 impl LintPass for CollapsibleIf {
@@ -77,75 +81,72 @@ fn get_lints(&self) -> LintArray {
 }
 
 impl EarlyLintPass for CollapsibleIf {
-    fn check_expr(&mut self, cx: &EarlyContext, expr: &ast::Expr) {
-        if !in_macro(cx, expr.span) {
+    fn check_expr(&mut self, cx: &EarlyContext<'_>, expr: &ast::Expr) {
+        if !in_macro(expr.span) {
             check_if(cx, expr)
         }
     }
 }
 
-fn check_if(cx: &EarlyContext, expr: &ast::Expr) {
+fn check_if(cx: &EarlyContext<'_>, expr: &ast::Expr) {
     match expr.node {
-        ast::ExprKind::If(ref check, ref then, ref else_) => {
-            if let Some(ref else_) = *else_ {
-                check_collapsible_maybe_if_let(cx, else_);
-            } else {
-                check_collapsible_no_if_let(cx, expr, check, then);
-            }
-        }
+        ast::ExprKind::If(ref check, ref then, ref else_) => if let Some(ref else_) = *else_ {
+            check_collapsible_maybe_if_let(cx, else_);
+        } else {
+            check_collapsible_no_if_let(cx, expr, check, then);
+        },
         ast::ExprKind::IfLet(_, _, _, Some(ref else_)) => {
             check_collapsible_maybe_if_let(cx, else_);
-        }
+        },
         _ => (),
     }
 }
 
-fn check_collapsible_maybe_if_let(cx: &EarlyContext, else_: &ast::Expr) {
-    if_let_chain! {[
-        let ast::ExprKind::Block(ref block) = else_.node,
-        let Some(ref else_) = expr_block(block),
-        !in_macro(cx, else_.span),
-    ], {
-        match else_.node {
-            ast::ExprKind::If(..) | ast::ExprKind::IfLet(..) => {
-                span_lint_and_then(cx,
-                                   COLLAPSIBLE_IF,
-                                   block.span,
-                                   "this `else { if .. }` block can be collapsed", |db| {
-                    db.span_suggestion(block.span, "try", snippet_block(cx, else_.span, "..").into_owned());
-                });
+fn check_collapsible_maybe_if_let(cx: &EarlyContext<'_>, else_: &ast::Expr) {
+    if_chain! {
+        if let ast::ExprKind::Block(ref block, _) = else_.node;
+        if let Some(else_) = expr_block(block);
+        if !in_macro(else_.span);
+        then {
+            match else_.node {
+                ast::ExprKind::If(..) | ast::ExprKind::IfLet(..) => {
+                    span_lint_and_sugg(cx,
+                                       COLLAPSIBLE_IF,
+                                       block.span,
+                                       "this `else { if .. }` block can be collapsed",
+                                       "try",
+                                       snippet_block(cx, else_.span, "..").into_owned());
+                }
+                _ => (),
             }
-            _ => (),
         }
-    }}
+    }
 }
 
-fn check_collapsible_no_if_let(
-    cx: &EarlyContext,
-    expr: &ast::Expr,
-    check: &ast::Expr,
-    then: &ast::Block,
-) {
-    if_let_chain! {[
-        let Some(inner) = expr_block(then),
-        let ast::ExprKind::If(ref check_inner, ref content, None) = inner.node,
-    ], {
-        if expr.span.expn_id != inner.span.expn_id {
-            return;
+fn check_collapsible_no_if_let(cx: &EarlyContext<'_>, expr: &ast::Expr, check: &ast::Expr, then: &ast::Block) {
+    if_chain! {
+        if let Some(inner) = expr_block(then);
+        if let ast::ExprKind::If(ref check_inner, ref content, None) = inner.node;
+        then {
+            if expr.span.ctxt() != inner.span.ctxt() {
+                return;
+            }
+            span_lint_and_then(cx, COLLAPSIBLE_IF, expr.span, "this if statement can be collapsed", |db| {
+                let lhs = Sugg::ast(cx, check, "..");
+                let rhs = Sugg::ast(cx, check_inner, "..");
+                db.span_suggestion_with_applicability(expr.span,
+                                   "try",
+                                   format!("if {} {}",
+                                           lhs.and(&rhs),
+                                           snippet_block(cx, content.span, "..")),
+                                    Applicability::Unspecified,
+                                    );
+            });
         }
-        span_lint_and_then(cx, COLLAPSIBLE_IF, expr.span, "this if statement can be collapsed", |db| {
-            let lhs = Sugg::ast(cx, check, "..");
-            let rhs = Sugg::ast(cx, check_inner, "..");
-            db.span_suggestion(expr.span,
-                               "try",
-                               format!("if {} {}",
-                                       lhs.and(rhs),
-                                       snippet_block(cx, content.span, "..")));
-        });
-    }}
+    }
 }
 
-/// If the block contains only one expression, returns it.
+/// If the block contains only one expression, return it.
 fn expr_block(block: &ast::Block) -> Option<&ast::Expr> {
     let mut it = block.stmts.iter();