Rollup of 3 pull requests #42074
Closed
Rollup of 3 pull requests #42074
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
Mark-Simulacrum
commented
May 17, 2017
Mark-Simulacrum
commented
- Successful merges: Unify tools building #41639, Enable cross-crate incremental compilation by default. #42055, Cargo submodule update #42073
- Failed merges:
This avoids double compiled Cargo. Hopefully this would speed up (extended) compilation for ~10m. Notes: when updating Cargo submodule, the replacement version may also need to be updated.
As we can't wait for the maintainer.
Basically just translate what's done on master in Rust to Python here.
…ichton Unify tools building Close rust-lang#41601 Time saving for up to 10 minutes. Cargo is now only compiled once. Downsides: - Out of tree Cargo.lock maintenance - Cargo.toml `[replace]` version maintenance
…al-cc, r=nikomatsakis Enable cross-crate incremental compilation by default. Now that direct metadata hashing has been implemented for a while and we haven't seen any problems with it over at [rust-icci](https://travis-ci.org/rust-icci/), let's re-enable cross crate support for incremental compilation again. r? @nikomatsakis
…r=Mark-Simulacrum Cargo submodule update Required for rust-lang#41910 r? @Mark-Simulacrum
|
r? @brson (rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors r+ p=10 |
|
📌 Commit d02eac0 has been approved by |
aidanhs
added
the
S-waiting-on-bors
|
🔒 Merge conflict |
|
☔ The latest upstream changes (presumably #41911) made this pull request unmergeable. Please resolve the merge conflicts. |
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.