Skip to content

Commit 1ac43cf

Browse files
committed
Auto merge of rust-lang#10968 - hi-rustin:rustin-patch-msg, r=ehuss
Improve error msg for get target runner Actually, we'll get this config from three places. So this msg may be confusing when you set it up in `.cargo/config.toml` or pass it by `--config`. We already printed the location of the config, so I think it's OK to change it to `configurations`.
2 parents a120cfe + 6bb4050 commit 1ac43cf

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/cargo/core/compiler/compilation.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ fn target_runner(
409409
let matching_runner = cfgs.next();
410410
if let Some((key, runner)) = cfgs.next() {
411411
anyhow::bail!(
412-
"several matching instances of `target.'cfg(..)'.runner` in `.cargo/config`\n\
412+
"several matching instances of `target.'cfg(..)'.runner` in configurations\n\
413413
first match `{}` located in {}\n\
414414
second match `{}` located in {}",
415415
matching_runner.unwrap().0,

tests/testsuite/tool_paths.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ fn custom_runner_cfg_collision() {
252252
.with_status(101)
253253
.with_stderr(
254254
"\
255-
[ERROR] several matching instances of `target.'cfg(..)'.runner` in `.cargo/config`
255+
[ERROR] several matching instances of `target.'cfg(..)'.runner` in configurations
256256
first match `cfg(not(target_arch = \"avr\"))` located in [..]/foo/.cargo/config
257257
second match `cfg(not(target_os = \"none\"))` located in [..]/foo/.cargo/config
258258
",

0 commit comments

Comments
 (0)