-
Notifications
You must be signed in to change notification settings - Fork 13k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rollup merge of #96271 - compiler-errors:suggest-question-mark, r=est…
…ebank suggest `?` when method is missing on `Result<T, _>` but found on `T` The wording needs help, I think. Fixes #95729
- Loading branch information
Showing
4 changed files
with
368 additions
and
52 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| // 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() {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| // 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.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.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.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() {} |
Oops, something went wrong.