user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correctly pass toolchain to cargo command

Browse source
This commit is contained in:
Guillaume Gomez 2023-11-23 16:25:52 +01:00
parent d793f80bd4
commit 4bed89f79b
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
build_system/src/test.rs
View file

@ -672,17 +672,14 @@ where
F: Fn(&[&dyn AsRef<OsStr>], Option<&Path>, &Env) -> Result<(), String>,
{
let toolchain = get_toolchain()?;
let toolchain_arg = format!("+{}", toolchain);
let rustc_version = String::from_utf8(
run_command_with_env(&[&args.config_info.rustc_command[0], &"-V"], cwd, Some(env))?.stdout,
)
.map_err(|error| format!("Failed to retrieve rustc version: {:?}", error))?;
let rustc_toolchain_version = String::from_utf8(
run_command_with_env(
&[
&args.config_info.rustc_command[0],
&format!("+{}", toolchain),
&"-V",
],
&[&args.config_info.rustc_command[0], &toolchain_arg, &"-V"],
cwd,
Some(env),
)?
@ -697,7 +694,7 @@ where
);
eprintln!("Using `{}`.", rustc_toolchain_version);
}
let mut cargo_command: Vec<&dyn AsRef<OsStr>> = vec![&"cargo", &toolchain];
let mut cargo_command: Vec<&dyn AsRef<OsStr>> = vec![&"cargo", &toolchain_arg];
cargo_command.extend_from_slice(&command);
callback(&cargo_command, cwd, env)
}