bump treewide clap to 4.2.1

[fee1-dead]

cc #109302

[rustbot]

r? @Mark-Simulacrum

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

[rustbot]

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]

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

[ytmimi]

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

[calebcartwright]

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]

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]

📌 Commit 915b5803946204a593d7c6cfc42e3431dcb51fa7 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

[bors]

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

[fee1-dead]

@bors r=Mark-Simulacrum

[bors]

📌 Commit b4fe761 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

[fee1-dead]

@bors r-

failed in rollup

[fee1-dead]

Fixed the error by adding the feature in rustc_workspace_hack

@bors r=Mark-Simulacrum

[bors]

📌 Commit bcc8315 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

[compiler-errors]

#110077 (comment)

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

[fee1-dead]

@bors rollup=iffy r-

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

[fee1-dead]

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]

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

[Dylan-DPC]

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

[fee1-dead]

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

[fee1-dead]

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