Rollup of 7 pull requests #38325
Merged
Rollup of 7 pull requests #38325
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
frewsxcv
commented
Dec 12, 2016
frewsxcv
commented
- Successful merges: Run rustfmt on librustc_mir/hair/cx #37052, Improve and fix mpsc documentation #37941, Add more examples to UpdSocket #38067, Avoid using locally installed Source Code Pro font (fixes #24355). #38164, Some incr. comp. hash tests #38202, rustdoc: Remove broken src links from reexported items from macros #38264, Handle Ctrl+C in the build script #38299
- Failed merges:
…4355). In some versions of this font the ampersands are drawn badly.
Closes rust-lang#37915 This commit enhances documentation with several links and fixes an error in the `sync_channel` documentation as well: `send` doesn't panic when the senders are all disconnected
When an item is defined in an external macro it doesn't get a real filename so we need to filter out these when generating src links for reexported items.
Run rustfmt on librustc_mir/hair/cx
…aumeGomez Improve and fix mpsc documentation Closes rust-lang#37915 This commit enhances documentation with several links and fixes an error in the `sync_channel` documentation as well: `send` doesn't panic when the senders are all disconnected r? @steveklabnik
…nagisa Add more examples to UpdSocket r? @frewsxcv
Avoid using locally installed Source Code Pro font (fixes rust-lang#24355). In some versions of this font the ampersands are drawn badly. A doc tree built with this change is at https://storage.googleapis.com/mbp-rust-builds/fonts/doc/std/index.html I'm not seeing this problem locally so I'm not sure this fixes it, but based on the diagnosis in the bug it should. I've made this a minimal change by only removing the one problematic font but maybe for consistency every font should be read from the Rust docs tree?
…r=nikomatsakis Some incr. comp. hash tests r? @nikomatsakis
rustdoc: Remove broken src links from reexported items from macros When an item is defined in an external macro it doesn't get a real filename so we need to filter out these when generating src links for reexported items.
Handle Ctrl+C in the build script
|
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @nrc (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 cba1304 has been approved by |
|
⌛ Testing commit cba1304 with merge e383320... |
|
💔 Test failed - auto-linux-64-opt |
|
@bors retry Looks like an intermittent build issue, but I'm not entirely sure |
|
⌛ Testing commit cba1304 with merge 5a2b50b... |
bors
added a commit
that referenced
this pull request
Dec 13, 2016
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.