Rollup of 4 pull requests #41598
Rollup of 4 pull requests #41598
Conversation
frewsxcv
commented
Apr 28, 2017
frewsxcv
commented
- Successful merges: query for describe_def #41534, 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:
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)
query for describe_def Resolves `fn describe_def(&self, def: DefId) -> Option<Def>;` of rust-lang#41417. r? @nikomatsakis I would greatly appreciate a review. I hope I covered everything described in the pr.
…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 @pnkfelix (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 d21c9b9 has been approved by |
|
☀️ Test successful - status-appveyor, status-travis |
