Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 49 deletions

diff --git a/src/test/ui/expr/if/if-without-else-as-fn-expr.rs b/src/test/ui/expr/if/if-without-else-as-fn-expr.rs
deleted file mode 100644
index 19fbfb27b..000000000
--- a/src/test/ui/expr/if/if-without-else-as-fn-expr.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-fn foo(bar: usize) -> usize {
-    if bar % 5 == 0 {
-        return 3;
-    }
-    //~^^^ ERROR `if` may be missing an `else` clause
-}
-
-fn foo2(bar: usize) -> usize {
-    let x: usize = if bar % 5 == 0 {
-        return 3;
-    };
-    //~^^^ ERROR `if` may be missing an `else` clause
-    x
-}
-
-fn foo3(bar: usize) -> usize {
-    if bar % 5 == 0 {
-        3
-    }
-    //~^^^ ERROR `if` may be missing an `else` clause
-}
-
-fn foo_let(bar: usize) -> usize {
-    if let 0 = 1 {
-        return 3;
-    }
-    //~^^^ ERROR `if` may be missing an `else` clause
-}
-
-fn foo2_let(bar: usize) -> usize {
-    let x: usize = if let 0 = 1 {
-        return 3;
-    };
-    //~^^^ ERROR `if` may be missing an `else` clause
-    x
-}
-
-fn foo3_let(bar: usize) -> usize {
-    if let 0 = 1 {
-        3
-    }
-    //~^^^ ERROR `if` may be missing an `else` clause
-}
-
-// FIXME(60254): deduplicate first error in favor of second.
-
-fn main() {
-    let _ = foo(1);
-}