Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 47 deletions

diff --git a/src/test/ui/try-trait/try-on-option-diagnostics.rs b/src/test/ui/try-trait/try-on-option-diagnostics.rs
deleted file mode 100644
index 7ffa0de6c..000000000
--- a/src/test/ui/try-trait/try-on-option-diagnostics.rs
+++ /dev/null
@@ -1,47 +0,0 @@
-// edition:2018
-
-fn main() {}
-
-fn a_function() -> u32 {
-    let x: Option<u32> = None;
-    x?; //~ ERROR the `?` operator
-    22
-}
-
-fn a_closure() -> u32 {
-    let a_closure = || {
-        let x: Option<u32> = None;
-        x?; //~ ERROR the `?` operator
-        22
-    };
-    a_closure()
-}
-
-fn a_method() -> u32 {
-    struct S;
-
-    impl S {
-        fn a_method() {
-            let x: Option<u32> = None;
-            x?; //~ ERROR the `?` operator
-        }
-    }
-
-    S::a_method();
-    22
-}
-
-fn a_trait_method() -> u32 {
-    struct S;
-    trait T {
-        fn a_trait_method() {
-            let x: Option<u32> = None;
-            x?; //~ ERROR the `?` operator
-        }
-    }
-
-    impl T for S { }
-
-    S::a_trait_method();
-    22
-}