Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-13 13:48:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add optional target to crates in json project, lookup default cfgs per target when generating cfg list

Browse source
This commit is contained in:
Paul Daniel Faria 2020-06-12 13:08:51 -04:00 committed by Paul Daniel Faria
parent c815d5b496
commit db99f2dd7e
3 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
crates/ra_cfg/src/lib.rs
View file

@ -46,4 +46,14 @@ impl CfgOptions {
pub fn insert_key_value(&mut self, key: SmolStr, value: SmolStr) { pub fn insert_key_value(&mut self, key: SmolStr, value: SmolStr) {
self.key_values.insert((key, value)); self.key_values.insert((key, value));
} }
pub fn append(&mut self, other: &CfgOptions) {
for atom in &other.atoms {
self.atoms.insert(atom.clone());
}
for (key, value) in &other.key_values {
self.key_values.insert((key.clone(), value.clone()));
}
}
} }

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

@ -246,6 +246,7 @@ impl ProjectWorkspace {
let mut crate_graph = CrateGraph::default(); let mut crate_graph = CrateGraph::default();
match self { match self {
ProjectWorkspace::Json { project } => { ProjectWorkspace::Json { project } => {
let mut target_cfg_map = FxHashMap::<Option<&str>, CfgOptions>::default();
let crates: FxHashMap<_, _> = project let crates: FxHashMap<_, _> = project
.crates .crates
.iter() .iter()
@ -265,6 +266,14 @@ impl ProjectWorkspace {
.proc_macro_dylib_path .proc_macro_dylib_path
.clone() .clone()
.map(|it| proc_macro_client.by_dylib_path(&it)); .map(|it| proc_macro_client.by_dylib_path(&it));
let target = krate.target.as_deref();
let target_cfgs = target_cfg_map
.entry(target.clone())
.or_insert_with(|| get_rustc_cfg_options(target.as_deref()));
let mut cfg_options = krate.cfg.clone();
cfg_options.append(target_cfgs);
// FIXME: No crate name in json definition such that we cannot add OUT_DIR to env // FIXME: No crate name in json definition such that we cannot add OUT_DIR to env
Some(( Some((
CrateId(seq_index as u32), CrateId(seq_index as u32),
@ -273,7 +282,7 @@ impl ProjectWorkspace {
krate.edition, krate.edition,
// FIXME json definitions can store the crate name // FIXME json definitions can store the crate name
None, None,
krate.cfg.clone(), cfg_options,
env, env,
proc_macro.unwrap_or_default(), proc_macro.unwrap_or_default(),
), ),

3
crates/ra_project_model/src/project_json.rs
View file

@ -31,6 +31,7 @@ pub struct Crate {
pub(crate) edition: Edition, pub(crate) edition: Edition,
pub(crate) deps: Vec<Dependency>, pub(crate) deps: Vec<Dependency>,
pub(crate) cfg: CfgOptions, pub(crate) cfg: CfgOptions,
pub(crate) target: Option<String>,
pub(crate) out_dir: Option<AbsPathBuf>, pub(crate) out_dir: Option<AbsPathBuf>,
pub(crate) proc_macro_dylib_path: Option<AbsPathBuf>, pub(crate) proc_macro_dylib_path: Option<AbsPathBuf>,
} }
@ -65,6 +66,7 @@ impl ProjectJson {
} }
cfg cfg
}, },
target: crate_data.target,
out_dir: crate_data.out_dir.map(|it| base.join(it)), out_dir: crate_data.out_dir.map(|it| base.join(it)),
proc_macro_dylib_path: crate_data.proc_macro_dylib_path.map(|it| base.join(it)), proc_macro_dylib_path: crate_data.proc_macro_dylib_path.map(|it| base.join(it)),
}) })
@ -86,6 +88,7 @@ struct CrateData {
deps: Vec<DepData>, deps: Vec<DepData>,
#[serde(default)] #[serde(default)]
cfg: FxHashSet<String>, cfg: FxHashSet<String>,
target: Option<String>,
out_dir: Option<PathBuf>, out_dir: Option<PathBuf>,
proc_macro_dylib_path: Option<PathBuf>, proc_macro_dylib_path: Option<PathBuf>,
} }