bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

use verbose suggestions

Browse source
This commit is contained in:
lcnr 2022-05-24 09:57:14 +02:00
parent 3fe346e7a3
commit bc0d12cc6c
5 changed files with 26 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_infer/src/infer/error_reporting/need_type_info.rs
View file

@ -422,7 +422,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
(receiver.span.shrink_to_lo(), format!("{def_path}({adjustment}")), (receiver.span.shrink_to_lo(), format!("{def_path}({adjustment}")),
(receiver.span.shrink_to_hi().with_hi(successor.1), successor.0.to_string()), (receiver.span.shrink_to_hi().with_hi(successor.1), successor.0.to_string()),
]; ];
err.multipart_suggestion( err.multipart_suggestion_verbose(
"try using a fully qualified path to specify the expected types", "try using a fully qualified path to specify the expected types",
suggestion, suggestion,
Applicability::HasPlaceholders, Applicability::HasPlaceholders,
@ -441,7 +441,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
], ],
None => vec![(data.span(), format!("{}{}{}", arrow, ret, post))], None => vec![(data.span(), format!("{}{}{}", arrow, ret, post))],
}; };
err.multipart_suggestion( err.multipart_suggestion_verbose(
"try giving this closure an explicit return type", "try giving this closure an explicit return type",
suggestion, suggestion,
Applicability::HasPlaceholders, Applicability::HasPlaceholders,

9
src/test/ui/inference/cannot-infer-partial-try-return.stderr
View file

@ -2,9 +2,12 @@ error[E0282]: type annotations needed for `Result<(), QualifiedError<_>>`
--> $DIR/cannot-infer-partial-try-return.rs:18:13 --> $DIR/cannot-infer-partial-try-return.rs:18:13
| |
LL | let x = || -> Result<_, QualifiedError<_>> { LL | let x = || -> Result<_, QualifiedError<_>> {
| ^^^^^^---------------------------- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
| | |
| help: try giving this closure an explicit return type: `Result<(), QualifiedError<_>>` help: try giving this closure an explicit return type
|
LL | let x = || -> Result<(), QualifiedError<_>> {
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
error: aborting due to previous error error: aborting due to previous error

9
src/test/ui/suggestions/suggest-closure-return-type-1.stderr
View file

@ -2,9 +2,12 @@ error[E0282]: type annotations needed for `[_; 0]`
--> $DIR/suggest-closure-return-type-1.rs:4:18 --> $DIR/suggest-closure-return-type-1.rs:4:18
| |
LL | unbound_drop(|| -> _ { [] }); LL | unbound_drop(|| -> _ { [] });
| ^^^^^^- | ^^^^^^^
| | |
| help: try giving this closure an explicit return type: `[_; 0]` help: try giving this closure an explicit return type
|
LL | unbound_drop(|| -> [_; 0] { [] });
| ~~~~~~
error: aborting due to previous error error: aborting due to previous error

7
src/test/ui/suggestions/suggest-closure-return-type-2.stderr
View file

@ -2,7 +2,12 @@ error[E0282]: type annotations needed for `[_; 0]`
--> $DIR/suggest-closure-return-type-2.rs:4:18 --> $DIR/suggest-closure-return-type-2.rs:4:18
| |
LL | unbound_drop(|| { [] }) LL | unbound_drop(|| { [] })
| ^^ - help: try giving this closure an explicit return type: `-> [_; 0]` | ^^
|
help: try giving this closure an explicit return type
|
LL | unbound_drop(|| -> [_; 0] { [] })
| +++++++++
error: aborting due to previous error error: aborting due to previous error

7
src/test/ui/type-inference/or_else-multiple-type-params.stderr
View file

@ -2,7 +2,12 @@ error[E0282]: type annotations needed for `Result<Child, F>`
--> $DIR/or_else-multiple-type-params.rs:7:18 --> $DIR/or_else-multiple-type-params.rs:7:18
| |
LL | .or_else(|err| { LL | .or_else(|err| {
| ^^^^^ - help: try giving this closure an explicit return type: `-> Result<Child, F>` | ^^^^^
|
help: try giving this closure an explicit return type
|
LL | .or_else(|err| -> Result<Child, F> {
| +++++++++++++++++++
error: aborting due to previous error error: aborting due to previous error