Update clippy_lints/src/option_if_let_else.rs

J-ZhengLi · samueltardieu · J-ZhengLi · commit 22ba7925d6e7 · 2023-09-12T17:18:39.000+08:00
Co-authored-by: Samuel Tardieu &lt;sam@rfc1149.net&gt;
diff --git a/clippy_lints/src/option_if_let_else.rs b/clippy_lints/src/option_if_let_else.rs
@@ -197,12 +197,10 @@ fn try_get_option_occurrence<'tcx>(
 
 /// Gets the call expr iff it does not have any args and was not from macro expansion.
 fn try_get_argless_call_expr<'tcx>(expr: &Expr<'tcx>) -> Option<&'tcx Expr<'tcx>> {
-    if !expr.span.from_expansion() &&
-        let ExprKind::Call(call_expr, []) = expr.kind
-    {
-        return Some(call_expr);
+    match expr.kind {
+        ExprKind::Call(call_expr, []) if !expr.span.from_expansion() => Some(call_expr),
+        _ => None,
     }
-    None
 }
 
 fn try_get_inner_pat_and_is_result<'tcx>(cx: &LateContext<'tcx>, pat: &Pat<'tcx>) -> Option<(&'tcx Pat<'tcx>, bool)> {

Original file line number	Diff line number	Diff line change
`@@ -197,12 +197,10 @@ fn try_get_option_occurrence<'tcx>(`
`197`	`197`
`198`	`198`	`/// Gets the call expr iff it does not have any args and was not from macro expansion.`
`199`	`199`	`fn try_get_argless_call_expr<'tcx>(expr: &Expr<'tcx>) -> Option<&'tcx Expr<'tcx>> {`
`200`		`- if !expr.span.from_expansion() &&`
`201`		`- let ExprKind::Call(call_expr, []) = expr.kind`
`202`		`- {`
`203`		`- return Some(call_expr);`
	`200`	`+ match expr.kind {`
	`201`	`+ ExprKind::Call(call_expr, []) if !expr.span.from_expansion() => Some(call_expr),`
	`202`	`+ _ => None,`
`204`	`203`	`}`
`205`		`- None`
`206`	`204`	`}`
`207`	`205`
`208`	`206`	`fn try_get_inner_pat_and_is_result<'tcx>(cx: &LateContext<'tcx>, pat: &Pat<'tcx>) -> Option<(&'tcx Pat<'tcx>, bool)> {`