Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 20 deletions

diff --git a/src/test/ui/binding/match-join.rs b/src/test/ui/binding/match-join.rs
deleted file mode 100644
index 60f2a4584..000000000
--- a/src/test/ui/binding/match-join.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// run-pass
-#![allow(unused_mut)]
-fn foo<T>(y: Option<T>) {
-    let mut x: isize;
-    let mut rs: Vec<isize> = Vec::new();
-    /* tests that x doesn't get put in the precondition for the
-       entire if expression */
-
-    if true {
-    } else {
-        match y {
-          None::<T> => x = 17,
-          _ => x = 42
-        }
-        rs.push(x);
-    }
-    return;
-}
-
-pub fn main() { println!("hello"); foo::<isize>(Some::<isize>(5)); }