Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 59 deletions

diff --git a/src/test/ui/suggestions/enum-method-probe.fixed b/src/test/ui/suggestions/enum-method-probe.fixed
deleted file mode 100644
index 6499c92bc..000000000
--- a/src/test/ui/suggestions/enum-method-probe.fixed
+++ /dev/null
@@ -1,59 +0,0 @@
-// compile-flags: --edition=2021
-// run-rustfix
-
-#![allow(unused)]
-
-struct Foo;
-
-impl Foo {
-    fn get(&self) -> u8 {
-        42
-    }
-}
-
-fn test_result_in_result() -> Result<(), ()> {
-    let res: Result<_, ()> = Ok(Foo);
-    res?.get();
-    //~^ ERROR no method named `get` found for enum `Result` in the current scope
-    //~| HELP use the `?` operator
-    Ok(())
-}
-
-async fn async_test_result_in_result() -> Result<(), ()> {
-    let res: Result<_, ()> = Ok(Foo);
-    res?.get();
-    //~^ ERROR no method named `get` found for enum `Result` in the current scope
-    //~| HELP use the `?` operator
-    Ok(())
-}
-
-fn test_result_in_unit_return() {
-    let res: Result<_, ()> = Ok(Foo);
-    res.expect("REASON").get();
-    //~^ ERROR no method named `get` found for enum `Result` in the current scope
-    //~| HELP consider using `Result::expect` to unwrap the `Foo` value, panicking if the value is a `Result::Err`
-}
-
-async fn async_test_result_in_unit_return() {
-    let res: Result<_, ()> = Ok(Foo);
-    res.expect("REASON").get();
-    //~^ ERROR no method named `get` found for enum `Result` in the current scope
-    //~| HELP consider using `Result::expect` to unwrap the `Foo` value, panicking if the value is a `Result::Err`
-}
-
-fn test_option_in_option() -> Option<()> {
-    let res: Option<_> = Some(Foo);
-    res?.get();
-    //~^ ERROR no method named `get` found for enum `Option` in the current scope
-    //~| HELP use the `?` operator
-    Some(())
-}
-
-fn test_option_in_unit_return() {
-    let res: Option<_> = Some(Foo);
-    res.expect("REASON").get();
-    //~^ ERROR no method named `get` found for enum `Option` in the current scope
-    //~| HELP consider using `Option::expect` to unwrap the `Foo` value, panicking if the value is an `Option::None`
-}
-
-fn main() {}