From 218caa410aa38c29984be31a5229b9fa717560ee Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 17 Apr 2024 14:19:13 +0200
Subject: Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 tests/ui/try-block/try-block-bad-type.stderr | 42 ++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 tests/ui/try-block/try-block-bad-type.stderr

(limited to 'tests/ui/try-block/try-block-bad-type.stderr')

diff --git a/tests/ui/try-block/try-block-bad-type.stderr b/tests/ui/try-block/try-block-bad-type.stderr
new file mode 100644
index 000000000..e11c3f810
--- /dev/null
+++ b/tests/ui/try-block/try-block-bad-type.stderr
@@ -0,0 +1,42 @@
+error[E0277]: `?` couldn't convert the error to `TryFromSliceError`
+  --> $DIR/try-block-bad-type.rs:7:16
+   |
+LL |         Err("")?;
+   |                ^ the trait `From<&str>` is not implemented for `TryFromSliceError`
+   |
+   = note: the question mark operation (`?`) implicitly performs a conversion on the error value using the `From` trait
+   = help: the trait `From<Infallible>` is implemented for `TryFromSliceError`
+   = note: required for `Result<u32, TryFromSliceError>` to implement `FromResidual<Result<Infallible, &str>>`
+
+error[E0271]: type mismatch resolving `<Result<i32, i32> as Try>::Output == &str`
+  --> $DIR/try-block-bad-type.rs:12:9
+   |
+LL |         ""
+   |         ^^ expected `i32`, found `&str`
+
+error[E0271]: type mismatch resolving `<Result<i32, i32> as Try>::Output == ()`
+  --> $DIR/try-block-bad-type.rs:15:39
+   |
+LL |     let res: Result<i32, i32> = try { };
+   |                                       ^ expected `i32`, found `()`
+
+error[E0277]: a `try` block must return `Result` or `Option` (or another type that implements `Try`)
+  --> $DIR/try-block-bad-type.rs:17:25
+   |
+LL |     let res: () = try { };
+   |                         ^ could not wrap the final value of the block as `()` doesn't implement `Try`
+   |
+   = help: the trait `Try` is not implemented for `()`
+
+error[E0277]: a `try` block must return `Result` or `Option` (or another type that implements `Try`)
+  --> $DIR/try-block-bad-type.rs:20:26
+   |
+LL |     let res: i32 = try { 5 };
+   |                          ^ could not wrap the final value of the block as `i32` doesn't implement `Try`
+   |
+   = help: the trait `Try` is not implemented for `i32`
+
+error: aborting due to 5 previous errors
+
+Some errors have detailed explanations: E0271, E0277.
+For more information about an error, try `rustc --explain E0271`.
-- 
cgit v1.2.3