Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/project-model/src/workspace.rs')
-rw-r--r--crates/project-model/src/workspace.rs6
1 files changed, 2 insertions, 4 deletions
diff --git a/crates/project-model/src/workspace.rs b/crates/project-model/src/workspace.rs
index 9598316178..5a9d8483c8 100644
--- a/crates/project-model/src/workspace.rs
+++ b/crates/project-model/src/workspace.rs
@@ -1362,12 +1362,10 @@ fn add_target_crate_root(
let mut env = cargo.env().clone();
inject_cargo_package_env(&mut env, pkg);
inject_cargo_env(&mut env);
- inject_rustc_tool_env(&mut env, cargo, cargo_name, kind);
+ inject_rustc_tool_env(&mut env, cargo_name, kind);
if let Some(envs) = build_data.map(|(it, _)| &it.envs) {
- for (k, v) in envs {
- env.set(k, v.clone());
- }
+ env.extend_from_other(envs);
}
let crate_id = crate_graph.add_crate_root(
file_id,