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

Auto merge of #11896 - samueltardieu:issue-11893, r=Alexendoo

Browse source 
`option_if_let_else`: do not trigger on expressions returning `()`

Fix #11893

Trigerring on expressions returning `()` uses the arguments of the `map_or_else()` rewrite only for their side effects. This does lead to code which is harder to read than the original.

changelog: [`option_if_let_else`]: do not trigger on unit expressions
This commit is contained in:
bors 2023-11-30 15:17:29 +00:00
commit 646b28f5f6
4 changed files with 85 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

21
clippy_lints/src/option_if_let_else.rs
View file

@ -239,21 +239,24 @@ fn detect_option_if_let_else<'tcx>(cx: &LateContext<'tcx>, expr: &Expr<'tcx>) ->
if_then,
if_else: Some(if_else),
}) = higher::IfLet::hir(cx, expr)
&& !cx.typeck_results().expr_ty(expr).is_unit()
&& !is_else_clause(cx.tcx, expr)
{
if !is_else_clause(cx.tcx, expr) {
return try_get_option_occurrence(cx, expr.span.ctxt(), let_pat, let_expr, if_then, if_else);
}
try_get_option_occurrence(cx, expr.span.ctxt(), let_pat, let_expr, if_then, if_else)
} else {
None
}
None
}
fn detect_option_match<'tcx>(cx: &LateContext<'tcx>, expr: &Expr<'tcx>) -> Option<OptionOccurrence> {
if let ExprKind::Match(ex, arms, MatchSource::Normal) = expr.kind {
if let Some((let_pat, if_then, if_else)) = try_convert_match(cx, arms) {
return try_get_option_occurrence(cx, expr.span.ctxt(), let_pat, ex, if_then, if_else);
}
if let ExprKind::Match(ex, arms, MatchSource::Normal) = expr.kind
&& !cx.typeck_results().expr_ty(expr).is_unit()
&& let Some((let_pat, if_then, if_else)) = try_convert_match(cx, arms)
{
try_get_option_occurrence(cx, expr.span.ctxt(), let_pat, ex, if_then, if_else)
} else {
None
}
None
}
fn try_convert_match<'tcx>(