bump treewide clap to 4.2.1 #110077

fee1-dead · 2023-04-08T08:44:19Z

rustbot · 2023-04-08T08:44:24Z

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

rustbot · 2023-04-08T08:44:27Z

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.

Mark-Simulacrum

r=me modulo rustfmt ping

Mark-Simulacrum · 2023-04-09T15:28:40Z

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"] }


@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?

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

4.2.1

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 · 2023-04-09T23:04:57Z

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 · 2023-04-09T23:04:59Z

📌 Commit 915b5803946204a593d7c6cfc42e3431dcb51fa7 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

bors · 2023-04-10T10:09:44Z

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

fee1-dead · 2023-04-11T15:05:48Z

@bors r=Mark-Simulacrum

bors · 2023-04-11T15:05:50Z

📌 Commit b4fe761 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

…Mark-Simulacrum bump treewide clap to 4.2.1 cc rust-lang#109302

fee1-dead · 2023-04-12T00:18:22Z

@bors r-

failed in rollup

fee1-dead · 2023-04-12T00:20:24Z

Fixed the error by adding the feature in rustc_workspace_hack

@bors r=Mark-Simulacrum

bors · 2023-04-12T00:20:26Z

📌 Commit bcc8315 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

…Mark-Simulacrum bump treewide clap to 4.2.1 cc rust-lang#109302

compiler-errors · 2023-04-12T03:32:30Z

#110077 (comment)

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

fee1-dead · 2023-04-12T09:29:53Z

@bors rollup=iffy r-

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

fee1-dead · 2023-04-12T10:28:28Z

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.

bors · 2023-04-12T21:04:42Z

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

Dylan-DPC · 2023-05-22T06:41:01Z

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

fee1-dead · 2023-05-22T09:48:35Z

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

fee1-dead · 2023-06-27T16:54:56Z

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

rustbot assigned Mark-Simulacrum Apr 8, 2023

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

fee1-dead mentioned this pull request Apr 8, 2023

Tracking issue for syn 2.0 inside rust-lang/rust #109302

Open

Mark-Simulacrum approved these changes Apr 9, 2023

View reviewed changes

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 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

bump treewide clap to 4.2.1

b4fe761

fee1-dead force-pushed the time-to-bump branch from 915b580 to b4fe761 Compare April 11, 2023 13:57

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

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 mentioned this pull request Apr 11, 2023

Rollup of 8 pull requests #110200

Closed

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

include raw feature for hashbrown in workspace hack

bcc8315

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 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

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 mentioned this pull request Apr 12, 2023

Rollup of 5 pull requests #110216

Closed

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 added S-blocked Status: Marked as 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

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: Marked as blocked ❌ on something else such as an RFC or other implementation work. labels May 22, 2023

Dylan-DPC added S-blocked Status: Marked as 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 mentioned this pull request Jun 20, 2023

update rustfmt #112821

Merged

fee1-dead closed this Jun 27, 2023

fee1-dead deleted the time-to-bump branch June 27, 2023 16:55

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

bump treewide clap to 4.2.1 #110077

bump treewide clap to 4.2.1 #110077

fee1-dead commented Apr 8, 2023

rustbot commented Apr 8, 2023

rustbot commented Apr 8, 2023

Mark-Simulacrum left a comment

Mark-Simulacrum Apr 9, 2023

ytmimi Apr 9, 2023

calebcartwright Apr 9, 2023

fee1-dead commented Apr 9, 2023

bors commented Apr 9, 2023

bors commented Apr 10, 2023

fee1-dead commented Apr 11, 2023

bors commented Apr 11, 2023

fee1-dead commented Apr 12, 2023

fee1-dead commented Apr 12, 2023

bors commented Apr 12, 2023

compiler-errors commented Apr 12, 2023

fee1-dead commented Apr 12, 2023

fee1-dead commented Apr 12, 2023

bors commented Apr 12, 2023

Dylan-DPC commented May 22, 2023

fee1-dead commented May 22, 2023

fee1-dead commented Jun 27, 2023

bump treewide clap to 4.2.1 #110077

bump treewide clap to 4.2.1 #110077

Conversation

fee1-dead commented Apr 8, 2023

rustbot commented Apr 8, 2023

rustbot commented Apr 8, 2023

Mark-Simulacrum left a comment

Choose a reason for hiding this comment

Mark-Simulacrum Apr 9, 2023

Choose a reason for hiding this comment

ytmimi Apr 9, 2023

Choose a reason for hiding this comment

3.1

4.2.1

calebcartwright Apr 9, 2023

Choose a reason for hiding this comment

fee1-dead commented Apr 9, 2023

bors commented Apr 9, 2023

bors commented Apr 10, 2023

fee1-dead commented Apr 11, 2023

bors commented Apr 11, 2023

fee1-dead commented Apr 12, 2023

fee1-dead commented Apr 12, 2023

bors commented Apr 12, 2023

compiler-errors commented Apr 12, 2023

fee1-dead commented Apr 12, 2023

fee1-dead commented Apr 12, 2023

bors commented Apr 12, 2023

Dylan-DPC commented May 22, 2023

fee1-dead commented May 22, 2023

fee1-dead commented Jun 27, 2023