Tweak output on E0599 for assoc fn used as method#51135
Merged
bors merged 5 commits intorust-lang:masterfrom Jun 2, 2018
Merged
Tweak output on E0599 for assoc fn used as method#51135bors merged 5 commits intorust-lang:masterfrom
bors merged 5 commits intorust-lang:masterfrom
Conversation
When encountering an unexisting method for a given trait where an associated function has the same name, suggest using the appropriate syntax, instead of using `help` text. When only one candidate is found, do not call it "candidate rust-lang#1", just call it "the candidate".
Contributor
|
(rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
oli-obk
reviewed
May 28, 2018
Contributor
oli-obk
left a comment
oli-obk
left a comment
There was a problem hiding this comment.
Doesn't need to be acted upon in this PR, just some thoughts of what we should think about in the future
| if static_sources.len() == 1 { | ||
| if let Some(expr) = rcvr_expr { | ||
| err.span_suggestion(expr.span.to(span), | ||
| "use associated function syntax intead", |
| } | ||
| if static_sources.len() == 1 { | ||
| if let Some(expr) = rcvr_expr { | ||
| err.span_suggestion(expr.span.to(span), |
Contributor
There was a problem hiding this comment.
Why is only the single source case a suggestion?
| } else { | ||
| let limit = if candidates.len() == 5 { 5 } else { 4 }; | ||
| for (i, trait_did) in candidates.iter().take(limit).enumerate() { | ||
| msg.push_str(&format!("\ncandidate #{}: `use {};`", |
Contributor
There was a problem hiding this comment.
These should probably become a real suggestion, in which case you don't need manual limiting anymore, because the renderer takes care of that
Contributor
There was a problem hiding this comment.
The suggestions for inserting use statements do that already
Contributor
Author
There was a problem hiding this comment.
Suggestions currently do not preserve their position in the output, they always come at then end. I need to change that for the first requested fix.
Contributor
|
r? @oli-obk |
Contributor
Author
|
ping @oli-obk |
Contributor
|
@bors r+ |
Collaborator
|
📌 Commit 59b03b1 has been approved by |
bors
added
S-waiting-on-bors
Mark-Simulacrum
added a commit
to Mark-Simulacrum/rust
that referenced
this pull request
Jun 1, 2018
Tweak output on E0599 for assoc fn used as method - Use suggestion instead of `help` when possible - Add primary span label - Remove incorrect `help` suggestion using incorrect syntax - Do not refer to only one possible candidate as `candidate #1`, refer to it as `the candidate`
bors
added a commit
that referenced
this pull request
Jun 2, 2018
Rollup of 5 pull requests Successful merges: - #51135 (Tweak output on E0599 for assoc fn used as method) - #51152 (Replace `if` with `if and only if` in the definition dox of `Sync`) - #51262 (Add missing whitespace in num example) - #51272 (Remove feature flag from fs::read_to_string example) - #51286 (Pull 1.26.2 release notes into master) Failed merges:
Collaborator
Collaborator
|
💥 Test timed out |
bors
added
S-waiting-on-review
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
helpwhen possiblehelpsuggestion using incorrect syntaxcandidate #1, refer to it asthe candidate