-
Notifications
You must be signed in to change notification settings - Fork 12.7k
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
rust-installer: migrate to clap 4.2, change to 2021 edition and fix few clippy lints #112884
Conversation
(rustbot has picked a reviewer for you, use r? to override) |
These commits modify the If this was unintentional then you should revert the changes before this PR is merged. |
This comment has been minimized.
This comment has been minimized.
rust/src/tools/tidy/src/walk.rs Lines 29 to 30 in fe37f37
Should this be removed too? |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
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.
Looks generally good to me, can you confirm that the clap changes do not affect the semantics?
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.
I'm not sure about the changes to this file.
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.
Tidy will warn on that .sh file otherwise. There is separate commit for that tab->space replacement, you can check it with 7a61966?diff=unified&w=1 with whitespace hidden.
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.
I meant that the change to perceived to indentation should be reverted IMO, or at least discussed with @Mark-Simulacrum
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.
Whatever is needed for tidy to be happy is excluded of this category, ofc.
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 file contained mixed tab/spaces before, anyway :-)
src/tools/rust-installer/test.sh
Outdated
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.
Same as above
Changes for clap looks trivial and rust-installer tests passed, so i guess all ok. |
The CI failure being ignored is fixed in #112962. |
Can we avoid coupling a migration to clap and the rustfmt/tidy changes into the same PR? This PR is fairly large and seems feasible to break it up. @rustbot author |
@rustbot ready |
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.
How did you run clippy?
Aside from this question, LGTM
r=me with the answer
Just run it out of workspace over crate. |
Thanks for the PR! |
@bors rollup=never touches critical infrastructure |
⌛ Testing commit fd1439e with merge ab12b389db901669010c0643d18f5486c9caaacd... |
The job Click to see the possible cause of the failure (guessed by this bot)
|
💔 Test failed - checks-actions |
One more of https://rust-lang.zulipchat.com/#narrow/stream/131828-t-compiler/topic/MIPS.20failure.20on.20CI |
@bors retry |
☀️ Test successful - checks-actions |
Finished benchmarking commit (06c58cb): comparison URL. Overall result: no relevant changes - no action needed@rustbot label: -perf-regression Instruction countThis benchmark run did not return any relevant results for this metric. Max RSS (memory usage)ResultsThis is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.
CyclesThis benchmark run did not return any relevant results for this metric. Binary sizeThis benchmark run did not return any relevant results for this metric. Bootstrap: 662.314s -> 662.496s (0.03%) |
rust-installer & rls: remove exclusion from rustfmt & tidy <strike>based on rust-lang#112884</strike> `rust-installer` and `rls` no longer submodules, but not removed from exclude list for rustfmt and tidy, preventing running fmt and lints on them.
Updated rust-installer to clap 4.2, dropping last user of clap v3; changes to 2021 edition, fixes few clippy warns.