diff options
author | Aleksey Kladov <[email protected]> | 2020-07-21 14:12:12 +0100 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2020-07-21 14:12:12 +0100 |
commit | b48336bf940ce1b55e72d244ff9f28573f2e5548 (patch) | |
tree | da5fd9e13669d6f9a59baf6ed678c8b807d2c67e /crates/ra_project_model/src/lib.rs | |
parent | fe87aec7b61c7cf4c62162f257655507c4fd9422 (diff) |
Replace OUT_DIR in project.json with general env
OUT_DIR doesn't make sense here, as this is a cargo-specific concept
Diffstat (limited to 'crates/ra_project_model/src/lib.rs')
-rw-r--r-- | crates/ra_project_model/src/lib.rs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/crates/ra_project_model/src/lib.rs b/crates/ra_project_model/src/lib.rs index 05f2e7b7a..2bb156610 100644 --- a/crates/ra_project_model/src/lib.rs +++ b/crates/ra_project_model/src/lib.rs | |||
@@ -259,11 +259,8 @@ impl ProjectWorkspace { | |||
259 | let file_id = load(&file_path)?; | 259 | let file_id = load(&file_path)?; |
260 | 260 | ||
261 | let mut env = Env::default(); | 261 | let mut env = Env::default(); |
262 | if let Some(out_dir) = &krate.out_dir { | 262 | for (k, v) in &krate.env { |
263 | // NOTE: cargo and rustc seem to hide non-UTF-8 strings from env! and option_env!() | 263 | env.set(k, v.clone()); |
264 | if let Some(out_dir) = out_dir.to_str().map(|s| s.to_owned()) { | ||
265 | env.set("OUT_DIR", out_dir); | ||
266 | } | ||
267 | } | 264 | } |
268 | let proc_macro = krate | 265 | let proc_macro = krate |
269 | .proc_macro_dylib_path | 266 | .proc_macro_dylib_path |