Skip to content

Conversation

Kobzol
Copy link
Member

@Kobzol Kobzol commented Jun 18, 2025

I keep failing to unwrap the gordic knot of the logic of checking tools in bootstrap 😖 So in the meantime I at least want to upstream some cleanups I did along the way.

Since some time ago, we have separate steps for Clippy, so it shouldn't ever happen again that the check steps would be invoked with builder.kind == Clippy.

r? @jieyouxu

Kobzol added 2 commits June 18, 2025 21:38
It doesn't seem to be needed, we can just use `Kind::Check` explicitly.
We should always just use `Kind::Check` for the check steps, as Clippy now has an entirely separate set of steps.
@rustbot
Copy link
Collaborator

rustbot commented Jun 18, 2025

jieyouxu is not on the review rotation at the moment.
They may take a while to respond.

@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 Jun 18, 2025
Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. I tried ./x clippy locally, and it seems to work as expected.

@jieyouxu
Copy link
Member

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jun 19, 2025

📌 Commit 8875668 has been approved by jieyouxu

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 Jun 19, 2025
bors added a commit that referenced this pull request Jun 19, 2025
Rollup of 7 pull requests

Successful merges:

 - #140247 (Don't build `ParamEnv` and do trait solving in `ItemCtxt`s when lowering IATs)
 - #142507 (use `#[align]` attribute for `fn_align`)
 - #142524 (Weekly `cargo update`)
 - #142606 (AsyncDrop trait without sync Drop generates an error)
 - #142639 (Add a missing colon at the end of the panic location details in location-detail-unwrap-multiline.rs)
 - #142654 (library: Increase timeout on mpmc test to reduce flakes)
 - #142692 (Assorted bootstrap cleanups (step 3))

r? `@ghost`
`@rustbot` modify labels: rollup
Copy link
Contributor

@Shourya742 Shourya742 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tACK

@bors bors merged commit 986f8cd into rust-lang:master Jun 19, 2025
10 checks passed
rust-timer added a commit that referenced this pull request Jun 19, 2025
Rollup merge of #142692 - Kobzol:bootstrap-small-check-cleanup, r=jieyouxu

Assorted bootstrap cleanups (step 3)

I keep failing to unwrap the gordic knot of the logic of checking tools in bootstrap 😖 So in the meantime I at least want to upstream some cleanups I did along the way.

Since some time ago, we have separate steps for Clippy, so it shouldn't ever happen again that the check steps would be invoked with `builder.kind == Clippy`.

r? `@jieyouxu`
@rustbot rustbot added this to the 1.89.0 milestone Jun 19, 2025
@Kobzol Kobzol deleted the bootstrap-small-check-cleanup branch June 19, 2025 06:43
github-actions bot pushed a commit to rust-lang/miri that referenced this pull request Jun 20, 2025
Rollup of 7 pull requests

Successful merges:

 - rust-lang/rust#140247 (Don't build `ParamEnv` and do trait solving in `ItemCtxt`s when lowering IATs)
 - rust-lang/rust#142507 (use `#[align]` attribute for `fn_align`)
 - rust-lang/rust#142524 (Weekly `cargo update`)
 - rust-lang/rust#142606 (AsyncDrop trait without sync Drop generates an error)
 - rust-lang/rust#142639 (Add a missing colon at the end of the panic location details in location-detail-unwrap-multiline.rs)
 - rust-lang/rust#142654 (library: Increase timeout on mpmc test to reduce flakes)
 - rust-lang/rust#142692 (Assorted bootstrap cleanups (step 3))

r? `@ghost`
`@rustbot` modify labels: rollup
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
Development

Successfully merging this pull request may close these issues.

5 participants