bootstrap: simplify setting unstable-options for tools#117850
Merged
bors merged 1 commit intorust-lang:masterfrom Nov 17, 2023
Merged
bootstrap: simplify setting unstable-options for tools#117850bors merged 1 commit intorust-lang:masterfrom
bors merged 1 commit intorust-lang:masterfrom
Conversation
We unconditionally set this to avoid recompiling tools between `x check $tool` and `x test $tool` executions. See rust-lang#116538 for more information. Signed-off-by: onur-ozkan <work@onurozkan.dev>
Collaborator
|
(rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
S-waiting-on-review
Member
|
@bors r+ Not entirely sure about correctness but seems fine on the surface. |
Collaborator
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Nov 17, 2023
Rollup of 5 pull requests Successful merges: - rust-lang#117649 (Move `lint_store`) - rust-lang#117850 (bootstrap: simplify setting unstable-options for tools) - rust-lang#117889 (docs(release): Clarify cargo entries) - rust-lang#117946 (avoid exhaustive i16 test in Miri) - rust-lang#117963 (`rustc_query_system` cleanups) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Nov 17, 2023
Rollup merge of rust-lang#117850 - onur-ozkan:fix-116538, r=Mark-Simulacrum bootstrap: simplify setting unstable-options for tools Previously, we unconditionally(instead of `if path == "src/tools/clippy" || ..`) set this (to prevent recompiling tools between `x check $tool` and '` check $another_tool` executions) specifically for tools in the `x check` step. This PR relocates that logic to `fn prepare_tool_cargo`, making it step-agnostic. Fixes rust-lang#116538 Fixes rust-lang#117983
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
4 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.
Previously, we unconditionally(instead of
if path == "src/tools/clippy" || ..) set this (to prevent recompiling tools betweenx check $tooland 'check $another_toolexecutions) specifically for tools in thex checkstep. This PR relocates that logic tofn prepare_tool_cargo, making it step-agnostic.Fixes #116538
Fixes #117983