Rollup of 7 pull requests#29736
Closed
steveklabnik wants to merge 34 commits intorust-lang:masterfrom
Closed
Conversation
Contributor
steveklabnik
commented
Nov 10, 2015
steveklabnik
commented
- Successful merges: Added try! example to documentation.md #29234 #29420, Stricter doctests for corelibs #29544, Fix outdated comment in Vec::from_iter #29688, libstd: add example for PathBuf::push #29708, Documentation: Fix broken link on for-loop.html #29715, Redo the README intro again #29729, Some cleanup on after #29684 #29731
- Failed merges:
Since commit 46068c9, call to `reserve()` on empty vec allocates exactly requested capacity, so unroll of first iteration may help only with branch prediction.
* wrap to 80 cols * small grammar fix, missing 'the'
…labnik Did this alphabetically, so I didn't see [how `std` was doing things](https://dxr.mozilla.org/rust/source/src/libstd/lib.rs#215) till I was nearly finished. If you prefer to add crate-level-whitelists like std instead of test-level, I can rebase with that strategy. A number of these commits can probably be dropped as the crates don't have much to test, and are deprecated. Let me know which if any to drop! (can also squash after review if desired) r? @steveklabnik
…akis Since commit 46068c9, call to `reserve()` on empty vec allocates exactly requested capacity, so unroll of first iteration may help only with branch prediction.
r? @steveklabnik This completely abdicates any responsibility to explain what Rust is, instead linking to the website. My main motivation is that I am still not happy with it, and every time I try to fix it I just write a slightly longer sales pitch than what's on the website. One thing this paragraph could do is direct people to more information about what is in the repo, or more technical information about the implementation.
* wrap to 80 cols * small grammar fix, missing 'the'
Contributor
|
(rust_highfive has picked a reviewer for you, use r? to override) |
Contributor
Author
|
@bors: r+ p=0.5 (want that libc change to land!) |
Collaborator
|
📌 Commit 9a468ed has been approved by |
Contributor
Author
|
@bors: p=1 |
Collaborator
|
⌛ Testing commit 9a468ed with merge e4a7463... |
Collaborator
|
💔 Test failed - auto-mac-32-opt |
Member
|
@bors: retry On Mon, Nov 9, 2015 at 10:47 PM, bors notifications@github.com wrote:
|
Collaborator
|
🔒 Merge conflict |
Collaborator
|
☔ The latest upstream changes (presumably #29546) made this pull request unmergeable. Please resolve the merge conflicts. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
9 participants
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.