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

Update rustc-ux-guidelines #41836

Merged
merged 2 commits into from
May 9, 2017
Merged

Update rustc-ux-guidelines #41836

merged 2 commits into from
May 9, 2017

Conversation

jz0425
Copy link
Contributor

@jz0425 jz0425 commented May 8, 2017

  1. changed "long way into" to "long way toward"
  2. changed "developer lives" to "developers' lives"
  3. removed the "either... or..." format from second paragraph because there are more than 2 options
  4. Minor revisions to paragraphs 3-6 to make them more consistent in format and to fix minor grammar issues.

1) changed "long way into" to "long way toward"
2) changed "developer lives" to "developers' lives"
3) removed the "either... or..." format from second paragraph because there are more than 2 options
4) Minor revisions to paragraphs 3-6 to make them more consistent in format and to fix minor grammar issues.
@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 @frewsxcv (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.

@Mark-Simulacrum Mark-Simulacrum added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 8, 2017
@Mark-Simulacrum
Copy link
Member

Thanks for the contribution! I think the title of your PR was copy pasted incorrectly, though. Changes look good to me, but I'll leave to @frewsxcv for an official review.

information to the user about how to solve their problem.

A `note` is for identifying additional circumstances and parts of the code
that lead to a warning or error. For example, the borrow checker will note any
A `note` to emitted to identify additional circumstances and parts of the code
Copy link
Member

Choose a reason for hiding this comment

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

A note to emitted to identify...

The wording here seems a little off and I'm having trouble understanding the intention. Maybe you mean:

A note is emitted to identify...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, that is what I meant, thanks for the catch. Should I update and do a new PR?

"A `note` to emitted to" changed to "A `note` is emitted to"
@frewsxcv
Copy link
Member

frewsxcv commented May 9, 2017

thanks for these improvements!

@bors r+ rollup

@bors
Copy link
Contributor

bors commented May 9, 2017

📌 Commit 9b8f9b7 has been approved by frewsxcv

@Mark-Simulacrum Mark-Simulacrum changed the title @bors: r+ 38fe8d2 rollup Update rustc-ux-guidelines May 9, 2017
frewsxcv added a commit to frewsxcv/rust that referenced this pull request May 9, 2017
@bors: r+ 38fe8d2 rollup

1) changed "long way into" to "long way toward"
2) changed "developer lives" to "developers' lives"
3) removed the "either... or..." format from second paragraph because there are more than 2 options
4) Minor revisions to paragraphs 3-6 to make them more consistent in format and to fix minor grammar issues.
bors added a commit that referenced this pull request May 9, 2017
Rollup of 8 pull requests

- Successful merges: #41293, #41520, #41827, #41828, #41833, #41836, #41838, #41842
- Failed merges:
@bors bors merged commit 9b8f9b7 into rust-lang:master May 9, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants