diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-05-19 02:31:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-19 02:31:39 +0200 |
| commit | 80d372f7cdb40a1e1cf1060fea1aed9a076ebbf3 (patch) | |
| tree | 8bc8512b5e7dba156cd1e4bacae79de44e60aa0c /src | |
| parent | dc7cbb697b916cdd89d243da1383207e73fe19f0 (diff) | |
| parent | 65b731908abee2bb8b0af50d18567eb4abaa4ac2 (diff) | |
Rollup merge of #60924 - estebank:try-msg, r=petrochenkov
Explain that ? converts the error type using From Fix #60917.
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc/traits/error_reporting.rs | 9 | ||||
| -rw-r--r-- | src/test/ui/issues/issue-32709.stderr | 1 | ||||
| -rw-r--r-- | src/test/ui/try-block/try-block-bad-type.stderr | 1 | ||||
| -rw-r--r-- | src/test/ui/try-on-option.stderr | 1 |
4 files changed, 9 insertions, 3 deletions
diff --git a/src/librustc/traits/error_reporting.rs b/src/librustc/traits/error_reporting.rs index df268839710..9019c4a0575 100644 --- a/src/librustc/traits/error_reporting.rs +++ b/src/librustc/traits/error_reporting.rs @@ -643,13 +643,16 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> { .map(|s| &s == "?") .unwrap_or(false); let is_from = format!("{}", trait_ref).starts_with("std::convert::From<"); - let message = if is_try && is_from { - Some(format!( + let (message, note) = if is_try && is_from { + (Some(format!( "`?` couldn't convert the error to `{}`", trait_ref.self_ty(), + )), Some( + "the question mark operation (`?`) implicitly performs a \ + conversion on the error value using the `From` trait".to_owned() )) } else { - message + (message, note) }; let mut err = struct_span_err!( diff --git a/src/test/ui/issues/issue-32709.stderr b/src/test/ui/issues/issue-32709.stderr index 84cca5b20af..04b8c3aa353 100644 --- a/src/test/ui/issues/issue-32709.stderr +++ b/src/test/ui/issues/issue-32709.stderr @@ -4,6 +4,7 @@ error[E0277]: `?` couldn't convert the error to `()` LL | Err(5)?; | ^ the trait `std::convert::From<{integer}>` is not implemented for `()` | + = note: the question mark operation (`?`) implicitly performs a conversion on the error value using the `From` trait = note: required by `std::convert::From::from` error: aborting due to previous error diff --git a/src/test/ui/try-block/try-block-bad-type.stderr b/src/test/ui/try-block/try-block-bad-type.stderr index 7c7366df1dc..e1c2c6b675e 100644 --- a/src/test/ui/try-block/try-block-bad-type.stderr +++ b/src/test/ui/try-block/try-block-bad-type.stderr @@ -4,6 +4,7 @@ error[E0277]: `?` couldn't convert the error to `i32` LL | Err("")?; | ^ the trait `std::convert::From<&str>` is not implemented for `i32` | + = note: the question mark operation (`?`) implicitly performs a conversion on the error value using the `From` trait = help: the following implementations were found: <i32 as std::convert::From<bool>> <i32 as std::convert::From<i16>> diff --git a/src/test/ui/try-on-option.stderr b/src/test/ui/try-on-option.stderr index 4465fbe14b7..db5046f8c15 100644 --- a/src/test/ui/try-on-option.stderr +++ b/src/test/ui/try-on-option.stderr @@ -4,6 +4,7 @@ error[E0277]: `?` couldn't convert the error to `()` LL | x?; | ^ the trait `std::convert::From<std::option::NoneError>` is not implemented for `()` | + = note: the question mark operation (`?`) implicitly performs a conversion on the error value using the `From` trait = note: required by `std::convert::From::from` error[E0277]: the `?` operator can only be used in a function that returns `Result` or `Option` (or another type that implements `std::ops::Try`) |