Get all members as `available targets` even though default-members was specified. #15199

linyihai · 2025-02-18T11:06:44Z

What does this PR try to resolve?

The old behavior gets members from default-members if specified in a virtual workspace, this PR gets all workspace members for Available target hints.

Fixes #14544

How should we test and review this PR?

The first commit added the test, the second commit addressed the issue.

Additional information

rustbot · 2025-02-18T11:06:50Z

r? @weihanglo

rustbot has assigned @weihanglo.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

tests/testsuite/workspaces.rs

src/cargo/util/workspace.rs

src/cargo/ops/cargo_compile/unit_generator.rs

tests/testsuite/workspaces.rs

src/cargo/ops/cargo_compile/unit_generator.rs

tests/testsuite/build.rs

tests/testsuite/workspaces.rs

src/cargo/ops/cargo_compile/unit_generator.rs

tests/testsuite/workspaces.rs

src/cargo/ops/cargo_compile/unit_generator.rs

tests/testsuite/workspaces.rs

…ave the `Target`

epage

Thanks!

Update cargo 22 commits in 2622e844bc1e2e6123e54e94e4706f7b6195ce3d..ab1463d632528e39daf35f263e10c14cbe590ce8 2025-02-28 12:33:57 +0000 to 2025-03-08 01:45:05 +0000 - test: redact host target when comparing CARGO_ENV path (rust-lang/cargo#15279) - feat: add completions for install --path (rust-lang/cargo#15266) - fix(package): report lockfile / workspace manifest is dirty (rust-lang/cargo#15276) - feat(tree): Add `--depth public` behind `-Zunstable-options` (rust-lang/cargo#15243) - Don't use `$CARGO_BUILD_TARGET` in `cargo metadata` (rust-lang/cargo#15271) - feat: show extra build description from bootstrap (rust-lang/cargo#15269) - Upgrade to `rustc-stable-hash v0.1.2` (rust-lang/cargo#15268) - fix: Respect --frozen everywhere --offline or --locked is accepted (rust-lang/cargo#15263) - feat(tree): Color the output (rust-lang/cargo#15242) - fix(vendor): dont remove non-cached source (rust-lang/cargo#15260) - docs: lockfile is always included since 1.84 (rust-lang/cargo#15257) - Remove `Cargo.toml` from `package.include` in example (rust-lang/cargo#15253) - Small cleanup: remove unneeded result (rust-lang/cargo#15256) - Fix typo in build-scripts.md (rust-lang/cargo#15254) - chore(deps): update rust crate pulldown-cmark to 0.13.0 (rust-lang/cargo#15250) - chore(deps): update compatible (rust-lang/cargo#15249) - feat(cli): forward bash completions of third party subcommands (rust-lang/cargo#15247) - feat: add completions for `--lockfile-path` (rust-lang/cargo#15238) - fix: reset $CARGO if the running program is real `cargo[.exe]` (rust-lang/cargo#15208) - Get all members as `available targets` even though default-members was specified. (rust-lang/cargo#15199) - refactor: control byte display precision with std::fmt options (rust-lang/cargo#15246) - fix(package): Ensure we can package directories ending with '.rs' (rust-lang/cargo#15240)

…#15298) ### What does this PR try to resolve? This builds on the work done in #15199 to improve target selection errors to also disambiguate when the same binary name is used in multiple packages. This also makes the errors from #15199 more consistent with the rustc style guide and reduces code duplication. Fixes #13312 ### How should we test and review this PR? This is a first pass and does not do the full `--package foo --bin bar` syntax. I wanted to focus on the basic functionality before we iterated on it, e.g. investigating how well we can predict the CLI flags, how much noise they might add, etc. ### Additional information

Update cargo 22 commits in 2622e844bc1e2e6123e54e94e4706f7b6195ce3d..ab1463d632528e39daf35f263e10c14cbe590ce8 2025-02-28 12:33:57 +0000 to 2025-03-08 01:45:05 +0000 - test: redact host target when comparing CARGO_ENV path (rust-lang/cargo#15279) - feat: add completions for install --path (rust-lang/cargo#15266) - fix(package): report lockfile / workspace manifest is dirty (rust-lang/cargo#15276) - feat(tree): Add `--depth public` behind `-Zunstable-options` (rust-lang/cargo#15243) - Don't use `$CARGO_BUILD_TARGET` in `cargo metadata` (rust-lang/cargo#15271) - feat: show extra build description from bootstrap (rust-lang/cargo#15269) - Upgrade to `rustc-stable-hash v0.1.2` (rust-lang/cargo#15268) - fix: Respect --frozen everywhere --offline or --locked is accepted (rust-lang/cargo#15263) - feat(tree): Color the output (rust-lang/cargo#15242) - fix(vendor): dont remove non-cached source (rust-lang/cargo#15260) - docs: lockfile is always included since 1.84 (rust-lang/cargo#15257) - Remove `Cargo.toml` from `package.include` in example (rust-lang/cargo#15253) - Small cleanup: remove unneeded result (rust-lang/cargo#15256) - Fix typo in build-scripts.md (rust-lang/cargo#15254) - chore(deps): update rust crate pulldown-cmark to 0.13.0 (rust-lang/cargo#15250) - chore(deps): update compatible (rust-lang/cargo#15249) - feat(cli): forward bash completions of third party subcommands (rust-lang/cargo#15247) - feat: add completions for `--lockfile-path` (rust-lang/cargo#15238) - fix: reset $CARGO if the running program is real `cargo[.exe]` (rust-lang/cargo#15208) - Get all members as `available targets` even though default-members was specified. (rust-lang/cargo#15199) - refactor: control byte display precision with std::fmt options (rust-lang/cargo#15246) - fix(package): Ensure we can package directories ending with '.rs' (rust-lang/cargo#15240)

rustbot assigned weihanglo Feb 18, 2025

rustbot added A-cli Area: Command-line interface, option parsing, etc. A-workspaces Area: workspaces S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 18, 2025

epage reviewed Feb 18, 2025

View reviewed changes

tests/testsuite/workspaces.rs Show resolved Hide resolved

linyihai force-pushed the available-packages branch from 3c409c9 to ee13fd6 Compare February 19, 2025 11:48

rustbot added the A-cargo-targets Area: selection and definition of targets (lib, bins, examples, tests, benches) label Feb 19, 2025

linyihai force-pushed the available-packages branch from ee13fd6 to d1ed4c8 Compare February 19, 2025 12:19

epage reviewed Feb 19, 2025

View reviewed changes

src/cargo/util/workspace.rs Outdated Show resolved Hide resolved

epage reviewed Feb 19, 2025

View reviewed changes

src/cargo/ops/cargo_compile/unit_generator.rs Outdated Show resolved Hide resolved

epage reviewed Feb 19, 2025

View reviewed changes

src/cargo/ops/cargo_compile/unit_generator.rs Show resolved Hide resolved

epage reviewed Feb 19, 2025

View reviewed changes

src/cargo/ops/cargo_compile/unit_generator.rs Outdated Show resolved Hide resolved

linyihai force-pushed the available-packages branch from d1ed4c8 to 7389aff Compare February 20, 2025 12:25

epage reviewed Feb 20, 2025

View reviewed changes

tests/testsuite/workspaces.rs Outdated Show resolved Hide resolved

epage reviewed Feb 20, 2025

View reviewed changes

tests/testsuite/workspaces.rs Outdated Show resolved Hide resolved

epage reviewed Feb 20, 2025

View reviewed changes

src/cargo/ops/cargo_compile/unit_generator.rs Outdated Show resolved Hide resolved

epage reviewed Feb 20, 2025

View reviewed changes

src/cargo/ops/cargo_compile/unit_generator.rs Outdated Show resolved Hide resolved

linyihai force-pushed the available-packages branch 2 times, most recently from 3d78767 to 7735088 Compare February 21, 2025 14:37

epage reviewed Feb 21, 2025

View reviewed changes

tests/testsuite/build.rs Outdated Show resolved Hide resolved

epage reviewed Feb 21, 2025

View reviewed changes

tests/testsuite/workspaces.rs Outdated Show resolved Hide resolved

epage reviewed Feb 21, 2025

View reviewed changes

tests/testsuite/workspaces.rs Outdated Show resolved Hide resolved

linyihai force-pushed the available-packages branch 2 times, most recently from 2ae0f25 to c3aa679 Compare February 23, 2025 04:48

epage reviewed Feb 24, 2025

View reviewed changes

src/cargo/ops/cargo_compile/unit_generator.rs Outdated Show resolved Hide resolved

epage reviewed Feb 24, 2025

View reviewed changes

src/cargo/ops/cargo_compile/unit_generator.rs Show resolved Hide resolved

epage reviewed Feb 24, 2025

View reviewed changes

tests/testsuite/workspaces.rs Outdated Show resolved Hide resolved

linyihai and others added 2 commits February 25, 2025 20:06

test(workspace): Add test about workspace

8b9dc21

refactor: Pull out the filter logic.

3824d83

linyihai force-pushed the available-packages branch from c3aa679 to 685f0fd Compare February 25, 2025 12:13

epage reviewed Feb 26, 2025

View reviewed changes

src/cargo/ops/cargo_compile/unit_generator.rs Outdated Show resolved Hide resolved

epage reviewed Feb 26, 2025

View reviewed changes

tests/testsuite/workspaces.rs Show resolved Hide resolved

linyihai force-pushed the available-packages branch from 685f0fd to 3ba29cd Compare February 27, 2025 11:47

epage reviewed Feb 27, 2025

View reviewed changes

tests/testsuite/workspaces.rs Outdated Show resolved Hide resolved

Yihai Lin and others added 3 commits February 28, 2025 10:00

feat(workspace): Search other crates if the default-members doesn't h…

5ad084c

…ave the `Target`

refactor: clean some duplicate code.

bac98aa

feat: Make no target found hint more clear.

fa7712d

linyihai force-pushed the available-packages branch from 3ba29cd to fa7712d Compare February 28, 2025 02:12

epage approved these changes Feb 28, 2025

View reviewed changes

epage added this pull request to the merge queue Feb 28, 2025

Merged via the queue into rust-lang:master with commit 726e2a7 Feb 28, 2025
21 checks passed

weihanglo mentioned this pull request Mar 8, 2025

Update cargo rust-lang/rust#138200

Merged

rustbot added this to the 1.87.0 milestone Mar 10, 2025

This was referenced Mar 11, 2025

Error for cargo run --bin {name} should notice multiple packages have the same binary name #13312

Closed

fix(run): Disambiguate bins from different packages that share a name #15298

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Get all members as `available targets` even though default-members was specified. #15199

Get all members as `available targets` even though default-members was specified. #15199

linyihai commented Feb 18, 2025

rustbot commented Feb 18, 2025

epage left a comment

Get all members as available targets even though default-members was specified. #15199

Get all members as available targets even though default-members was specified. #15199

Conversation

linyihai commented Feb 18, 2025

What does this PR try to resolve?

How should we test and review this PR?

Additional information

rustbot commented Feb 18, 2025

epage left a comment

Choose a reason for hiding this comment

Get all members as `available targets` even though default-members was specified. #15199

Get all members as `available targets` even though default-members was specified. #15199