-// 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::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"
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() {
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,
fn moves_by_default(cx: &LateContext<'_, '_>, expression: &Expr) -> bool {
let expr_ty = cx.tables.expr_ty(expression);
- expr_ty.moves_by_default(cx.tcx, cx.param_env, expression.span)
+ !expr_ty.is_copy_modulo_regions(cx.tcx, cx.param_env, expression.span)
}
fn is_option(cx: &LateContext<'_, '_>, expression: &Expr) -> bool {
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;