Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 22 deletions

diff --git a/src/test/ui/let-else/let-else-non-diverging.rs b/src/test/ui/let-else/let-else-non-diverging.rs
deleted file mode 100644
index a5442dd82..000000000
--- a/src/test/ui/let-else/let-else-non-diverging.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-fn main() {
-    let Some(x) = Some(1) else { //~ ERROR does not diverge
-        Some(2)
-    };
-    let Some(x) = Some(1) else { //~ ERROR does not diverge
-        if 1 == 1 {
-            panic!();
-        }
-    };
-    let Some(x) = Some(1) else { Some(2) }; //~ ERROR does not diverge
-
-    // Ensure that uninhabited types do not "diverge".
-    // This might be relaxed in the future, but when it is,
-    // it should be an explicitly wanted decision.
-    let Some(x) = Some(1) else { foo::<Uninhabited>() }; //~ ERROR does not diverge
-}
-
-enum Uninhabited {}
-
-fn foo<T>() -> T {
-    panic!()
-}