Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 22 insertions, 0 deletions

diff --git a/tests/ui/try-trait/try-operator-on-main.rs b/tests/ui/try-trait/try-operator-on-main.rs
new file mode 100644
index 000000000..3b364f7e7
--- /dev/null
+++ b/tests/ui/try-trait/try-operator-on-main.rs
@@ -0,0 +1,22 @@
+#![feature(try_trait_v2)]
+
+use std::ops::Try;
+
+fn main() {
+    // error for a `Try` type on a non-`Try` fn
+    std::fs::File::open("foo")?; //~ ERROR the `?` operator can only
+
+    // a non-`Try` type on a non-`Try` fn
+    ()?; //~ ERROR the `?` operator can only be applied to
+    //~^ ERROR the `?` operator can only be used in a function that
+
+    // an unrelated use of `Try`
+    try_trait_generic::<()>(); //~ ERROR the trait bound
+}
+
+fn try_trait_generic<T: Try>() -> T {
+    // and a non-`Try` object on a `Try` fn.
+    ()?; //~ ERROR the `?` operator can only be applied to values that implement `Try`
+
+    loop {}
+}