Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 0 insertions, 32 deletions

diff --git a/src/test/mir-opt/early_otherwise_branch.rs b/src/test/mir-opt/early_otherwise_branch.rs
deleted file mode 100644
index 7be9fbd03..000000000
--- a/src/test/mir-opt/early_otherwise_branch.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-// unit-test: EarlyOtherwiseBranch
-// EMIT_MIR early_otherwise_branch.opt1.EarlyOtherwiseBranch.diff
-fn opt1(x: Option<u32>, y: Option<u32>) -> u32 {
-    match (x, y) {
-        (Some(a), Some(b)) => 0,
-        _ => 1,
-    }
-}
-
-// EMIT_MIR early_otherwise_branch.opt2.EarlyOtherwiseBranch.diff
-fn opt2(x: Option<u32>, y: Option<u32>) -> u32 {
-    match (x, y) {
-        (Some(a), Some(b)) => 0,
-        (None, None) => 0,
-        _ => 1,
-    }
-}
-
-// optimize despite different types
-// EMIT_MIR early_otherwise_branch.opt3.EarlyOtherwiseBranch.diff
-fn opt3(x: Option<u32>, y: Option<bool>) -> u32 {
-    match (x, y) {
-        (Some(a), Some(b)) => 0,
-        _ => 1,
-    }
-}
-
-fn main() {
-    opt1(None, Some(0));
-    opt2(None, Some(0));
-    opt3(None, Some(false));
-}