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/generator/type-mismatch-error.rs b/src/test/ui/generator/type-mismatch-error.rs
deleted file mode 100644
index d39c788a8..000000000
--- a/src/test/ui/generator/type-mismatch-error.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-//! Test that we get the expected type mismatch error instead of "closure is expected to take 0
-//! arguments" (which got introduced after implementing resume arguments).
-
-#![feature(generators, generator_trait)]
-
-use std::ops::Generator;
-
-fn f<G: Generator>(_: G, _: G::Return) {}
-
-fn main() {
-    f(
-        |a: u8| {
-            if false {
-                yield ();
-            } else {
-                a
-                //~^ error: `if` and `else` have incompatible types
-            }
-        },
-        0u8,
-    );
-}