Rollup of 6 pull requests #40249
Rollup of 6 pull requests #40249
Conversation
frewsxcv
commented
Mar 3, 2017
frewsxcv
commented
- Successful merges: add unstable book to the bookshelf #40154, LLVM: Update submodule to include x86-interrupt ABI patches #40207, Move the reference into a submodule #40213, Restore creating the channel-rust-$channel-date.txt files #40225, Issue #39688 - Help people find String::as_bytes() for UTF-8 #40226, rustbuild: A few tweaks #40236
- Failed merges:
Move some code from x.py to bootstrap.py
Add some comments
…frewsxcv add unstable book to the bookshelf r? @frewsxcv @GuillaumeGomez
…lexcrichton LLVM: Update submodule to include x86-interrupt ABI patches Update LLVM submodule to `rust-llvm-2016-10-29` branch (commit rust-lang/llvm@50ab09f).
…lexcrichton Move the reference into a submodule Part of rust-lang#39588 This moves the reference out into its own submodule. Right now, it's under my own account; I would assume that it should go under `rust-lang`, but I guess there's an argument for the nursery too? I can fix that up before we commit it. r? @alexcrichton @brson
… r=alexcrichton Restore creating the channel-rust-$channel-date.txt files I have **not** run this (because I don't know how to 😇), but it *does* compile. r? @alexcrichton
Issue rust-lang#39688 - Help people find String::as_bytes() for UTF-8 Added in links for the inverse functions so people will know that as_bytes() is the inverse of from_utf8() and vice versa. ?r @steveklabnik
rustbuild: A few tweaks Fixes rust-lang#40016 Fixes rust-lang#39507 r? @alexcrichton
|
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @alexcrichton (or someone else) soon. If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes. Please see the contribution instructions for more information. |
|
@bors r+ p=10 |
|
📌 Commit 6efb3b2 has been approved by |
|
🔒 Merge conflict |
|
☔ The latest upstream changes (presumably #39917) made this pull request unmergeable. Please resolve the merge conflicts. |
