Use clap dynamic completion for `+toolchain` - #5033

Merged

rami3l merged 3 commits into

rust-lang:mainfrom

Cloud0310:clap-completion

Aug 25, 2026

Cloud0310 commented Aug 24, 2026 •

edited by rami3l

Loading

Contributor

Related to #2268.

Verified manually (see #5033 (comment)).

rami3l reviewed

View reviewed changes

src/bin/rustup-init.rs Outdated

rami3l reviewed

View reviewed changes

src/cli/rustup_mode.rs Outdated

Cloud0310 force-pushed the clap-completion branch from 90d4fe8 to 30aaa6f Compare

August 24, 2026 15:25

rami3l reviewed

View reviewed changes

src/cli/rustup_mode.rs Outdated

rami3l reviewed

View reviewed changes

tests/suite/cli_misc.rs

Cloud0310 force-pushed the clap-completion branch from 30aaa6f to d5093d4 Compare

August 24, 2026 15:30

rami3l reviewed

View reviewed changes

src/cli/rustup_mode.rs Outdated

rami3l reviewed

View reviewed changes

src/cli/rustup_mode.rs Outdated

Cloud0310 force-pushed the clap-completion branch from d5093d4 to ff1b38d Compare

August 25, 2026 06:04

rami3l force-pushed the clap-completion branch 2 times, most recently from 4829036 to 61462d2 Compare

August 25, 2026 08:49

rami3l marked this pull request as draft

August 25, 2026 10:18

rami3l added 2 commits

August 25, 2026 19:00


          refactor(cli/rustup-mode): take Cfg in display_version()

f7e09f6


          refactor(cli/rustup-mode): reuse Cfg in main()

bc1e91d

Cloud0310 force-pushed the clap-completion branch from 61462d2 to d36fb17 Compare

August 25, 2026 13:05

Cloud0310 requested a review from rami3l

August 25, 2026 13:05

rami3l marked this pull request as ready for review

August 25, 2026 13:07

rami3l reviewed

View reviewed changes

rami3l left a comment •

edited by rustbot

Loading

Member

Great work!

I have one remaining concern and I guess we can merge this real quick once that is resolved.

View changes since this review

src/cli/rustup_mode.rs Outdated

rami3l reviewed

View reviewed changes

src/cli/rustup_mode.rs


          feat(cli/completion): use clap dynamic parsing

Co-authored-by: rami3l <rami3l@outlook.com>

Cloud0310 force-pushed the clap-completion branch from d36fb17 to 7102660 Compare

August 25, 2026 15:08

rami3l reviewed

View reviewed changes

rami3l left a comment •

edited

Loading

Member

@Cloud0310 I think we can leave the rest (what to change in rustup completions, what to change in the docs etc.) to future PRs.

Let's merge this first and unblock @FranciscoTGouveia!

View changes since this review

rami3l approved these changes

View reviewed changes

rami3l enabled auto-merge

August 25, 2026 15:15

rami3l added this pull request to the merge queue

Cloud0310 commented Aug 25, 2026

Contributor Author

@Cloud0310 I think we can leave the rest (what to change in rustup completions, what to change in the docs etc.) to future PRs.

Let's merge this first and unblock @FranciscoTGouveia!

View changes since this review

Yes, but I guess the reasonable choice on Windows dynamic completion is to opt in finally, for unix I guess it's okay for defaulting to use dynamic completion by default. And this should be documented as well. Till' Windows has a solution for their poor pipe performance under pwsh (this is even slower then loading from the disk), guess defaulting to dynamic shouldn't be a valid option.

rami3l commented Aug 25, 2026

Member

@Cloud0310 Sure. OTOH cargo's support for dynamic completions is also unstable so I think there is no rush in resolving this...

Cloud0310 closed this

github-merge-queue Bot removed this pull request from the merge queue due to a manual request

Cloud0310 deleted the clap-completion branch

August 25, 2026 15:43

Cloud0310 restored the clap-completion branch

August 25, 2026 16:08

Cloud0310 reopened this

rami3l enabled auto-merge

August 25, 2026 16:08

Cloud0310 commented Aug 25, 2026

Contributor Author

Sorry for the misclick.

rami3l added this pull request to the merge queue

rami3l commented Aug 25, 2026 •

edited

Loading

Member

Sorry for the misclick.

@Cloud0310 No worries! I've re-enqueued the PR, it should be good now.

Merged via the queue into rust-lang:main with commit 9b191c4

62 checks passed

rami3l deleted the clap-completion branch

August 25, 2026 17:01

rustbot mentioned this pull request

feat(cli/rustup-mode): support rustup completion for nushell #4614

Open

This was referenced Aug 25, 2026

Duplicate auto completions; clap unaware of the +toolchain syntax #2268

Open

Add dynamic completions for target names in rustup target sub-command #5032

Open

rami3l changed the title ~~Use clap dynamic parsing to fix toolchain completion~~ Use clap dynamic toolchain completion for +toolchain

rami3l changed the title ~~Use clap dynamic toolchain completion for +toolchain~~ Use clap dynamic completion for +toolchain

baka-gourd mentioned this pull request

Add support for clap unstable-dynamic feature prefix-dev/pixi#6898

Open

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet