Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 24 deletions

diff --git a/src/test/ui/suggestions/opaque-type-error.rs b/src/test/ui/suggestions/opaque-type-error.rs
deleted file mode 100644
index 5e1147403..000000000
--- a/src/test/ui/suggestions/opaque-type-error.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-// edition:2018
-use core::future::Future;
-
-async fn base_thing() -> Result<(), ()> {
-    Ok(())
-}
-
-fn thing_one() -> impl Future<Output = Result<(), ()>> {
-    base_thing()
-}
-
-fn thing_two() -> impl Future<Output = Result<(), ()>> {
-    base_thing()
-}
-
-async fn thing() -> Result<(), ()> {
-    if true {
-        thing_one()
-    } else {
-        thing_two() //~ ERROR `if` and `else` have incompatible types
-    }.await
-}
-
-fn main() {}