language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-08-31 07:37:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Setup Env in world

Browse source
This commit is contained in:
Edwin Cheng 2020-03-10 22:00:58 +08:00
parent 22f064cca7
commit e00a1e0b79
3 changed files with 52 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -14,7 +14,7 @@ use std::{
use anyhow::{bail, Context, Result};
use ra_cfg::CfgOptions;
use ra_db::{CrateGraph, CrateName, Edition, Env, FileId};
use ra_db::{CrateGraph, CrateName, Edition, Env, ExternSourceId, FileId};
use rustc_hash::FxHashMap;
use serde_json::from_reader;
@ -162,6 +162,7 @@ impl ProjectWorkspace {
pub fn to_crate_graph(
&self,
default_cfg_options: &CfgOptions,
outdirs: &FxHashMap<String, (ExternSourceId, String)>,
load: &mut dyn FnMut(&Path) -> Option<FileId>,
) -> CrateGraph {
let mut crate_graph = CrateGraph::default();
@ -185,6 +186,8 @@ impl ProjectWorkspace {
}
opts
};
// FIXME: No crate name in json definition such that we cannot add OUT_DIR to env
crates.insert(
crate_id,
crate_graph.add_crate_root(
@ -231,12 +234,17 @@ impl ProjectWorkspace {
opts
};
let mut env = Env::default();
if let Some((id, path)) = outdirs.get(krate.name(&sysroot)) {
env.set_extern_path("OUT_DIR", &path, *id);
}
let crate_id = crate_graph.add_crate_root(
file_id,
Edition::Edition2018,
Some(krate.name(&sysroot).to_string()),
cfg_options,
Env::default(),
env,
);
sysroot_crates.insert(krate, crate_id);
}
@ -275,12 +283,16 @@ impl ProjectWorkspace {
opts.insert_features(pkg.features(&cargo).iter().map(Into::into));
opts
};
let mut env = Env::default();
if let Some((id, path)) = outdirs.get(pkg.name(&cargo)) {
env.set_extern_path("OUT_DIR", &path, *id);
}
let crate_id = crate_graph.add_crate_root(
file_id,
edition,
Some(pkg.name(&cargo).to_string()),
cfg_options,
Env::default(),
env,
);
if tgt.kind(&cargo) == TargetKind::Lib {
lib_tgt = Some(crate_id);