Rollup of 15 pull requests #32960
Merged
Rollup of 15 pull requests #32960
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
Apr 14, 2016
steveklabnik
commented
- Successful merges: Stop re-exporting check_match::Constructor. #32646, Don't read past limit for in BufRead instance of Take #32855, librustc_back: fix incorrect comment about RUST_TARGET_PATH #32856, Add rustbuild option to use Ninja for LLVM build #32865, Remove an extra command from the usage message #32868, Add test for is_char_boundary #32869, i386-unknown-freebsd snap 235d774 #32876, Bump to 1.10 #32884, Fix conflicting link identifiers #32885, Clarify try! doc example #32893, Fix beta branch #32894, Make rustc_mir pass rustdoc #32932, Doc fix: Do not mention next project in book/guessing-game #32937, Fix a typo and add a missing word #32940, fix str::split_at_mut() example #32941
- Failed merges: Fix link in relnotes #32912
The path `/etc/rustc/` is not the default last entry in RUST_TARGET_PATH. This was in RFC131 but was never implemented in rustc so it was removed as part of rust-lang#31117 and rust-lang/rfcs#1473. Signed-off-by: Doug Goldstein <[email protected]>
The original is correct, but a bit misleading.
This test tests a message that is only displayed on nightly.
The next project refers to the dining-philosophers problem https://github.com/rust-lang/rust/blob/27a1834ce522e3ec7fe4726b1661de16ee30c503/src/doc/book/dining-philosophers.md which was removed in rust-lang@0c6c34d so removing reference to that project from book/guessing-game
Stop re-exporting check_match::Constructor.
…chton Don't read past limit for in BufRead instance of Take Similar to `Read::read`, `BufRead::fill_buf` impl of `Take` should not call `inner.fill_buf` if the limit is already reached.
…hton librustc_back: fix incorrect comment about RUST_TARGET_PATH The path `/etc/rustc/` is not the default last entry in RUST_TARGET_PATH. This was in RFC131 but was never implemented in rustc so it was removed as part of rust-lang#31117 and rust-lang/rfcs#1473. Signed-off-by: Doug Goldstein <[email protected]>
Add rustbuild option to use Ninja for LLVM build This change adds support for a `ninja` option in the `[llvm]` section of rustbuild's `config.toml`. When `true`, the option enables use of the Ninja build tool. Note that this change does not add support for Ninja to the old makefile based build system. Closes rust-lang#32809 r? @alexcrichton
Remove an extra command from the usage message
Add test for is_char_boundary Add test for is_char_boundary Apparently there was no test for this method. This test is rather simple, not exhaustive.
…alexcrichton i386-unknown-freebsd snap 235d774 @alexcrichton when merging this, please upload the snapshot file: https://github.com/dhuseby/rust-manual-snapshots/raw/master/rust-stage0-2016-03-18-235d774-freebsd-i386-b5a87e66e3e3eed5f0b68367ad22f25f0be2d4ea.tar.bz2
Fix conflicting link identifiers Caused "Errors for non-exhaustive match patterns now list up to 3 missing variants while also indicating the total number of missing variants if more than 3." to link to "libsyntax: Restrict where non-inline modules can appear (fixes rust-lang#29765)"
…bnik Clarify try! doc example The original is correct, but a bit misleading. r? @steveklabnik
Fix beta branch This test tests a message that is only displayed on nightly. Still testing this locally, but I suspect it's correct. r? @alexcrichton
Make rustc_mir pass rustdoc None
…roject-in-guessing-game-doc, r=Manishearth Doc fix: Do not mention next project in book/guessing-game fixes rust-lang#32936
Fix a typo and add a missing word
fix str::split_at_mut() example fix documentation issue rust-lang#32933
|
r? @arielb1 (rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors: r+ p=1 |
|
📌 Commit 7e2302b has been approved by |
|
⌛ Testing commit 7e2302b with merge a9d294c... |
|
💔 Test failed - auto-win-gnu-32-opt |
|
@bors: retry |
bors
added a commit
that referenced
this pull request
Apr 14, 2016
This was referenced Apr 15, 2016
Closed
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.