use if_chain::if_chain;
use rustc::hir::def::{DefKind, Res};
+use rustc::hir::ptr::P;
use rustc::hir::*;
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
use rustc::{declare_lint_pass, declare_tool_lint};
use rustc_errors::Applicability;
-use syntax::ptr::P;
use crate::utils::paths::*;
use crate::utils::sugg::Sugg;
-use crate::utils::{higher, match_type, span_lint_and_then, SpanlessEq};
+use crate::utils::{higher, match_def_path, match_type, span_lint_and_then, SpanlessEq};
declare_clippy_lint! {
/// **What it does:** Checks for expressions that could be replaced by the question mark operator.
if_chain! {
if let Some((if_expr, body, else_)) = higher::if_block(&expr);
if let ExprKind::MethodCall(segment, _, args) = &if_expr.node;
- if segment.ident.name == "is_none";
+ if segment.ident.name == sym!(is_none);
if Self::expression_returns_none(cx, body);
if let Some(subject) = args.get(0);
if Self::is_option(cx, subject);
if let Res::Def(DefKind::Ctor(def::CtorOf::Variant, def::CtorKind::Const), def_id) =
cx.tables.qpath_res(qp, expression.hir_id)
{
- return cx.match_def_path(def_id, &OPTION_NONE);
+ return match_def_path(cx, def_id, &OPTION_NONE);
}
false
}
}
- fn return_expression(block: &Block) -> Option<P<Expr>> {
+ fn return_expression(block: &Block) -> Option<&P<Expr>> {
// Check if last expression is a return statement. Then, return the expression
if_chain! {
if block.stmts.len() == 1;
if let &Some(ref ret_expr) = ret_expr;
then {
- return Some(ret_expr.clone());
+ return Some(ret_expr);
}
}
if block.stmts.len() == 0;
if let Some(ExprKind::Ret(Some(ret_expr))) = block.expr.as_ref().map(|e| &e.node);
then {
- return Some(ret_expr.clone());
+ return Some(ret_expr);
}
}