Skip to content

fix(check): Fix suggested command for bin package #16127

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 2 commits into from
Oct 17, 2025
Merged

fix(check): Fix suggested command for bin package #16127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fe3876
test(add): add test to show current behaviour of cargo check
dawedawe Oct 17, 2025
dc0eefb
fix(check): fix the suggested fix command by always using -p
dawedawe Oct 17, 2025
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
11 changes: 2 additions & 9 deletions src/cargo/core/compiler/job_queue/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1085,15 +1085,8 @@ impl<'gctx> DrainState<'gctx> {
Some(wrapper) if wrapper == clippy => "cargo clippy --fix",
_ => "cargo fix",
};
let mut args = {
let named = unit.target.description_named();
// if its a lib we need to add the package to fix
if unit.target.is_lib() {
format!("{} -p {}", named, unit.pkg.name())
} else {
named
}
};
let mut args =
format!("{} -p {}", unit.target.description_named(), unit.pkg.name());
if unit.mode.is_rustc_test()
&& !(unit.target.is_test() || unit.target.is_bench())
{
Expand Down
31 changes: 26 additions & 5 deletions tests/testsuite/check.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,6 +515,27 @@ fn check_virtual_manifest_one_project() {
.run();
}

#[cargo_test]
fn check_virtual_manifest_one_bin_project_not_in_default_members() {
let p = project()
.file(
"Cargo.toml",
r#"
[workspace]
members = ["bar"]
default-members = []
resolver = "3"
"#,
)
.file("bar/Cargo.toml", &basic_manifest("bar", "0.1.0"))
.file("bar/src/main.rs", "fn main() { let _ = (1); }")
.build();

p.cargo("check -p bar")
.with_stderr_contains("[..]run `cargo fix --bin \"bar\" -p bar` to apply[..]")
.run();
}

#[cargo_test]
fn check_virtual_manifest_glob() {
let p = project()
Expand Down Expand Up @@ -1400,7 +1421,7 @@ fn check_fixable_example() {
p.cargo("check --all-targets")
.with_stderr_data(str![[r#"
...
[WARNING] `foo` (example "ex1") generated 1 warning (run `cargo fix --example "ex1"` to apply 1 suggestion)
[WARNING] `foo` (example "ex1") generated 1 warning (run `cargo fix --example "ex1" -p foo` to apply 1 suggestion)
...
"#]])
.run();
Expand Down Expand Up @@ -1446,7 +1467,7 @@ fn check_fixable_bench() {
p.cargo("check --all-targets")
.with_stderr_data(str![[r#"
...
[WARNING] `foo` (bench "bench") generated 1 warning (run `cargo fix --bench "bench"` to apply 1 suggestion)
[WARNING] `foo` (bench "bench") generated 1 warning (run `cargo fix --bench "bench" -p foo` to apply 1 suggestion)
...
"#]])
.run();
Expand Down Expand Up @@ -1496,9 +1517,9 @@ fn check_fixable_mixed() {
.build();
p.cargo("check --all-targets")
.with_stderr_data(str![[r#"
[WARNING] `foo` (example "ex1") generated 1 warning (run `cargo fix --example "ex1"` to apply 1 suggestion)
[WARNING] `foo` (bench "bench") generated 1 warning (run `cargo fix --bench "bench"` to apply 1 suggestion)
[WARNING] `foo` (bin "foo" test) generated 2 warnings (run `cargo fix --bin "foo" --tests` to apply 2 suggestions)
[WARNING] `foo` (example "ex1") generated 1 warning (run `cargo fix --example "ex1" -p foo` to apply 1 suggestion)
[WARNING] `foo` (bench "bench") generated 1 warning (run `cargo fix --bench "bench" -p foo` to apply 1 suggestion)
[WARNING] `foo` (bin "foo" test) generated 2 warnings (run `cargo fix --bin "foo" -p foo --tests` to apply 2 suggestions)
...
"#]].unordered())
.run();
Expand Down