Suggest to take and ignore args while closure args count mismatching #52647
Conversation
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 comment has been minimized.
This comment has been minimized.
rust-highfive
added
the
S-waiting-on-review
|
r? @estebank |
This comment has been minimized.
This comment has been minimized.
csmoe
force-pushed
the
closure_arg_ignore
branch
2 times, most recently
from
4f9f845
to
6ff4353
Compare
|
I think this could benefit from a ui test (maybe even a rustfix one?) |
csmoe
force-pushed
the
closure_arg_ignore
branch
from
6ff4353
to
a701870
Compare
This comment has been minimized.
This comment has been minimized.
csmoe
force-pushed
the
closure_arg_ignore
branch
from
a701870
to
a71deb2
Compare
csmoe
commented
Jul 24, 2018
| | ^^^^^^^ -- | ||
| | | | | ||
| | | takes 0 arguments | ||
| | | help: change the closure to take and ignore the arguments: `|_, _|` |
There was a problem hiding this comment.
@estebank the position of this help message is a bit weird since I span_suggestion_with_applicability the same way as the tuple-args do. what I want:
|
help: change the closure to take multiple arguments instead of a single tuple
|
LL | [1, 2, 3].sort_by(|tuple, tuple2| panic!());
| ^^^^^^^^^^^^^^^
How to fix this?
There was a problem hiding this comment.
Suggestions that have fewer than 10 words (among other things) are emitted as above, inline. Making the message longer is one of the ways of ensuring the separate suggestion line.
estebank
approved these changes
Jul 25, 2018
| .join(", "); | ||
| err.span_suggestion_with_applicability( | ||
| found_span, | ||
| &format!("change the closure to take and ignore the expected argument{}", |
There was a problem hiding this comment.
Nitpick: I feel that this would read better as "you can change the closure...". That way we don't imply to the user that this is what they must do, only something they can do.
| @@ -1050,6 +1050,29 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> { | |||
| if let Some(found_span) = found_span { | |||
| err.span_label(found_span, format!("takes {}", found_str)); | |||
|
|
|||
| // Suggest to take and ignore the arguments with expected_args_length `_`s if | |||
| // found arguments is empty(Suppose the user just wants to ignore args in this case). | |||
| // like `|_, _|` for closure with 2 expected args. | |||
There was a problem hiding this comment.
// Suggest to take and ignore the arguments with expected_args_length `_`s if
// found arguments is empty (assume the user just wants to ignore args in this case).
// For example, if `expected_args_length` is 2, suggest `|_, _|`.
|
@bors r+ |
|
📌 Commit 1d79588 has been approved by |
|
🌲 The tree is currently closed for pull requests below priority 99, this pull request will be tested once the tree is reopened |
bors
added
S-waiting-on-bors
Mark-Simulacrum
added a commit
to Mark-Simulacrum/rust
that referenced
this pull request
Jul 26, 2018
Suggest to take and ignore args while closure args count mismatching Closes rust-lang#52473
bors
added a commit
that referenced
this pull request
Jul 26, 2018
Rollup of 16 pull requests Successful merges: - #52558 (Add tests for ICEs which no longer repro) - #52610 (Clarify what a task is) - #52617 (Don't match on region kinds when reporting NLL errors) - #52635 (Fix #[linkage] propagation though generic functions) - #52647 (Suggest to take and ignore args while closure args count mismatching) - #52649 (Point spans to inner elements of format strings) - #52654 (Format linker args in a way that works for gcc and ld) - #52667 (update the stdsimd submodule) - #52674 (Impl Executor for Box<E: Executor>) - #52690 (ARM: expose `rclass` and `dsp` target features) - #52692 (Improve readability in a few sorts) - #52695 (Hide some lints which are not quite right the way they are reported to the user) - #52718 (State default capacity for BufReader/BufWriter) - #52721 (std::ops::Try impl for std::task::Poll) - #52723 (rustc: Register crates under their real names) - #52734 (sparc ABI issue - structure returning from function is returned in 64bit registers (with tests)) Failed merges: - #52678 ([NLL] Use better spans in some errors) r? @ghost
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #52473