-
Notifications
You must be signed in to change notification settings - Fork 12.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Rollup of 7 pull requests #41558
Rollup of 7 pull requests #41558
Conversation
frewsxcv
commented
Apr 26, 2017
- Successful merges: Add bootstrap support for android #41370, appveyor: Use Ninja/sccache on MSVC #41447, Haiku: fix initial platform support #41456, Step::replace_one should put a one, not a zero (Issue #41492) #41493, Address platform-specific behavior in TcpStream::shutdown #41499, Invalid module location #41501, Add a regression test for ICE #33287 #41550
- Failed merges:
Turns out all six of these impls are incorrect.
This build is no longer a forked version with temporary bugfixes, everything should be upstreamed!
Now that the final bug fixes have been merged into sccache we can start leveraging sccache on the MSVC builders on AppVeyor instead of relying on the ad-hoc caching strategy of trigger files and whatnot.
…richton Add bootstrap support for android
…brson appveyor: Use Ninja/sccache on MSVC Now that the final bug fixes have been merged into sccache we can start leveraging sccache on the MSVC builders on AppVeyor instead of relying on the ad-hoc caching strategy of trigger files and whatnot.
Haiku: fix initial platform support
Step::replace_one should put a one, not a zero (Issue rust-lang#41492) Turns out all six of the replace_* impls were backwards.
Address platform-specific behavior in TcpStream::shutdown Fixes rust-lang#25164 r? @rust-lang/libs from the GitHub thread, it seems like documenting this behavior is okay, but I want to make sure that's what you want.
…ion, r=jseyfried Invalid module location Fixes rust-lang#38110. r? @jseyfried
Add a regression test for ICE rust-lang#33287 Fixes rust-lang#33287
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 r+ p=10 |
📌 Commit fcb8910 has been approved by |
Pretty sure this has failed (see https://github.com/rust-lang/rust/commits/auto) with
on appveyor and a somewhat more opaque
on a few different travis builders. Looks like sccache PR related, cc @alexcrichton Unfortunately bors hasn't failed it for some reason, so it's currently blocking the queue. |
@bors r- |