bootstrap: explicitly request copying rustc-dev artifacts for rustfmt/clippy under download-rustc#156528
Open
jieyouxu wants to merge 1 commit into
Open
bootstrap: explicitly request copying rustc-dev artifacts for rustfmt/clippy under download-rustc#156528jieyouxu wants to merge 1 commit into
rustc-dev artifacts for rustfmt/clippy under download-rustc#156528jieyouxu wants to merge 1 commit into
Conversation
…download-rustc
This is by no means a proper fix, but it should unblock local tool
profile workflows trying to use `download-rustc` with {rustfmt,clippy}.
Collaborator
|
rustbot has assigned @Mark-Simulacrum. Use Why was this reviewer chosen?The reviewer was selected based on:
|
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
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.
Summary
#t-infra/bootstrap > x run rustfmt works but x test rustfmt fails to compile reported that
./x test rustfmt --stage={1,2}no longer works withdownload-rustc.builder.ensure(Rustc)s around the times of stage 0 rejiggling.compile::Sysroot::runhas a quirky non-trivial behavior regardingrustc-devartifact copying underdownload-rustc, tracing back to sysroot dep resolution troubles (cf.tests/ui/allocator/no_std-alloc-error-handler*fail whendownload-rustcis enabled #108767), we need to explicitlyensure(Rustc)to opt-in torustc-devartifact copying underdownload-rustc.ensures to forcerustc-devartifact copying underdownload-rustcto unblock rustfmt/clippy contributors who want to usedownload-rustc(to avoid having to build the compiler).Testing
Use a dummy config:
bootstrap.rustfmt.tomlRun:
./x test rustfmt --config=bootstrap.rustfmt.toml --stage=1./x test rustfmt --config=bootstrap.rustfmt.toml --stage=2./x test clippy --config=bootstrap.rustfmt.toml --stage=1./x test clippy --config=bootstrap.rustfmt.toml --stage=2When reviewing, also check that if you revert the commit / this PR, that invocations above fail (which is the case against
mainfor me).Tested also without
download-rustcto make sure./x test {rustfmt,clippy} --stage={1,2}still works.Notes
This is by no means a proper fix, but it should unblock local tool profile workflows trying to use
download-rustcwith {rustfmt,clippy}. I don't think it's worth blocking over that.Efforts for a more proper fix should be tracked by #156525, I left FIXMEs pointing to that.