2021-03-25 18:29:11 +00:00
|
|
|
use clippy_utils::diagnostics::span_lint_and_sugg;
|
2021-05-20 10:30:31 +00:00
|
|
|
use clippy_utils::is_lang_ctor;
|
2021-03-25 18:29:11 +00:00
|
|
|
use clippy_utils::source::snippet;
|
|
|
|
use if_chain::if_chain;
|
2021-01-15 09:56:44 +00:00
|
|
|
use rustc_errors::Applicability;
|
2021-04-22 09:31:13 +00:00
|
|
|
use rustc_hir::LangItem::{OptionSome, ResultOk};
|
2021-01-15 09:56:44 +00:00
|
|
|
use rustc_hir::{Body, Expr, ExprKind, LangItem, MatchSource, QPath};
|
2021-04-27 14:55:11 +00:00
|
|
|
use rustc_lint::{LateContext, LateLintPass};
|
2021-05-20 10:30:31 +00:00
|
|
|
use rustc_middle::ty::TyS;
|
2021-04-27 14:55:11 +00:00
|
|
|
use rustc_session::{declare_lint_pass, declare_tool_lint};
|
2021-01-15 09:56:44 +00:00
|
|
|
|
|
|
|
declare_clippy_lint! {
|
2021-07-29 10:16:06 +00:00
|
|
|
/// ### What it does
|
2021-01-15 09:56:44 +00:00
|
|
|
/// Suggests alternatives for useless applications of `?` in terminating expressions
|
|
|
|
///
|
2021-07-29 10:16:06 +00:00
|
|
|
/// ### Why is this bad?
|
|
|
|
/// There's no reason to use `?` to short-circuit when execution of the body will end there anyway.
|
2021-01-15 09:56:44 +00:00
|
|
|
///
|
2021-07-29 10:16:06 +00:00
|
|
|
/// ### Example
|
2021-01-15 09:56:44 +00:00
|
|
|
/// ```rust
|
|
|
|
/// struct TO {
|
|
|
|
/// magic: Option<usize>,
|
|
|
|
/// }
|
|
|
|
///
|
|
|
|
/// fn f(to: TO) -> Option<usize> {
|
|
|
|
/// Some(to.magic?)
|
|
|
|
/// }
|
|
|
|
///
|
|
|
|
/// struct TR {
|
|
|
|
/// magic: Result<usize, bool>,
|
|
|
|
/// }
|
|
|
|
///
|
|
|
|
/// fn g(tr: Result<TR, bool>) -> Result<usize, bool> {
|
|
|
|
/// tr.and_then(|t| Ok(t.magic?))
|
|
|
|
/// }
|
|
|
|
///
|
|
|
|
/// ```
|
|
|
|
/// Use instead:
|
|
|
|
/// ```rust
|
|
|
|
/// struct TO {
|
|
|
|
/// magic: Option<usize>,
|
|
|
|
/// }
|
|
|
|
///
|
|
|
|
/// fn f(to: TO) -> Option<usize> {
|
|
|
|
/// to.magic
|
|
|
|
/// }
|
|
|
|
///
|
|
|
|
/// struct TR {
|
|
|
|
/// magic: Result<usize, bool>,
|
|
|
|
/// }
|
|
|
|
///
|
|
|
|
/// fn g(tr: Result<TR, bool>) -> Result<usize, bool> {
|
|
|
|
/// tr.and_then(|t| t.magic)
|
|
|
|
/// }
|
|
|
|
/// ```
|
2021-12-06 11:33:31 +00:00
|
|
|
#[clippy::version = "1.51.0"]
|
2021-01-15 09:56:44 +00:00
|
|
|
pub NEEDLESS_QUESTION_MARK,
|
|
|
|
complexity,
|
|
|
|
"Suggest `value.inner_option` instead of `Some(value.inner_option?)`. The same goes for `Result<T, E>`."
|
|
|
|
}
|
|
|
|
|
2021-04-27 14:55:11 +00:00
|
|
|
declare_lint_pass!(NeedlessQuestionMark => [NEEDLESS_QUESTION_MARK]);
|
2021-01-15 09:56:44 +00:00
|
|
|
|
|
|
|
impl LateLintPass<'_> for NeedlessQuestionMark {
|
|
|
|
/*
|
|
|
|
* The question mark operator is compatible with both Result<T, E> and Option<T>,
|
|
|
|
* from Rust 1.13 and 1.22 respectively.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* What do we match:
|
|
|
|
* Expressions that look like this:
|
|
|
|
* Some(option?), Ok(result?)
|
|
|
|
*
|
|
|
|
* Where do we match:
|
|
|
|
* Last expression of a body
|
|
|
|
* Return statement
|
|
|
|
* A body's value (single line closure)
|
|
|
|
*
|
|
|
|
* What do we not match:
|
|
|
|
* Implicit calls to `from(..)` on the error value
|
|
|
|
*/
|
|
|
|
|
|
|
|
fn check_expr(&mut self, cx: &LateContext<'_>, expr: &'_ Expr<'_>) {
|
2021-05-20 10:30:31 +00:00
|
|
|
if let ExprKind::Ret(Some(e)) = expr.kind {
|
|
|
|
check(cx, e);
|
2021-01-15 09:56:44 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn check_body(&mut self, cx: &LateContext<'_>, body: &'_ Body<'_>) {
|
2021-05-20 10:30:31 +00:00
|
|
|
check(cx, body.value.peel_blocks());
|
2021-01-15 09:56:44 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-05-20 10:30:31 +00:00
|
|
|
fn check(cx: &LateContext<'_>, expr: &Expr<'_>) {
|
2021-12-06 11:33:31 +00:00
|
|
|
if_chain! {
|
2021-05-20 10:30:31 +00:00
|
|
|
if let ExprKind::Call(path, [arg]) = &expr.kind;
|
|
|
|
if let ExprKind::Path(ref qpath) = &path.kind;
|
2021-12-06 11:33:31 +00:00
|
|
|
let sugg_remove = if is_lang_ctor(cx, qpath, OptionSome) {
|
|
|
|
"Some()"
|
|
|
|
} else if is_lang_ctor(cx, qpath, ResultOk) {
|
|
|
|
"Ok()"
|
|
|
|
} else {
|
|
|
|
return;
|
|
|
|
};
|
2021-05-20 10:30:31 +00:00
|
|
|
if let ExprKind::Match(inner_expr_with_q, _, MatchSource::TryDesugar) = &arg.kind;
|
|
|
|
if let ExprKind::Call(called, [inner_expr]) = &inner_expr_with_q.kind;
|
|
|
|
if let ExprKind::Path(QPath::LangItem(LangItem::TryTraitBranch, _)) = &called.kind;
|
|
|
|
if expr.span.ctxt() == inner_expr.span.ctxt();
|
|
|
|
let expr_ty = cx.typeck_results().expr_ty(expr);
|
|
|
|
let inner_ty = cx.typeck_results().expr_ty(inner_expr);
|
|
|
|
if TyS::same_type(expr_ty, inner_ty);
|
2021-12-06 11:33:31 +00:00
|
|
|
then {
|
|
|
|
span_lint_and_sugg(
|
|
|
|
cx,
|
|
|
|
NEEDLESS_QUESTION_MARK,
|
|
|
|
expr.span,
|
|
|
|
"question mark operator is useless here",
|
|
|
|
&format!("try removing question mark and `{}`", sugg_remove),
|
|
|
|
format!("{}", snippet(cx, inner_expr.span, r#""...""#)),
|
|
|
|
Applicability::MachineApplicable,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|
2021-01-15 09:56:44 +00:00
|
|
|
}
|