Skip to content
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

bump treewide clap to 4.2.1 #110077

Closed
wants to merge 2 commits into from
Closed

bump treewide clap to 4.2.1 #110077

wants to merge 2 commits into from

Conversation

fee1-dead
Copy link
Member

cc #109302

@rustbot
Copy link
Collaborator

rustbot commented Apr 8, 2023

r? @Mark-Simulacrum

(rustbot has picked a reviewer for you, use r? to override)

@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 Apr 8, 2023
@rustbot
Copy link
Collaborator

rustbot commented Apr 8, 2023

Some changes occurred in src/tools/rustfmt

cc @rust-lang/rustfmt

These commits modify the Cargo.lock file. Random changes to Cargo.lock can be introduced when switching branches and rebasing PRs.
This was probably unintentional and should be reverted before this PR is merged.

If this was intentional then you can ignore this comment.

@fee1-dead fee1-dead mentioned this pull request Apr 8, 2023
Open
Mark-Simulacrum
Mark-Simulacrum approved these changes Apr 9, 2023
View reviewed changes
Copy link
Member

@Mark-Simulacrum Mark-Simulacrum left a comment

Choose a reason for hiding this comment

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

r=me modulo rustfmt ping

src/tools/rustfmt/Cargo.toml
@@ -37,7 +37,7 @@ annotate-snippets = { version = "0.9", features = ["color"] }
anyhow = "1.0"
bytecount = "0.6"
cargo_metadata = "0.14"
clap = { version = "3.1", features = ["derive"] }
clap = { version = "4.2.1", features = ["derive"] }
Copy link
Member

Choose a reason for hiding this comment

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

@rust-lang/rustfmt Are you OK with this landing upstream? It seems like there's some changes to code here as well so maybe we should go through PR to rustfmt?

Copy link
Contributor

Choose a reason for hiding this comment

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

Adding clap 3.1 gave us some trouble rust-lang/rustfmt#5395, but I think bumping to 4.2.1 upstream should be fine. I've gone ahead and tested the 4.2.1 changes locally. There are some slight changes in the --help output, but I also think that's fine. @calebcartwright what are your thoughts?

3.1

Screen Shot 2023-04-09 at 12 43 26 PM

4.2.1

Screen Shot 2023-04-09 at 12 45 03 PM

Copy link
Member

Choose a reason for hiding this comment

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

In general I don't think subtrees should be updated in tree unless absolutely necessary (e.g. rustc_ast updates requiring corresponding updates in clippy, rustfmt, etc.). I understand the benefit of making a broad update like this in tree, but I don't particularly like it (we run a reduced test suite here, lockfile considerations can complicate subtree syncs, etc.)

Suppose we can let this one slide (thanks Yacin for taking a closer look), but in the future would really want to see something like this come directly to the rustfmt repo and then make its way in-tree here via the usual sync process

@fee1-dead
Copy link
Member Author

Thanks for the review. I will send PR to the subtree next time changes like this are to be made.

@bors r=Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Apr 9, 2023

📌 Commit 915b5803946204a593d7c6cfc42e3431dcb51fa7 has been approved by Mark-Simulacrum

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 Apr 9, 2023
@bors
Copy link
Contributor

bors commented Apr 10, 2023

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

@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 10, 2023
@fee1-dead
Copy link
Member Author

@bors r=Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Apr 11, 2023

📌 Commit b4fe761 has been approved by Mark-Simulacrum

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 11, 2023
compiler-errors added a commit to compiler-errors/rust that referenced this pull request Apr 11, 2023
@compiler-errors
Rollup merge of rust-lang#110077 - fee1-dead-contrib:time-to-bump, r=…
63ade80 
…Mark-Simulacrum

bump treewide clap to 4.2.1

cc rust-lang#109302
@compiler-errors compiler-errors mentioned this pull request Apr 11, 2023
Closed
@fee1-dead
Copy link
Member Author

@bors r-

failed in rollup

@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 12, 2023
@fee1-dead
Copy link
Member Author

Fixed the error by adding the feature in rustc_workspace_hack

@bors r=Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Apr 12, 2023

📌 Commit bcc8315 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@bors bors removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Apr 12, 2023
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 12, 2023
compiler-errors added a commit to compiler-errors/rust that referenced this pull request Apr 12, 2023
@compiler-errors
Rollup merge of rust-lang#110077 - fee1-dead-contrib:time-to-bump, r=…
a3ec0ea 
…Mark-Simulacrum

bump treewide clap to 4.2.1

cc rust-lang#109302
@compiler-errors compiler-errors mentioned this pull request Apr 12, 2023
Closed
@compiler-errors
Copy link
Member

#110077 (comment)

Thanks. I was suspicious this was the reason why it failed but couldn't tell.

@fee1-dead
Copy link
Member Author

@bors rollup=iffy r-

Looks like rustc-workspace-hack needs to be updated?

@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 12, 2023
@fee1-dead
Copy link
Member Author

We should wait for #109133 to be merged first such that this is easier. In the meantime perhaps I could send the rustfmt part as a PR to rustfmt first.

@fee1-dead fee1-dead added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 12, 2023
@bors
Copy link
Contributor

bors commented Apr 12, 2023

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

@Dylan-DPC
Copy link
Member

@fee1-dead #109133 is merged now which unblocks this.

@Dylan-DPC Dylan-DPC added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels May 22, 2023
@fee1-dead
Copy link
Member Author

This is still blocked on rust-lang/rustfmt#5749 and a submodule sync.

@Dylan-DPC Dylan-DPC added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 22, 2023
@calebcartwright calebcartwright mentioned this pull request Jun 20, 2023
Merged
@fee1-dead
Copy link
Member Author

Closing, as it looks like clap has already been bumped.

@fee1-dead fee1-dead closed this Jun 27, 2023
@fee1-dead fee1-dead deleted the time-to-bump branch June 27, 2023 16:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ytmimi ytmimi ytmimi left review comments

@calebcartwright calebcartwright calebcartwright left review comments

@Mark-Simulacrum Mark-Simulacrum Mark-Simulacrum approved these changes

Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
S-blocked Status: Blocked on something else such as an RFC or other implementation work. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@fee1-dead @rustbot @bors @compiler-errors @Dylan-DPC @Mark-Simulacrum @calebcartwright @ytmimi