Auto merge of #3946 - rchaser53:issue-3920, r=flip1995

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

diff --git a/clippy_lints/src/question_mark.rs b/clippy_lints/src/question_mark.rs
index a4c4e66cf719d38f610a5dc704e914e266f00d26..5c64cd1c15c7905d09979adb99517da54531a737 100644 (file)
--- a/clippy_lints/src/question_mark.rs
+++ b/clippy_lints/src/question_mark.rs
@@ -1,34 +1,34 @@
-use crate::utils::sugg::Sugg;
 use if_chain::if_chain;
 use rustc::hir::def::Def;
 use rustc::hir::*;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc::{declare_tool_lint, lint_array};
+use rustc_errors::Applicability;
 use syntax::ptr::P;
 
 use crate::utils::paths::*;
+use crate::utils::sugg::Sugg;
 use crate::utils::{match_def_path, match_type, span_lint_and_then, SpanlessEq};
-use rustc_errors::Applicability;
 
-/// **What it does:** Checks for expressions that could be replaced by the question mark operator
-///
-/// **Why is this bad?** Question mark usage is more idiomatic
-///
-/// **Known problems:** None
-///
-/// **Example:**
-/// ```rust
-/// if option.is_none() {
-///     return None;
-/// }
-/// ```
-///
-/// Could be written:
-///
-/// ```rust
-/// option?;
-/// ```
 declare_clippy_lint! {
+    /// **What it does:** Checks for expressions that could be replaced by the question mark operator.
+    ///
+    /// **Why is this bad?** Question mark usage is more idiomatic.
+    ///
+    /// **Known problems:** None
+    ///
+    /// **Example:**
+    /// ```ignore
+    /// if option.is_none() {
+    ///     return None;
+    /// }
+    /// ```
+    ///
+    /// Could be written:
+    ///
+    /// ```ignore
+    /// option?;
+    /// ```
     pub QUESTION_MARK,
     style,
     "checks for expressions that could be replaced by the question mark operator"
@@ -41,10 +41,14 @@ impl LintPass for Pass {
     fn get_lints(&self) -> LintArray {
         lint_array!(QUESTION_MARK)
     }
+
+    fn name(&self) -> &'static str {
+        "QuestionMark"
+    }
 }
 
 impl Pass {
-    /// Check if the given expression on the given context matches the following structure:
+    /// Checks if the given expression on the given context matches the following structure:
     ///
     /// ```ignore
     /// if option.is_none() {
@@ -88,7 +92,7 @@ fn check_is_none_and_early_return_none(cx: &LateContext<'_, '_>, expr: &Expr) {
                         expr.span,
                         "this block may be rewritten with the `?` operator",
                         |db| {
-                            db.span_suggestion_with_applicability(
+                            db.span_suggestion(
                                 expr.span,
                                 "replace_it_with",
                                 replacement_str,
@@ -124,7 +128,7 @@ fn expression_returns_none(cx: &LateContext<'_, '_>, expression: &Expr) -> bool
             },
             ExprKind::Ret(Some(ref expr)) => Self::expression_returns_none(cx, expr),
             ExprKind::Path(ref qp) => {
-                if let Def::VariantCtor(def_id, _) = cx.tables.qpath_def(qp, expression.hir_id) {
+                if let Def::Ctor(def_id, def::CtorOf::Variant, _) = cx.tables.qpath_def(qp, expression.hir_id) {
                     return match_def_path(cx.tcx, def_id, &OPTION_NONE);
                 }
 
@@ -139,7 +143,7 @@ fn return_expression(block: &Block) -> Option<P<Expr>> {
         if_chain! {
             if block.stmts.len() == 1;
             if let Some(expr) = block.stmts.iter().last();
-            if let StmtKind::Semi(ref expr, _) = expr.node;
+            if let StmtKind::Semi(ref expr) = expr.node;
             if let ExprKind::Ret(ref ret_expr) = expr.node;
             if let &Some(ref ret_expr) = ret_expr;