Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 18 insertions, 0 deletions

diff --git a/tests/ui/generator/type-mismatch-signature-deduction.rs b/tests/ui/generator/type-mismatch-signature-deduction.rs
new file mode 100644
index 000000000..8d1ce6c7a
--- /dev/null
+++ b/tests/ui/generator/type-mismatch-signature-deduction.rs
@@ -0,0 +1,18 @@
+#![feature(generators, generator_trait)]
+
+use std::ops::Generator;
+
+fn foo() -> impl Generator<Return = i32> {
+    //~^ ERROR type mismatch
+    || {
+        if false {
+            return Ok(6);
+        }
+
+        yield ();
+
+        5 //~ ERROR mismatched types [E0308]
+    }
+}
+
+fn main() {}