Rollup of 9 pull requests #28886
Closed
Rollup of 9 pull requests #28886
Conversation
This file contains hidden or 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, doc: Mention split_whitespace in split doc #28868, book: Add documentation on custom allocators #28869, New error code #28874, Restore line endings in a test #28876, style guide: suggest manual links to constructors #28878, Fix a typo and add musl link #28882, Alter formatting for words in Option::cloned doc comment #28885
- Failed merges:
This is to address issue rust-lang#28803
This adds a chapter to the nightly section of the book on leveraging and implementing the `#![allocator]` attribute to write custom allocators as well as explaining the current situation with allocators.
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
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
…klabnik This adds a chapter to the nightly section of the book on leveraging and implementing the `#![allocator]` attribute to write custom allocators as well as explaining the current situation with allocators.
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)
|
@bors: r+ p=1 |
|
📌 Commit 917489c has been approved by |
|
(rust_highfive has picked a reviewer for you, use r? to override) |
|
⌛ Testing commit 917489c with merge 698d76c... |
|
💔 Test failed - auto-linux-64-nopt-t |
|
@bors: retry force |
|
⌛ Testing commit 917489c with merge 5dce5de... |
|
💔 Test failed - auto-win-gnu-64-opt |
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.