Skip to content

Commit a73e5b7

Browse files
committed
Auto merge of #9066 - rubenrua:hotfix_sort_bins, r=ehuss
Sort available binaries when multiple From: ``` error: `cargo run` could not determine which binary to run. Use the `--bin` option to specify a binary, or the `default-run` manifest key. available binaries: basic-tutorial-13, basic-tutorial-6, basic-tutorial-1, basic-tutorial-4, basic-tutorial-9, basic-tutorial-2, basic-tutorial-3, basic-tutorial-5, basic-tutorial-12, playback-tutorial-4, basic-tutorial-8, basic-tutorial-7 ``` To: ``` error: `cargo run` could not determine which binary to run. Use the `--bin` option to specify a binary, or the `default-run` manifest key. available binaries: basic-tutorial-1, basic-tutorial-12, basic-tutorial-13, basic-tutorial-2, basic-tutorial-3, basic-tutorial-4, basic-tutorial-5, basic-tutorial-6, basic-tutorial-7, basic-tutorial-8, basic-tutorial-9, playback-tutorial-4 ```
2 parents 7f41cf6 + eb31d1a commit a73e5b7

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

src/cargo/ops/cargo_run.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,11 @@ pub fn run(
5555

5656
if bins.len() > 1 {
5757
if !options.filter.is_specific() {
58-
let names: Vec<&str> = bins
58+
let mut names: Vec<&str> = bins
5959
.into_iter()
6060
.map(|(_pkg, target)| target.name())
6161
.collect();
62+
names.sort();
6263
anyhow::bail!(
6364
"`cargo run` could not determine which binary to run. \
6465
Use the `--bin` option to specify a binary, \

tests/testsuite/required_features.rs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1169,6 +1169,11 @@ fn run_default_multiple_required_features() {
11691169
path = "src/foo1.rs"
11701170
required-features = ["a"]
11711171
1172+
[[bin]]
1173+
name = "foo3"
1174+
path = "src/foo3.rs"
1175+
required-features = ["b"]
1176+
11721177
[[bin]]
11731178
name = "foo2"
11741179
path = "src/foo2.rs"
@@ -1177,6 +1182,7 @@ fn run_default_multiple_required_features() {
11771182
)
11781183
.file("src/lib.rs", "")
11791184
.file("src/foo1.rs", "extern crate foo; fn main() {}")
1185+
.file("src/foo3.rs", "extern crate foo; fn main() {}")
11801186
.file("src/foo2.rs", "extern crate foo; fn main() {}")
11811187
.build();
11821188

@@ -1185,7 +1191,7 @@ fn run_default_multiple_required_features() {
11851191
.with_stderr(
11861192
"\
11871193
error: `cargo run` could not determine which binary to run[..]
1188-
available binaries: foo1, foo2",
1194+
available binaries: foo1, foo2, foo3",
11891195
)
11901196
.run();
11911197
}

0 commit comments

Comments
 (0)