Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correctly note code as Ok not error for E0573 #65620

Merged
merged 1 commit into from
Oct 21, 2019

Conversation

ryoqun
Copy link
Contributor

@ryoqun ryoqun commented Oct 20, 2019

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 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 of the PR, I created an PR to fix this.

Part of #61137.

@rust-highfive
Copy link
Collaborator

Some changes occurred in diagnostic error codes

cc @GuillaumeGomez

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @varkor (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 20, 2019
@@ -1682,7 +1682,7 @@ enum Wizard {
}

trait Isengard {
fn wizard(w: Wizard) { // error!
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please replace "// error!" with "// ok!"

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done! c1422e68eaea6ec9e20da9ca2c6aae1febd002a8

@varkor varkor assigned GuillaumeGomez and unassigned varkor Oct 20, 2019
@varkor
Copy link
Member

varkor commented Oct 20, 2019

@ryoqun: great, if you could squash your two commits into one, this looks good to go!

@ryoqun ryoqun force-pushed the remove-unneeded-comment branch from c1422e6 to b56b8a2 Compare October 21, 2019 00:25
@ryoqun ryoqun force-pushed the remove-unneeded-comment branch from b56b8a2 to 101e1f6 Compare October 21, 2019 00:27
@ryoqun
Copy link
Contributor Author

ryoqun commented Oct 21, 2019

@varkor Thanks! I squashed!

@varkor
Copy link
Member

varkor commented Oct 21, 2019

@ryoqun: thanks!

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Oct 21, 2019

📌 Commit 101e1f6 has been approved by varkor

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 21, 2019
@bors
Copy link
Contributor

bors commented Oct 21, 2019

💡 This pull request was already approved, no need to approve it again.

  • There's another pull request that is currently being tested, blocking this pull request: bump miri #65594

@bors
Copy link
Contributor

bors commented Oct 21, 2019

📌 Commit 101e1f6 has been approved by varkor

@ryoqun ryoqun changed the title Remove unneeded comment Correctly note code as Ok not error for E0573 Oct 21, 2019
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.
bors added a commit that referenced this pull request Oct 21, 2019
Rollup of 5 pull requests

Successful merges:

 - #65544 (Added doc on keyword break)
 - #65620 (Correctly note code as Ok not error for E0573)
 - #65624 ([mir-opt] Improve SimplifyLocals pass so it can remove unused consts)
 - #65650 (use unwrap_or in lint code)
 - #65652 (Fix `canonicalize_const_var` leaking inference variables)

Failed merges:

r? @ghost
bors added a commit that referenced this pull request Oct 21, 2019
Rollup of 5 pull requests

Successful merges:

 - #65544 (Added doc on keyword break)
 - #65620 (Correctly note code as Ok not error for E0573)
 - #65624 ([mir-opt] Improve SimplifyLocals pass so it can remove unused consts)
 - #65650 (use unwrap_or in lint code)
 - #65652 (Fix `canonicalize_const_var` leaking inference variables)

Failed merges:

r? @ghost
@bors bors merged commit 101e1f6 into rust-lang:master Oct 21, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants