Rollup of 4 pull requests #41596
Closed
Rollup of 4 pull requests #41596
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
Apr 28, 2017
frewsxcv
commented
- Successful merges: make *most* maps private #41368, Shrink the rust-src component #41546, windows: Copy libwinpthread-1.dll into libdir bin #41571, don't ICE on cross-crate associated const type mismatch #41583
- Failed merges: query for describe_def #41534
Recently we switched from the win32 MinGW toolchain to the pthreads-based toolchain. We ship `gcc.exe` from this toolchain with the `rust-mingw` package in the standard distribution but the pthreads version of `gcc.exe` depends on `libwinpthread-1.dll`. While we're shipping this DLL for the compiler to depend on we're not shipping it for gcc. As a workaround just copy the dll to gcc.exe location and don't attempt to share for now. cc rust-lang#31840 (comment)
Didn't get around to removing all public access.
This requires copying out the cycle error to avoid a cyclic borrow. Is this a problem? Are there paths where we expect cycles to arise and not result in errors? (In such cases, we could add a faster way to test for cycle.)
…-map, r=eddyb make *most* maps private Currently we access the `DepTrackingMap` fields directly rather than using the query accessors. This seems bad. This branch removes several such uses, but not all, and extends the macro so that queries can hide their maps (so we can prevent regressions). The extension to the macro is kind of ugly :/ but couldn't find a simple way to do it otherwise (I guess I could use a nested macro...). Anyway I figure it's only temporary. r? @eddyb
…rson windows: Copy libwinpthread-1.dll into libdir bin Recently we switched from the win32 MinGW toolchain to the pthreads-based toolchain. We ship `gcc.exe` from this toolchain with the `rust-mingw` package in the standard distribution but the pthreads version of `gcc.exe` depends on `libwinpthread-1.dll`. While we're shipping this DLL for the compiler to depend on we're not shipping it for gcc. As a workaround just copy the dll to gcc.exe location and don't attempt to share for now. cc rust-lang#31840 (comment)
don't ICE on cross-crate associated const type mismatch Fixes rust-lang#41549. r? @eddyb
|
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @eddyb (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 c7a90be has been approved by |
|
⌛ Testing commit c7a90be with merge 90a6f9e... |
|
💔 Test failed - status-travis |
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.