use crate::consts::constant_simple;
use crate::utils;
+use crate::utils::{path_to_local_id, sugg};
use if_chain::if_chain;
use rustc_errors::Applicability;
-use rustc_hir::{def, Arm, Expr, ExprKind, Pat, PatKind, QPath};
+use rustc_hir::{Arm, Expr, ExprKind, Pat, PatKind};
use rustc_lint::LintContext;
use rustc_lint::{LateContext, LateLintPass};
use rustc_middle::lint::in_external_macro;
use rustc_session::{declare_lint_pass, declare_tool_lint};
+use rustc_span::sym;
declare_clippy_lint! {
/// **What it does:**
if utils::match_qpath(unwrap_qpath, &utils::paths::OPTION_SOME)
|| utils::match_qpath(unwrap_qpath, &utils::paths::RESULT_OK);
if let PatKind::Binding(_, binding_hir_id, ..) = unwrap_pat.kind;
- if let ExprKind::Path(QPath::Resolved(_, body_path)) = unwrap_arm.body.kind;
- if let def::Res::Local(body_path_hir_id) = body_path.res;
- if body_path_hir_id == binding_hir_id;
+ if path_to_local_id(unwrap_arm.body, binding_hir_id);
if !utils::usage::contains_return_break_continue_macro(or_arm.body);
then {
Some(or_arm)
if_chain! {
if let ExprKind::Match(scrutinee, match_arms, _) = expr.kind;
let ty = cx.typeck_results().expr_ty(scrutinee);
- if let Some(case) = if utils::is_type_diagnostic_item(cx, ty, sym!(option_type)) {
+ if let Some(case) = if utils::is_type_diagnostic_item(cx, ty, sym::option_type) {
Some(Case::Option)
- } else if utils::is_type_diagnostic_item(cx, ty, sym!(result_type)) {
+ } else if utils::is_type_diagnostic_item(cx, ty, sym::result_type) {
Some(Case::Result)
} else {
None
};
if let Some(or_arm) = applicable_or_arm(match_arms);
- if let Some(scrutinee_snippet) = utils::snippet_opt(cx, scrutinee.span);
if let Some(or_body_snippet) = utils::snippet_opt(cx, or_arm.body.span);
if let Some(indent) = utils::indent_of(cx, expr.span);
if constant_simple(cx, cx.typeck_results(), or_arm.body).is_some();
then {
let reindented_or_body =
utils::reindent_multiline(or_body_snippet.into(), true, Some(indent));
- let wrap_in_parens = !matches!(scrutinee, Expr { kind: ExprKind::Call(..), .. });
- let l_paren = if wrap_in_parens { "(" } else { "" };
- let r_paren = if wrap_in_parens { ")" } else { "" };
utils::span_lint_and_sugg(
cx,
MANUAL_UNWRAP_OR, expr.span,
&format!("this pattern reimplements `{}`", case.unwrap_fn_path()),
"replace with",
format!(
- "{}{}{}.unwrap_or({})",
- l_paren,
- scrutinee_snippet,
- r_paren,
+ "{}.unwrap_or({})",
+ sugg::Sugg::hir(cx, scrutinee, "..").maybe_par(),
reindented_or_body,
),
Applicability::MachineApplicable,