Adding upstream version 1.64.0+dfsg1.upstream/1.64.0+dfsg1

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

1 files changed, 21 insertions, 0 deletions

diff --git a/src/test/ui/try-block/try-block-bad-type.rs b/src/test/ui/try-block/try-block-bad-type.rs
new file mode 100644
index 000000000..30ae96763
--- /dev/null
+++ b/src/test/ui/try-block/try-block-bad-type.rs
@@ -0,0 +1,21 @@
+// compile-flags: --edition 2018
+
+#![feature(try_blocks)]
+
+pub fn main() {
+    let res: Result<u32, std::array::TryFromSliceError> = try {
+        Err("")?; //~ ERROR `?` couldn't convert the error
+        5
+    };
+
+    let res: Result<i32, i32> = try {
+        "" //~ ERROR type mismatch
+    };
+
+    let res: Result<i32, i32> = try { }; //~ ERROR type mismatch
+
+    let res: () = try { };
+    //~^ ERROR a `try` block must return `Result` or `Option`
+
+    let res: i32 = try { 5 }; //~ ERROR a `try` block must return `Result` or `Option`
+}