diff options
| author | kennytm <kennytm@gmail.com> | 2018-03-30 01:31:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-30 01:31:13 +0200 |
| commit | d06abdbfd8ddedddb384ed155315275d87d34ecf (patch) | |
| tree | 7cd1399eab94ca90fe0c80d9ea588e3e6ef5cd8e | |
| parent | eb3e2feb0d2de2b9e54a51216f0c53c7962cfc10 (diff) | |
| parent | 1f143bc46fe04aa564736b4741a8f179c46eccc5 (diff) | |
| download | rust-d06abdbfd8ddedddb384ed155315275d87d34ecf.tar.gz rust-d06abdbfd8ddedddb384ed155315275d87d34ecf.zip | |
Rollup merge of #49446 - frewsxcv:frewsxcv-mention-optiono, r=GuillaumeGomez
Explicitly mention `Option` in `?` error message. Save users the time/effort of having to lookup what types implement the `Try` trait.
| -rw-r--r-- | src/libcore/ops/try.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/suggestions/try-on-option.stderr | 2 | ||||
| -rw-r--r-- | src/test/ui/suggestions/try-operator-on-main.stderr | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/libcore/ops/try.rs b/src/libcore/ops/try.rs index 81e5cb5c350..ef6a8fb6a61 100644 --- a/src/libcore/ops/try.rs +++ b/src/libcore/ops/try.rs @@ -20,7 +20,7 @@ any(from_method="from_error", from_method="from_ok"), from_desugaring="?"), message="the `?` operator can only be used in a \ - function that returns `Result` \ + function that returns `Result` or `Option` \ (or another type that implements `{Try}`)", label="cannot use the `?` operator in a function that returns `{Self}`"), on(all(from_method="into_result", from_desugaring="?"), diff --git a/src/test/ui/suggestions/try-on-option.stderr b/src/test/ui/suggestions/try-on-option.stderr index aee52808f1e..265ee593bb7 100644 --- a/src/test/ui/suggestions/try-on-option.stderr +++ b/src/test/ui/suggestions/try-on-option.stderr @@ -6,7 +6,7 @@ LL | x?; //~ the trait bound | = note: required by `std::convert::From::from` -error[E0277]: the `?` operator can only be used in a function that returns `Result` (or another type that implements `std::ops::Try`) +error[E0277]: the `?` operator can only be used in a function that returns `Result` or `Option` (or another type that implements `std::ops::Try`) --> $DIR/try-on-option.rs:23:5 | LL | x?; //~ the `?` operator diff --git a/src/test/ui/suggestions/try-operator-on-main.stderr b/src/test/ui/suggestions/try-operator-on-main.stderr index 7536bbcd2db..121ae14f999 100644 --- a/src/test/ui/suggestions/try-operator-on-main.stderr +++ b/src/test/ui/suggestions/try-operator-on-main.stderr @@ -1,4 +1,4 @@ -error[E0277]: the `?` operator can only be used in a function that returns `Result` (or another type that implements `std::ops::Try`) +error[E0277]: the `?` operator can only be used in a function that returns `Result` or `Option` (or another type that implements `std::ops::Try`) --> $DIR/try-operator-on-main.rs:19:5 | LL | std::fs::File::open("foo")?; //~ ERROR the `?` operator can only |