language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-03 07:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Replace OUT_DIR in project.json with general env

Browse source 
OUT_DIR doesn't make sense here, as this is a cargo-specific concept
This commit is contained in:
Aleksey Kladov 2020-07-21 15:12:12 +02:00
parent fe87aec7b6
commit b48336bf94
2 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/ra_project_model/src/lib.rs
View file

@ -259,11 +259,8 @@ impl ProjectWorkspace {
let file_id = load(&file_path)?;
let mut env = Env::default();
if let Some(out_dir) = &krate.out_dir {
// NOTE: cargo and rustc seem to hide non-UTF-8 strings from env! and option_env!()
if let Some(out_dir) = out_dir.to_str().map(|s| s.to_owned()) {
env.set("OUT_DIR", out_dir);
}
for (k, v) in &krate.env {
env.set(k, v.clone());
}
let proc_macro = krate
.proc_macro_dylib_path