Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 26 deletions

diff --git a/src/test/ui/let-else/let-else-temp-borrowck.rs b/src/test/ui/let-else/let-else-temp-borrowck.rs
deleted file mode 100644
index 6b4642d2f..000000000
--- a/src/test/ui/let-else/let-else-temp-borrowck.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-// run-pass
-//
-// from issue #93951, where borrowck complained the temporary that `foo(&x)` was stored in was to
-// be dropped sometime after `x` was. It then suggested adding a semicolon that was already there.
-
-
-use std::fmt::Debug;
-
-fn foo<'a>(x: &'a str) -> Result<impl Debug + 'a, ()> {
-    Ok(x)
-}
-
-fn let_else() {
-    let x = String::from("Hey");
-    let Ok(_) = foo(&x) else { return };
-}
-
-fn if_let() {
-    let x = String::from("Hey");
-    let _ = if let Ok(s) = foo(&x) { s } else { return };
-}
-
-fn main() {
-    let_else();
-    if_let();
-}