Skip to content

Enforce in bootstrap that clippy must have stage at least 1 #145131

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.

Sign up for GitHub

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

Jump to bottom
Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Enforce in bootstrap that clippy must have stage at least 1 #145131

wants to merge 15 commits into from
+431 −144

Conversation

Kobzol
Copy link
Member

@Kobzol Kobzol commented Aug 8, 2025 •
edited
Loading

This mostly piggybacks on the previous x check rework.

The new "rules" follow the new staging logic. So x clippy <foo> lints foo using stage0 Clippy. x clippy --stage 2 <foo> lints foo using stage1 Clippy (which is built from in-tree sources).

I had to fix some latent issues with prepare_compiler_for_check along the way.

Checking rustc_private tools should now check less compiler crates (or rather not check compiler examples/tests/etc.), potentially speeding it up slightly.

I also had to make some manual adjustments to x clippy ci so that it doesn't do needless work.

r? @jieyouxu

@rustbot rustbot added A-bootstrap-stamp Area: bootstrap stamp logic A-CI Area: Our Github Actions CI A-testsuite Area: The testsuite used to check the correctness of rustc 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) T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Aug 8, 2025
@rustbot
Copy link
Collaborator

rustbot commented Aug 8, 2025

This PR modifies src/bootstrap/src/core/config.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Collaborator

bors commented Aug 11, 2025

☔ The latest upstream changes (presumably #145011) made this pull request unmergeable. Please resolve the merge conflicts.

jieyouxu
jieyouxu reviewed Aug 11, 2025
View reviewed changes
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, some questions

@jieyouxu
Copy link
Member

@rustbot author

@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 11, 2025
@Kobzol
Copy link
Member Author

Kobzol commented Aug 11, 2025

Rebased.

jieyouxu
jieyouxu reviewed Aug 11, 2025
View reviewed changes
jieyouxu
jieyouxu reviewed Aug 11, 2025
View reviewed changes
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Kobzol
Copy link
Member Author

Kobzol commented Aug 11, 2025

I realized that x clippy ci is special enough to warrant a custom/manual selection of the invoked steps, effectively bypassing normal staging. I tried to optimize it to build as few things as possible.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Kobzol
Copy link
Member Author

Kobzol commented Aug 12, 2025

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 12, 2025
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Collaborator

bors commented Aug 13, 2025

☔ The latest upstream changes (presumably #145295) made this pull request unmergeable. Please resolve the merge conflicts.

Kobzol added 2 commits August 13, 2025 08:07
@Kobzol
Prepare standard library for checking rustc in `prepare_compiler_for_…
6e7e243 
…check`
@Kobzol
Implement clippy::CodegenGcc as a separate step
5d1535c 
To correctly pass `RustcPrivateCompilers` to it and to avoid running it on `x clippy compiler`.
jieyouxu
jieyouxu approved these changes Aug 13, 2025
View reviewed changes
Copy link
Member

@jieyouxu jieyouxu left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Thanks, one question

jieyouxu
jieyouxu approved these changes Aug 13, 2025
View reviewed changes
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

@jieyouxu
Copy link
Member

@bors r+ rollup=never (clippy staging)

@bors
Copy link
Collaborator

bors commented Aug 13, 2025

📌 Commit 2ea2100 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 Aug 13, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jieyouxu jieyouxu jieyouxu approved these changes

Assignees

@jieyouxu jieyouxu

Labels
A-bootstrap-stamp Area: bootstrap stamp logic A-CI Area: Our Github Actions CI A-testsuite Area: The testsuite used to check the correctness of rustc 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) T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Kobzol @rustbot @rust-log-analyzer @bors @jieyouxu