Skip to content

fix(completions): include all in cargo tree --target candidates #16322

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

Merged
merged 1 commit into from
Dec 2, 2025
Merged

fix(completions): include all in cargo tree --target candidates #16322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/bin/cargo/commands/tree.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,10 @@ pub fn cli() -> Command {
)
.arg_features()
.arg(flag("all-targets", "Deprecated, use --target=all instead").hide(true))
.arg_target_triple(
.arg_target_triple_with_candidates(
"Filter dependencies matching the given target-triple (default host platform). \
Pass `all` to include all targets.",
ArgValueCandidates::new(get_target_triples_with_all),
)
.arg_manifest_path()
.arg_lockfile_path()
Expand Down
18 changes: 17 additions & 1 deletion src/cargo/util/command_prelude.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,14 @@ pub trait CommandExt: Sized {
}

fn arg_target_triple(self, target: &'static str) -> Self {
self.arg_target_triple_with_candidates(target, ArgValueCandidates::new(get_target_triples))
}

fn arg_target_triple_with_candidates(
self,
target: &'static str,
target_completion: ArgValueCandidates,
) -> Self {
let unsupported_short_arg = {
let value_parser = UnknownArgumentValueParser::suggest_arg("--target");
Arg::new("unsupported-short-target-flag")
Expand All @@ -339,7 +347,7 @@ pub trait CommandExt: Sized {
self._arg(
optional_multi_opt("target", "TRIPLE", target)
.help_heading(heading::COMPILATION_OPTIONS)
.add(clap_complete::ArgValueCandidates::new(get_target_triples)),
.add(target_completion),
)
._arg(unsupported_short_arg)
}
Expand Down Expand Up @@ -1283,6 +1291,14 @@ fn get_target_triples() -> Vec<clap_complete::CompletionCandidate> {
candidates
}

pub fn get_target_triples_with_all() -> Vec<clap_complete::CompletionCandidate> {
let mut candidates = vec![
clap_complete::CompletionCandidate::new("all").help(Some("Include all targets".into())),
];
candidates.extend(get_target_triples());
candidates
}

fn get_target_triples_from_rustup() -> CargoResult<Vec<clap_complete::CompletionCandidate>> {
let output = std::process::Command::new("rustup")
.arg("target")
Expand Down