Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bootstrap: simplify setting unstable-options for tools #117850

Merged
merged 1 commit into from
Nov 17, 2023

Conversation

onur-ozkan
Copy link
Member

@onur-ozkan onur-ozkan commented Nov 12, 2023

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 #116538
Fixes #117983

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 <[email protected]>
@rustbot
Copy link
Collaborator

rustbot commented Nov 12, 2023

r? @Mark-Simulacrum

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Nov 12, 2023
@Mark-Simulacrum
Copy link
Member

@bors r+

Not entirely sure about correctness but seems fine on the surface.

@bors
Copy link
Contributor

bors commented Nov 16, 2023

📌 Commit b1afb6c has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 16, 2023
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
@bors bors merged commit 3644594 into rust-lang:master Nov 17, 2023
11 checks passed
@rustbot rustbot added this to the 1.76.0 milestone Nov 17, 2023
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
@onur-ozkan onur-ozkan deleted the fix-116538 branch January 27, 2024 09:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
4 participants