Move rustfmt downloads from bootstrap.py to rustbuild#97507
Merged
bors merged 5 commits intorust-lang:masterfrom Jun 8, 2022
Merged
Move rustfmt downloads from bootstrap.py to rustbuild#97507bors merged 5 commits intorust-lang:masterfrom
bors merged 5 commits intorust-lang:masterfrom
Conversation
Contributor
|
(rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
est31
reviewed
May 29, 2022
15 tasks
Collaborator
|
☔ The latest upstream changes (presumably #96687) made this pull request unmergeable. Please resolve the merge conflicts. |
Collaborator
|
☔ The latest upstream changes (presumably #97548) made this pull request unmergeable. Please resolve the merge conflicts. |
src/bootstrap/builder.rs
Outdated
Member
There was a problem hiding this comment.
👍 I do think we can wait though, ultimately even our larger components aren't that large compared to memory usage during std/rustc compilation.
Member
|
r=me with conflicts resolved |
Mark-Simulacrum
added
S-waiting-on-author
It was confusing to have two functions with the same name but different behavior.
Member
Author
|
@bors r=Mark-Simulacrum rollup=iffy |
Collaborator
|
📌 Commit 9950dec28edde71695ba101481201ae7b43c7323 has been approved by |
bors
added
S-waiting-on-bors
This simplifies the arguments to `download_component` in config.rs. It also moves stage0.json metadata handling to `Build::new`, making it easier to download the stage0 compiler in rustbuild later if necessary.
Member
Author
|
@bors r- r=Mark-Simulacrum rollup=iffy |
bors
added
S-waiting-on-author
Collaborator
|
📌 Commit 6115f4e has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 8, 2022
…askrgr Rollup of 5 pull requests Successful merges: - rust-lang#97507 (Move rustfmt downloads from bootstrap.py to rustbuild) - rust-lang#97813 (Sync rustc_codegen_gcc) - rust-lang#97878 (Add regression test for anonymous lifetimes) - rust-lang#97879 (remove unneeded code) - rust-lang#97880 (Fix typo: fo->for) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
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.
ci-artifacts.rust-lang.orgformat::formatto take aBuilderso it has access todownload_component. I think we may want to reconsider the distinction between Build and Builder at some point; I don't think it's particularly useful.Fixes #95136. Helps with #94829. This is based on #96687 for simplicity.