2021-03-25 13:29:11 -05:00
|
|
|
use clippy_utils::diagnostics::span_lint_and_sugg;
|
2021-08-08 09:49:13 -05:00
|
|
|
use clippy_utils::higher;
|
2023-03-02 13:29:45 -06:00
|
|
|
use clippy_utils::is_res_lang_ctor;
|
|
|
|
use clippy_utils::source::snippet_with_context;
|
2021-03-25 13:29:11 -05:00
|
|
|
use clippy_utils::ty::is_type_diagnostic_item;
|
2018-11-27 14:14:15 -06:00
|
|
|
use if_chain::if_chain;
|
2020-01-09 17:34:13 -06:00
|
|
|
use rustc_errors::Applicability;
|
2023-03-02 13:29:45 -06:00
|
|
|
use rustc_hir::{Expr, ExprKind, LangItem, PatKind};
|
2020-01-12 00:08:41 -06:00
|
|
|
use rustc_lint::{LateContext, LateLintPass};
|
2020-01-11 05:37:08 -06:00
|
|
|
use rustc_session::{declare_lint_pass, declare_tool_lint};
|
2020-11-05 07:29:48 -06:00
|
|
|
use rustc_span::sym;
|
2016-10-02 15:48:52 -05:00
|
|
|
|
2018-03-28 08:24:26 -05:00
|
|
|
declare_clippy_lint! {
|
2021-07-29 05:16:06 -05:00
|
|
|
/// ### What it does
|
2021-09-28 12:03:12 -05:00
|
|
|
/// Checks for unnecessary `ok()` in `while let`.
|
2019-03-05 10:50:33 -06:00
|
|
|
///
|
2021-07-29 05:16:06 -05:00
|
|
|
/// ### Why is this bad?
|
2021-09-28 12:03:12 -05:00
|
|
|
/// Calling `ok()` in `while let` is unnecessary, instead match
|
2019-03-05 10:50:33 -06:00
|
|
|
/// on `Ok(pat)`
|
|
|
|
///
|
2021-07-29 05:16:06 -05:00
|
|
|
/// ### Example
|
2019-03-05 16:23:50 -06:00
|
|
|
/// ```ignore
|
2021-09-28 12:03:12 -05:00
|
|
|
/// while let Some(value) = iter.next().ok() {
|
|
|
|
/// vec.push(value)
|
2019-03-05 10:50:33 -06:00
|
|
|
/// }
|
|
|
|
///
|
2022-05-05 09:12:52 -05:00
|
|
|
/// if let Some(value) = iter.next().ok() {
|
2021-09-28 12:03:12 -05:00
|
|
|
/// vec.push(value)
|
|
|
|
/// }
|
|
|
|
/// ```
|
|
|
|
/// Use instead:
|
2019-03-05 16:23:50 -06:00
|
|
|
/// ```ignore
|
2021-09-28 12:03:12 -05:00
|
|
|
/// while let Ok(value) = iter.next() {
|
|
|
|
/// vec.push(value)
|
|
|
|
/// }
|
|
|
|
///
|
|
|
|
/// if let Ok(value) = iter.next() {
|
2021-10-21 06:11:36 -05:00
|
|
|
/// vec.push(value)
|
2019-03-05 10:50:33 -06:00
|
|
|
/// }
|
|
|
|
/// ```
|
2021-12-06 05:33:31 -06:00
|
|
|
#[clippy::version = "1.57.0"]
|
2021-09-28 12:03:12 -05:00
|
|
|
pub MATCH_RESULT_OK,
|
2018-03-28 08:24:26 -05:00
|
|
|
style,
|
2021-09-28 12:03:12 -05:00
|
|
|
"usage of `ok()` in `let Some(pat)` statements is unnecessary, match on `Ok(pat)` instead"
|
2016-10-02 15:48:52 -05:00
|
|
|
}
|
|
|
|
|
2021-09-28 12:03:12 -05:00
|
|
|
declare_lint_pass!(MatchResultOk => [MATCH_RESULT_OK]);
|
2016-10-02 15:48:52 -05:00
|
|
|
|
2021-09-28 12:03:12 -05:00
|
|
|
impl<'tcx> LateLintPass<'tcx> for MatchResultOk {
|
2020-06-25 15:41:36 -05:00
|
|
|
fn check_expr(&mut self, cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>) {
|
2021-09-28 12:03:12 -05:00
|
|
|
let (let_pat, let_expr, ifwhile) =
|
|
|
|
if let Some(higher::IfLet { let_pat, let_expr, .. }) = higher::IfLet::hir(cx, expr) {
|
|
|
|
(let_pat, let_expr, "if")
|
|
|
|
} else if let Some(higher::WhileLet { let_pat, let_expr, .. }) = higher::WhileLet::hir(expr) {
|
|
|
|
(let_pat, let_expr, "while")
|
|
|
|
} else {
|
|
|
|
return;
|
|
|
|
};
|
|
|
|
|
|
|
|
if_chain! {
|
2023-03-02 13:29:45 -06:00
|
|
|
if let ExprKind::MethodCall(ok_path, recv, [], ..) = let_expr.kind; //check is expr.ok() has type Result<T,E>.ok(, _)
|
|
|
|
if let PatKind::TupleStruct(ref pat_path, [ok_pat], _) = let_pat.kind; //get operation
|
|
|
|
if ok_path.ident.as_str() == "ok";
|
|
|
|
if is_type_diagnostic_item(cx, cx.typeck_results().expr_ty(recv), sym::Result);
|
|
|
|
if is_res_lang_ctor(cx, cx.qpath_res(pat_path, let_pat.hir_id), LangItem::OptionSome);
|
|
|
|
let ctxt = expr.span.ctxt();
|
|
|
|
if let_expr.span.ctxt() == ctxt;
|
|
|
|
if let_pat.span.ctxt() == ctxt;
|
2017-10-23 14:18:02 -05:00
|
|
|
then {
|
2020-01-09 17:34:13 -06:00
|
|
|
let mut applicability = Applicability::MachineApplicable;
|
2023-03-02 13:29:45 -06:00
|
|
|
let some_expr_string = snippet_with_context(cx, ok_pat.span, ctxt, "", &mut applicability).0;
|
|
|
|
let trimmed_ok = snippet_with_context(cx, recv.span, ctxt, "", &mut applicability).0;
|
2020-01-10 13:34:01 -06:00
|
|
|
let sugg = format!(
|
2022-09-23 12:42:59 -05:00
|
|
|
"{ifwhile} let Ok({some_expr_string}) = {}",
|
2020-01-18 19:00:34 -06:00
|
|
|
trimmed_ok.trim().trim_end_matches('.'),
|
2020-01-09 17:34:13 -06:00
|
|
|
);
|
2020-01-19 06:14:47 -06:00
|
|
|
span_lint_and_sugg(
|
|
|
|
cx,
|
2021-09-28 12:03:12 -05:00
|
|
|
MATCH_RESULT_OK,
|
2021-08-08 09:49:13 -05:00
|
|
|
expr.span.with_hi(let_expr.span.hi()),
|
2020-08-28 09:10:16 -05:00
|
|
|
"matching on `Some` with `ok()` is redundant",
|
2022-09-23 12:42:59 -05:00
|
|
|
&format!("consider matching on `Ok({some_expr_string})` and removing the call to `ok` instead"),
|
2020-01-19 06:14:47 -06:00
|
|
|
sugg,
|
|
|
|
applicability,
|
|
|
|
);
|
2016-10-02 15:48:52 -05:00
|
|
|
}
|
2017-10-23 14:18:02 -05:00
|
|
|
}
|
2016-10-02 15:48:52 -05:00
|
|
|
}
|
|
|
|
}
|