Rollup of 10 pull requests #28897
Merged
Rollup of 10 pull requests #28897
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
Oct 7, 2015
steveklabnik
commented
- Successful merges: Use the correct mod name from the example #28836, trpl: Clarify closure terminology #28856, New error code #28874, Restore line endings in a test #28876, style guide: suggest manual links to constructors #28878, Fix "the the" typo + split a run-on sentence in rust book section 5.14 #28880, Fix a typo and add musl link #28882, Alter formatting for words in Option::cloned doc comment #28885, trpl: Few minor fixes (wording, formatting) #28889, rustfmt some submodules of libcore #28896
- Failed merges:
This is to address issue rust-lang#28803
In rust-lang#28864, @Aarzee submitted some whitespace fixes. I r+'d it. But @retp998 noticed[1] that this file is explicitly a test of this kind of whitespace, and so I shouldn't have changed it. This restores the old line endings. 1: rust-lang#28864 (comment)
Add musl link
Later in text we mention 'step four' and 'step three'. This fix releases user from counting.
This is to address issue rust-lang#28803 by improving some of the references to closures, to explain what they are more clearly, while hopefully still being concise. r? @steveklabnik
In rust-lang#28864, @Aarzee submitted some whitespace fixes. I r+'d it. But @retp998 noticed[1] that this file is explicitly a test of this kind of whitespace, and so I shouldn't have changed it. This restores the old line endings. 1: rust-lang#28864 (comment)
…ichton The diff can hopefully speak for itself. Regardless: this chapter of the book contained a sentence where "the" was mistakenly repeated twice. In this same section, there was a comma separating two sentences where a period should have been. This PR fixes both issues.
<!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/rust-lang/rust/28896) <!-- Reviewable:end -->
|
r? @pcwalton (rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors: r+ p=10000000 |
|
📌 Commit 0fbf7ea has been approved by |
|
⌛ Testing commit 0fbf7ea with merge 1949941... |
|
💔 Test failed - auto-linux-32-nopt-t |
|
@bors: retry |
|
@bors: force |
|
I am pretty sure this is a supurious failure, but not 100% sure, running a PR locally while I tell bors to retry. The rollup queue is getting too big. |
|
said local test seemed to have worked, but running the full suite now |
|
full suite passed for the PR i'm concerned about, running my own full |
|
🎊 |
This was referenced Oct 8, 2015
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.