Uh oh!
There was an error while loading. Please reload this page.
Rollup of 8 pull requests - #41881
Closed
frewsxcv wants to merge 21 commits into
Closed
Conversation
frewsxcv
commented
May 10, 2017
Contributor
- Successful merges: Add more ways to create a PathBuf to docs #41531, Improve docs on Arc<T> and Send/Sync #41536, [DOC] Improve the thread::park and thread::unpark documentation #41809, Improve E0477 error message #41862, ci: Update android ndk and sdk #41863, Add disabled android host builders #41864, ICH: Handle case of removed FileMaps. #41873, compiletest: force GDB to print values in the Rust format. #41877
- Failed merges:
- Adds an explanantion of what `park` does in the `unpark` documentation. - Adds a link to the module doc.
Part of rust-lang#29378 - Moves the module documentation into `park`. - Add the same example as the one from `unpark` to `park`.
This is something I always forget, so let's actually explain in the docs.
…ushi Improve docs on Arc<T> and Send/Sync This is something I always forget, so let's actually explain in the docs. I didn't fully link up everything here, but I'd like to make sure that the wording is okay before I bother.
[DOC] Improve the thread::park and thread::unpark documentation Part of rust-lang#29378 . Takes care of the documentation for `park`, `park_duration` and also improves the `unpark` example. - `park should` have its module documentation inlined here, and cleaned up. - `park_timeout` could use links to `park`.
Improve E0477 error message Part of rust-lang#41816. r? @nagisa
…alexcrichton ci: Update android ndk and sdk Make install-sdk.sh and install-ndk.sh more generic so future updates can be made directly on Dockerfile. Update ndk to r13b, which will be necessary to make host builds for android (in the future). Update sdk to r25.2.5 (maybe some emulator performance improvement).
…hton Add disabled android host builders Introduce the concept of disabled builder. A disabled builder is one that is not run by travis. It is intended to be run by the user who wants a rustc for a tier 2 or 3 platform. Off corse, there is no guarantee that it will work.
…ookup, r=nikomatsakis ICH: Handle case of removed FileMaps. This PR fixes a bug introduced in rust-lang#41709 where removing a source file between compilation sessions would cause an ICE: https://travis-ci.org/rust-icci/crossbeam/jobs/230582234#L633 r? @nikomatsakis
…ister compiletest: force GDB to print values in the Rust format. Based on @nodakai's rust-lang#40557 (comment) and @infinity0's rust-lang#40557 (comment). Fixesrust-lang#40557.
rust-highfive
commented
May 10, 2017
Contributor
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @aturon (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
commented
May 10, 2017
Collaborator
☔ The latest upstream changes (presumably #41887) 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 freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
10 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.