Skip to content

Make x clippy download and use beta clippy #107628

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
Closed
wants to merge 5 commits into from
Closed

Make x clippy download and use beta clippy #107628

wants to merge 5 commits into from

Conversation

albertlarsan68
Copy link
Member

@albertlarsan68 albertlarsan68 commented Feb 3, 2023 •
edited
Loading

Take-over of #106394: see this PR for all of the context.

r? @flip1995
cc @jyn514

@rustbot rustbot added 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. T-release Relevant to the release subteam, which will review and decide on the PR/issue. labels Feb 3, 2023
@rustbot
Copy link
Collaborator

rustbot commented Feb 3, 2023

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

@albertlarsan68 albertlarsan68 added the A-clippy Area: Clippy label Feb 3, 2023
@albertlarsan68 albertlarsan68 changed the title Bootstrap clippy Make x clippy download and use beta clippy Feb 3, 2023
@albertlarsan68 albertlarsan68 mentioned this pull request Feb 3, 2023
Closed
@jyn514
Copy link
Member

jyn514 commented Feb 3, 2023

See https://rust-lang.zulipchat.com/#narrow/stream/246057-t-cargo/topic/Overriding.20RUSTC_WORKSPACE_WRAPPER.20with.20RUSTC/near/325529313 for the current status - the clippy changes here aren't something we want to land as-is.

kadiwa4
kadiwa4 reviewed Feb 3, 2023
View reviewed changes
src/bootstrap/bin/rustc.rs
// Use a different compiler for build scripts, since there may not yet be a
// libstd for the real compiler to use. However, if Cargo is attempting to
// determine the version of the compiler, the real compiler needs to be
// used. Currently, these two states are differentiated based on whether
// --target and -vV is/isn't passed.
let (rustc, libdir) = if target.is_none() && version.is_none() {
if verbose > 1 {
eprintln!("Using snapshot complier");
Copy link
Contributor

Choose a reason for hiding this comment

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

*compiler, same below

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Collaborator

bors commented Feb 15, 2023

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

@anden3 anden3 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 Apr 5, 2023
@anden3
Copy link
Contributor

anden3 commented Apr 5, 2023 •
edited
Loading

@kadiwa4 Just want to ping you as part of the triage procedure to let you know that this PR has merge conflicts :)
Apologies, I pinged the wrong person!

@anden3
Copy link
Contributor

anden3 commented Apr 5, 2023

@albertlarsan68 Just want to ping you as part of the triage procedure to let you know that this PR has merge conflicts :)

@albertlarsan68
Copy link
Member Author

I know, I need to work more on this PR.
I might get to it later :)

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@albertlarsan68 albertlarsan68 mentioned this pull request Apr 26, 2023
Closed
@bors
Copy link
Collaborator

bors commented Apr 29, 2023

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

@bors
Copy link
Collaborator

bors commented Jul 13, 2023

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

@JohnCSimon
Copy link
Member

@albertlarsan68
ping from triage - can you post your status on this PR? There hasn't been an update in a few months. Thanks!

@albertlarsan68
Copy link
Member Author

I'll be unavailable for 1 to 2 months to work on it, so I'll mark it as blocked on me.
Concerning the status, it is kinda stuck in a limbo between multiple implementation difficulties. If someone wants to continue this, they can contact me on Zulip and I'll try to answer.

@albertlarsan68 albertlarsan68 added the S-blocked Status: Blocked on something else such as an RFC or other implementation work. label Oct 1, 2023
@jyn514 jyn514 mentioned this pull request Nov 5, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 16, 2023
@bors
Auto merge of rust-lang#117595 - jyn514:x-clippy, r=albertlarsan68
082062c 
x clippy

thanks to `@asquared31415` `@albertlarsan68` for all their help, most of this pr is their work

note that this also adds x clippy --stage 0 -Awarnings to x86_64-gnu-llvm-15 to make sure it stays working; that won't gate on any clippy warnings, just enforce that clippy doesn't give a hard error. we can't add --stage 1 until clippy fixes its debug assertions not to panic.

note that `x clippy --stage 1` currently breaks when combined with download-rustc.

unlike the previous prs, this doesn't require changes to clippy (it works by using RUSTC_WRAPPER instead), and supports stage 0

read this commit-by-commit

closes rust-lang#107628; see also rust-lang#106394, rust-lang#97443. fixes rust-lang#95988. helps with rust-lang#76495.

r? bootstrap
@bors bors closed this in 4451777 Dec 16, 2023
@albertlarsan68 albertlarsan68 deleted the bootstrap-clippy branch December 17, 2023 12:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
1 more reviewer

@kadiwa4 kadiwa4 kadiwa4 left review comments

Reviewers whose approvals may not affect merge requirements
Assignees

@flip1995 flip1995

Labels
A-clippy Area: Clippy A-testsuite Area: The testsuite used to check the correctness of rustc S-blocked Status: Blocked on something else such as an RFC or other implementation work. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. 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. T-release Relevant to the release subteam, 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.
10 participants
@albertlarsan68 @rustbot @jyn514 @rust-log-analyzer @bors @anden3 @JohnCSimon @kadiwa4 @flip1995 @asquared31415