Rollup of 9 pull requests #36511
Closed
Rollup of 9 pull requests #36511
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
Contributor
sophiajt
commented
Sep 15, 2016
sophiajt
commented
- Successful merges: Update E0049 to new error format #36383, Tweak std::marker docs #36424, rustbuild: Fix dependency tracking with new Cargo #36439, rustbuild: Use current_dir instead of -C #36456, trans: Let the collector find drop-glue for all vtables, not just VTableImpl. #36468, doc: make that sound better #36480, Don't ignore a doc code-block we can compile. #36484, Workaround #34427 by using memset of 0 on ARM to set the discriminant. #36496, Default RUST_MIN_STACK to 16MiB for now #36505
- Failed merges:
The recent Cargo update changed filenames, which broke a lot of incremental rustbuild builds. What it thought were the output files were indeed no longer the output files! (wreaking havoc). This commit updates this to stop guessing filenames of Cargo and just manage stamp files instead.
Apparently some versions of git don't support the `-C` flag, so let's use the guaranteed-to-work `current_dir` function.
…rner Update E0049 to new error format Fixes rust-lang#35210. Part of rust-lang#35233. r? @jonathandturner
…r-docs, r=GuillaumeGomez Tweak std::marker docs Fixes rust-lang#29361. r? @GuillaumeGomez
rustbuild: Fix dependency tracking with new Cargo The recent Cargo update changed filenames, which broke a lot of incremental rustbuild builds. What it thought were the output files were indeed no longer the output files! (wreaking havoc). This commit updates this to stop guessing filenames of Cargo and just manage stamp files instead.
…r=jonathandturner rustbuild: Use current_dir instead of -C Apparently some versions of git don't support the `-C` flag, so let's use the guaranteed-to-work `current_dir` function.
…p-glue, r=eddyb trans: Let the collector find drop-glue for all vtables, not just VTableImpl. This fixes rust-lang#36260. So far, the collector has only recorded drop-glue for insertion into a vtable if the vtable was for an impl. But there's actually no reason why it shouldn't do just the same for closure vtables, afaict. r? @eddyb cc @rust-lang/compiler
…bnik doc: make that sound better
Don't ignore a doc code-block we can compile.
…eddyb Workaround rust-lang#34427 by using memset of 0 on ARM to set the discriminant. Workaround rust-lang#34427 by using memset of 0 on ARM to set the discriminant.
Default RUST_MIN_STACK to 16MiB for now Temporary(?) workaround to rust-lang#35408. cc @nikomatsakis if you want to veto the idea. r? @eddyb
|
@bors r+ p=1 |
|
📌 Commit 51c6e53 has been approved by |
|
r? @brson (rust_highfive has picked a reviewer for you, use r? to override) |
|
⌛ Testing commit 51c6e53 with merge 0e537eb... |
|
💔 Test failed - auto-linux-64-cargotest |
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.