-
Notifications
You must be signed in to change notification settings - Fork 13.6k
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.
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
base: master
Are you sure you want to change the base?
Conversation
This PR modifies If appropriate, please update |
This comment has been minimized.
This comment has been minimized.
☔ The latest upstream changes (presumably #145011) made this pull request unmergeable. Please resolve the merge conflicts. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, some questions
@rustbot author |
To correctly pass `RustcPrivateCompilers` to it and to avoid running it on `x clippy compiler`.
86f514d
to
bbce854
Compare
Rebased. |
@@ -28,7 +28,7 @@ RUN sh /scripts/sccache.sh | |||
|
|||
ENV SCRIPT \ | |||
python3 ../x.py check && \ | |||
python3 ../x.py clippy ci && \ | |||
python3 ../x.py clippy ci --stage 2 && \ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Question: wait, this involves building stage 2 rustc, right...?
[build] rustc 0 <host> -> clippy-driver 1 <host> | ||
[build] rustc 0 <host> -> cargo-clippy 1 <host> | ||
[clippy] rustc 1 <host> -> bootstrap 2 <host> | ||
[build] rustc 1 <host> -> rustc 2 <host> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
^ this
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well, not building, but linting stage2 rustc. That should be the same as before, because we linted rustc (stage2) using in-tree Clippy (stage1).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm, the log shows [build]
, I see xD I'll check.
This comment has been minimized.
This comment has been minimized.
I realized that |
This mostly piggybacks on the previous
x check
rework.The new "rules" follow the new staging logic. So
x clippy <foo>
lintsfoo
using stage0 Clippy.x clippy --stage 2 <foo>
lintsfoo
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 switch
x clippy ci
to stage 2, so that it actually lints stuff using in-tree Clippy.r? @jieyouxu