Rollup merge of #85278 - ayushmishra2005:code-refactoring, r=jackh726

Improve match statements

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 {
+    matches!(terminator.kind, TerminatorKind::SwitchInt { .. })
-        TerminatorKind::SwitchInt { .. } => true,
-        _ => false,
-    }
 }
 
 struct Helper<'a, 'tcx> {

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 {
+                    || bb.statements.iter().any(|stmt| matches!(stmt.kind, StatementKind::LlvmInlineAsm(..)))
-                        StatementKind::LlvmInlineAsm(..) => true,
-                        _ => false,
-                    })
                     })
                     .peekable();