user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add necessary parentheses to manual_unwrap_or_default lint output

Browse source
This commit is contained in:
Samuel Tardieu 2024-03-22 12:21:35 +01:00
parent fc053c3296
commit 2ffd1336c7
4 changed files with 35 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
clippy_lints/src/manual_unwrap_or_default.rs
View file

@ -1,3 +1,4 @@
use clippy_utils::sugg::Sugg;
use rustc_errors::Applicability;
use rustc_hir::def::Res;
use rustc_hir::{Arm, Expr, ExprKind, HirId, LangItem, MatchSource, Pat, PatKind, QPath};
@ -124,7 +125,7 @@ fn handle_match<'tcx>(cx: &LateContext<'tcx>, expr: &'tcx Expr<'tcx>) -> bool {
// We now check the `None` arm is calling a method equivalent to `Default::default`.
&& let body_none = body_none.peel_blocks()
&& is_default_equivalent(cx, body_none)
&& let Some(match_expr_snippet) = snippet_opt(cx, match_expr.span)
&& let Some(receiver) = Sugg::hir_opt(cx, match_expr).map(Sugg::maybe_par)
{
span_lint_and_sugg(
cx,
@ -132,7 +133,7 @@ fn handle_match<'tcx>(cx: &LateContext<'tcx>, expr: &'tcx Expr<'tcx>) -> bool {
expr.span,
"match can be simplified with `.unwrap_or_default()`",
"replace it with",
format!("{match_expr_snippet}.unwrap_or_default()"),
format!("{receiver}.unwrap_or_default()"),
Applicability::MachineApplicable,
);
}