Merge remote-tracking branch 'upstream/master' into rustup

2021-01-15 10:02:28 +01:00
parent 7b3af4145b 00586dfdcd
commit 9bd037d0b5
105 changed files with 2300 additions and 270 deletions
--- a/clippy_lints/src/returns.rs
+++ b/clippy_lints/src/returns.rs
@@ -202,7 +202,7 @@ fn check_final_expr<'tcx>(
                    check_final_expr(cx, &arm.body, Some(arm.body.span), RetReplacement::Block);
                }
            },
-            | MatchSource::IfLetDesugar {
+            MatchSource::IfLetDesugar {
                contains_else_clause: true,
            } => {
                if let ExprKind::Block(ref ifblock, _) = arms[0].body.kind {