Rollup of 7 pull requests #31416
Merged
Rollup of 7 pull requests #31416
+35
−14
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
Member
steveklabnik
commented
Feb 4, 2016
steveklabnik
commented
- Successful merges: Copyright year set to initial #31007, Remove redundant semicolon from "block_expr" in grammar reference #31396, Clarify scenario where AsciiExt appears to operate on non-ASCII #31401, reference: explicit return at function end is not idiomatic #31411, reference: add trailing commas #31412, reference: make the line a little more readable #31413, doc: Rust indents are 4-space wide by convention #31415
- Failed merges:
"stmt" already includes the terminating semicolon.
According to http://www.copyright.gov/circs/circ01.pdf (See screenshot of relevant section below) , listing the first year of publication in the copyright is enough  The commits d5c8f62 and f979f91 have changed the copyright years This commit reverts back those changes, so that license year is again 2014 (As it was, when this license was first introduced in commit 90ba013 ) -------------------------------------- Edit 1: Added screenshot
"stmt" already includes the terminating semicolon.
|
@bors: r+ p=1 |
|
📌 Commit 96d866a has been approved by |
|
r? @brson (rust_highfive has picked a reviewer for you, use r? to override) |
bors
added a commit
that referenced
this pull request
Feb 4, 2016
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.