Add long error explanation for E0573 #65234
Merged
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
|
Some changes occurred in diagnostic error codes |
|
r? @estebank (rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
100 tasks
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
GuillaumeGomez
force-pushed
the
long-err-explanation-E0573
branch
from
9c59e3a to
f2255b4
Compare
|
☔ The latest upstream changes (presumably #65454) made this pull request unmergeable. Please resolve the merge conflicts. |
GuillaumeGomez
force-pushed
the
long-err-explanation-E0573
branch
from
f2255b4 to
33779fb
Compare
|
r? @kinnison |
kinnison
suggested changes
Oct 16, 2019
src/librustc_resolve/error_codes.rs
Outdated
| @@ -1611,6 +1611,80 @@ fn print_on_failure(state: &State) { | |||
| ``` | |||
| "##, | |||
|
|
|||
| E0573: r##" | |||
| Something else than a type has been used when one was expected. | |||
There was a problem hiding this comment.
I'd suggest 'other' rather than 'else' here.
Something other than a type has been used when one was expected.
src/librustc_resolve/error_codes.rs
Outdated
| ``` | ||
|
|
||
| In all these errors, a type was expected. For example, in the first error, | ||
| if we want to return `Born` variant from the `Dragon` enum, we have set the |
There was a problem hiding this comment.
I'd suggest:
if we want to return the
Bornvariant from theDragonenum, we must make the
function return theDragonenum and not its variant:
GuillaumeGomez
force-pushed
the
long-err-explanation-E0573
branch
from
33779fb to
ae4bbbb
Compare
|
Updated! |
kinnison
suggested changes
Oct 16, 2019
src/librustc_resolve/error_codes.rs
Outdated
Comment on lines
1641
to
1643
| In all these errors, a type was expected. For example, in the first error, if | ||
| we want to return the `Born` variant from the `Dragon` enum, we have set the | ||
| function returning the enum and not its variant: |
There was a problem hiding this comment.
This still doesn't quite read nicely.
If you replace 'we have set the function returning' with 'we must set the function to return' then it would read better.
GuillaumeGomez
force-pushed
the
long-err-explanation-E0573
branch
from
ae4bbbb to
7d357fb
Compare
|
Updated. |
|
@bors: r=kinnison |
|
📌 Commit 7d357fb has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Oct 17, 2019
…innison Add long error explanation for E0573 Part of #61137.
|
☀️ Test successful - checks-azure |
rust-highfive
added a commit
to rust-lang-nursery/rust-toolstate
that referenced
this pull request
Oct 17, 2019
Tested on commit rust-lang/rust@7e49800. Direct link to PR: <rust-lang/rust#65234> 💔 rls on linux: test-pass → test-fail (cc @Xanewok, @rust-lang/infra).
ryoqun
reviewed
Oct 18, 2019
| } | ||
|
|
||
| trait Isengard { | ||
| fn wizard(w: Wizard) { // error! |
There was a problem hiding this comment.
Hi, just a random late comment from an outsider... Should the // error! commet be removed because this is a corrected example, shouldn't it?
There was a problem hiding this comment.
Excellent point! We completely missed it... Do you want to send a PR to fix it?
There was a problem hiding this comment.
@GuillaumeGomez Hi, I just created one! #65620
JohnTitor
added a commit
to JohnTitor/rust
that referenced
this pull request
Oct 21, 2019
…arkor Correctly note code as Ok not error for E0573 Hi, this is my first pull request to the Rust project. The fix is very small one just to fix an oversight in a comment. Namely, [this documentation PR](rust-lang#65234) added a longer explanation for E0573. It illustrated the error using erroneous/corrected contrasting examples. But it accidentally forgot to remove `// error` from the corrected example. Sadly, I found the error after the PR got merged. [As suggested by the original author](https://github.com/rust-lang/rust/pull/65234/files#r336518549) of the PR, I created an PR to fix this. Part of rust-lang#61137.
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.
Part of #61137.