Skip to content

Fix #664: Review Oxford comma usage. - #668

Merged
Havvy merged 1 commit into
rust-lang:masterfrom
hawkinsw:oxford_commas
Sep 3, 2019
Merged

Fix #664: Review Oxford comma usage.#668
Havvy merged 1 commit into
rust-lang:masterfrom
hawkinsw:oxford_commas

Conversation

@hawkinsw

@hawkinswhawkinsw commented Sep 2, 2019

Copy link
Copy Markdown
Contributor

This is an update to correct for the places where the Oxford
comma is not used.

Havvy
Havvy suggested changes Sep 2, 2019
View reviewed changes

@HavvyHavvy left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Other than where noted, the changes are good.

Comment threadsrc/conditional-compilation.md
Comment threadsrc/const_eval.md
Comment threadsrc/dynamically-sized-types.md Outdated
Comment threadsrc/expressions.md Outdated
Comment threadsrc/expressions/block-expr.md Outdated
@hawkinsw

hawkinsw commented Sep 2, 2019

Copy link
Copy Markdown
ContributorAuthor

Thanks @Havvy !! I was getting delirious looking at these and I appreciate the extra set of eyes. I will address your comments first thing tomorrow and send a follow-up. Thanks again!

@hawkinsw

hawkinsw commented Sep 2, 2019

Copy link
Copy Markdown
ContributorAuthor

@Havvy A new version is up that should address your feedback! Thanks!!

Havvy
Havvy suggested changes Sep 3, 2019
View reviewed changes

@HavvyHavvy left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

r+=me with these four suggestions.

Comment threadsrc/expressions.md Outdated
Comment threadsrc/expressions/block-expr.md Outdated
Comment threadsrc/dynamically-sized-types.md Outdated
<abbr title="dynamically sized type">DST</abbr>.

Notably: [variables], function parameters, [const] and [static] items must be
***Note***: [variables], function parameters, [const] items, and [static] items must be

@HavvyHavvySep 3, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Only need asterisks, and I forgot to mention the blockquote. Introduction.md is the source of truth here.

Suggested change
***Note***: [variables], function parameters, [const] items, and [static] items must be
> **Note**: [variables], function parameters, [const] items, and [static] items must be

Comment threadsrc/items/associated-items.md Outdated
`&'lifetime mut self` | `self: &'lifetime mut Self`

> Note: Lifetimes can be and usually are elided with this shorthand.
> Note: Lifetimes can be, and usually are, elided with this shorthand.

@HavvyHavvySep 3, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

While we're correcting this line, here's another correction.

Suggested change
> Note: Lifetimes can be, and usually are, elided with this shorthand.
> **Note**: Lifetimes can be, and usually are, elided with this shorthand.

@hawkinsw
Fix#664: Review Oxford comma usage.
af1cf6d
This is an update to correct for the places where the Oxford
comma is not used.
@hawkinsw

hawkinsw commented Sep 3, 2019

Copy link
Copy Markdown
ContributorAuthor

Thanks @Havvy for all the feedback on this. I am looking forward to digging in to other issues if/when we have this resolved! If you had time, I'd love some suggestions on where to look for opportunities.

@Havvy
Havvy merged commit 090c015 into rust-lang:masterSep 3, 2019
@Havvy

Havvy commented Sep 3, 2019

Copy link
Copy Markdown
Contributor

💟 Thanks for going through the back and forth on this. The open issues list has quite a few things worth checking out, though many require doing research into how the language works. Feel free to work on anything you want.

@hawkinsw

hawkinsw commented Sep 3, 2019

Copy link
Copy Markdown
ContributorAuthor

heart_decoration Thanks for going through the back and forth on this. The open issues list has quite a few things worth checking out, though many require doing research into how the language works.

Good, because this is exactly what I want! I am a PL nerd so this stuff really excites me! Thanks again for working with me on this!

@ehussehuss mentioned this pull request Sep 4, 2019
Merged
bors added a commit to rust-lang/rust that referenced this pull request Sep 4, 2019
@bors
Auto merge of#64150- ehuss:update-cargo-books, r=alexcrichton
f257c40
Update cargo, books
## cargo
8 commits in 22f7dd0495cd72ce2082d318d5a9b4dccb9c5b8c..fe0e5a48b75da2b405c8ce1ba2674e174ae11d5d
2019-08-27 16:10:51 +0000 to 2019-09-04 00:51:27 +0000
- Rename `--all` to `--workspace` (rust-lang/cargo#7241)
- Basic standard library support. (rust-lang/cargo#7216)
- Allow using 'config.toml' instead of just 'config' files. (rust-lang/cargo#7295)
- Retry on SSL Connect Error. (rust-lang/cargo#7318)
- minimal-copy `deserialize` for `InternedString` (rust-lang/cargo#7310)
- Fix typo in cargo vendor examples (rust-lang/cargo#7320)
- Fixes around multiple `[patch]` per crate (rust-lang/cargo#7303)
- Improve error messages on mkdir failure (rust-lang/cargo#7306)
## reference
7 commits in d191a0c..090c015
2019-08-15 08:42:23 +0200 to 2019-09-03 13:59:28 -0700
- Fixrust-lang/reference#664: Review Oxford comma usage. (rust-lang/reference#668)
- Fix some links. (rust-lang/reference#667)
- Remove trait object warning. (rust-lang/reference#666)
- Specify pattern types in `let` statements and `for` expressions (rust-lang/reference#663)
- Fix loop expression link. (rust-lang/reference#662)
- async-await initial reference material (rust-lang/reference#635)
- Correct errors in the reference of extern functions definitions and declarations (rust-lang/reference#652)
## rust-by-example
1 commits in 580839d90aacd537f0293697096fa8355bc4e673..e76be6b2dc84c6a992e186157efe29d625e29b94
2019-08-17 23:17:50 -0300 to 2019-09-03 07:42:26 -0300
- Change link to russian translation repository (rust-lang/rust-by-example#1245)
## embedded-book
1 commits in 432ca26686c11d396eed6a59499f93ce1bf2433c..5ca585c4a7552efb546e7681c3de0712f4ae4fdc
2019-08-09 23:20:22 +0000 to 2019-08-27 13:39:14 +0000
- Fixup book CI (rust-embedded/book#205)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@HavvyHavvyHavvy approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@HavvyHavvy

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@hawkinsw@Havvy