From 34055a932be83b2d675a6bc4f4cbc6388504819d Mon Sep 17 00:00:00 2001 From: ayushmishra2005 Date: Fri, 14 May 2021 08:57:33 +0530 Subject: [PATCH 1/2] Improve match statements --- compiler/rustc_mir/src/transform/early_otherwise_branch.rs | 5 +---- compiler/rustc_mir/src/transform/simplify_try.rs | 5 +---- .../tests/ui-toml/min_rust_version/min_rust_version.rs | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/compiler/rustc_mir/src/transform/early_otherwise_branch.rs b/compiler/rustc_mir/src/transform/early_otherwise_branch.rs index f7ea9faec4728..7934d4ba8499c 100644 --- a/compiler/rustc_mir/src/transform/early_otherwise_branch.rs +++ b/compiler/rustc_mir/src/transform/early_otherwise_branch.rs @@ -170,10 +170,7 @@ impl<'tcx> MirPass<'tcx> for EarlyOtherwiseBranch { } fn is_switch<'tcx>(terminator: &Terminator<'tcx>) -> bool { - match terminator.kind { - TerminatorKind::SwitchInt { .. } => true, - _ => false, - } + matches!(terminator.kind, TerminatorKind::SwitchInt { .. }) } struct Helper<'a, 'tcx> { diff --git a/compiler/rustc_mir/src/transform/simplify_try.rs b/compiler/rustc_mir/src/transform/simplify_try.rs index b42543c04eb3d..89fddc95c98f7 100644 --- a/compiler/rustc_mir/src/transform/simplify_try.rs +++ b/compiler/rustc_mir/src/transform/simplify_try.rs @@ -628,10 +628,7 @@ impl<'a, 'tcx> SimplifyBranchSameOptimizationFinder<'a, 'tcx> { // But `asm!(...)` could abort the program, // so we cannot assume that the `unreachable` terminator itself is reachable. // FIXME(Centril): use a normalization pass instead of a check. - || bb.statements.iter().any(|stmt| match stmt.kind { - StatementKind::LlvmInlineAsm(..) => true, - _ => false, - }) + || bb.statements.iter().any(|stmt| matches!(stmt.kind, StatementKind::LlvmInlineAsm(..))) }) .peekable(); diff --git a/src/tools/clippy/tests/ui-toml/min_rust_version/min_rust_version.rs b/src/tools/clippy/tests/ui-toml/min_rust_version/min_rust_version.rs index bc41efa42a17c..bf7da4015d351 100644 --- a/src/tools/clippy/tests/ui-toml/min_rust_version/min_rust_version.rs +++ b/src/tools/clippy/tests/ui-toml/min_rust_version/min_rust_version.rs @@ -31,10 +31,7 @@ fn option_as_ref_deref() { } fn match_like_matches() { - let _y = match Some(5) { - Some(0) => true, - _ => false, - }; + let _y = matches!(Some(5), Some(0)); } fn match_same_arms() { From 27defcd14fa202a58e2c070ec18ad084c584649c Mon Sep 17 00:00:00 2001 From: ayushmishra2005 Date: Fri, 14 May 2021 17:30:26 +0530 Subject: [PATCH 2/2] Addressed PR coments --- .../tests/ui-toml/min_rust_version/min_rust_version.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/tools/clippy/tests/ui-toml/min_rust_version/min_rust_version.rs b/src/tools/clippy/tests/ui-toml/min_rust_version/min_rust_version.rs index bf7da4015d351..bc41efa42a17c 100644 --- a/src/tools/clippy/tests/ui-toml/min_rust_version/min_rust_version.rs +++ b/src/tools/clippy/tests/ui-toml/min_rust_version/min_rust_version.rs @@ -31,7 +31,10 @@ fn option_as_ref_deref() { } fn match_like_matches() { - let _y = matches!(Some(5), Some(0)); + let _y = match Some(5) { + Some(0) => true, + _ => false, + }; } fn match_same_arms() {