From d2ea776b8fbb5286a04dde75a9a8f8b14f12bfe9 Mon Sep 17 00:00:00 2001 From: uHOOCCOOHu Date: Mon, 30 Sep 2019 07:38:16 +0800 Subject: Enable CfgOptions `test` for workspace crates --- crates/ra_project_model/src/lib.rs | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'crates/ra_project_model/src') diff --git a/crates/ra_project_model/src/lib.rs b/crates/ra_project_model/src/lib.rs index 5d3078598..5ff3971e0 100644 --- a/crates/ra_project_model/src/lib.rs +++ b/crates/ra_project_model/src/lib.rs @@ -11,6 +11,7 @@ use std::{ path::{Path, PathBuf}, }; +use ra_cfg::CfgOptions; use ra_db::{CrateGraph, CrateId, Edition, FileId}; use rustc_hash::FxHashMap; use serde_json::from_reader; @@ -131,7 +132,13 @@ impl ProjectWorkspace { json_project::Edition::Edition2015 => Edition::Edition2015, json_project::Edition::Edition2018 => Edition::Edition2018, }; - crates.insert(crate_id, crate_graph.add_crate_root(file_id, edition)); + // FIXME: cfg options + // Default to enable test for workspace crates. + let cfg_options = CfgOptions::default().atom("test".into()); + crates.insert( + crate_id, + crate_graph.add_crate_root(file_id, edition, cfg_options), + ); } } @@ -157,7 +164,11 @@ impl ProjectWorkspace { let mut sysroot_crates = FxHashMap::default(); for krate in sysroot.crates() { if let Some(file_id) = load(krate.root(&sysroot)) { - let crate_id = crate_graph.add_crate_root(file_id, Edition::Edition2018); + // FIXME: cfg options + // Crates from sysroot have `cfg(test)` disabled + let cfg_options = CfgOptions::default(); + let crate_id = + crate_graph.add_crate_root(file_id, Edition::Edition2018, cfg_options); sysroot_crates.insert(krate, crate_id); names.insert(crate_id, krate.name(&sysroot).to_string()); } @@ -186,7 +197,11 @@ impl ProjectWorkspace { let root = tgt.root(&cargo); if let Some(file_id) = load(root) { let edition = pkg.edition(&cargo); - let crate_id = crate_graph.add_crate_root(file_id, edition); + // FIXME: cfg options + // Default to enable test for workspace crates. + let cfg_options = CfgOptions::default().atom("test".into()); + let crate_id = + crate_graph.add_crate_root(file_id, edition, cfg_options); names.insert(crate_id, pkg.name(&cargo).to_string()); if tgt.kind(&cargo) == TargetKind::Lib { lib_tgt = Some(crate_id); -- cgit v1.2.3 From 1067a1c5f649cc206e35b427eaa8d6553280cc96 Mon Sep 17 00:00:00 2001 From: uHOOCCOOHu Date: Thu, 3 Oct 2019 02:02:53 +0800 Subject: Read default cfgs from rustc --- crates/ra_project_model/src/cargo_workspace.rs | 6 ++++ crates/ra_project_model/src/json_project.rs | 2 ++ crates/ra_project_model/src/lib.rs | 44 ++++++++++++++++++++++---- 3 files changed, 46 insertions(+), 6 deletions(-) (limited to 'crates/ra_project_model/src') diff --git a/crates/ra_project_model/src/cargo_workspace.rs b/crates/ra_project_model/src/cargo_workspace.rs index 805eaa178..28dadea9d 100644 --- a/crates/ra_project_model/src/cargo_workspace.rs +++ b/crates/ra_project_model/src/cargo_workspace.rs @@ -39,6 +39,7 @@ struct PackageData { is_member: bool, dependencies: Vec, edition: Edition, + features: Vec, } #[derive(Debug, Clone)] @@ -91,6 +92,9 @@ impl Package { pub fn edition(self, ws: &CargoWorkspace) -> Edition { ws.packages[self].edition } + pub fn features(self, ws: &CargoWorkspace) -> &[String] { + &ws.packages[self].features + } pub fn targets<'a>(self, ws: &'a CargoWorkspace) -> impl Iterator + 'a { ws.packages[self].targets.iter().cloned() } @@ -144,6 +148,7 @@ impl CargoWorkspace { is_member, edition: Edition::from_string(&meta_pkg.edition), dependencies: Vec::new(), + features: Vec::new(), }); let pkg_data = &mut packages[pkg]; pkg_by_id.insert(meta_pkg.id.clone(), pkg); @@ -164,6 +169,7 @@ impl CargoWorkspace { let dep = PackageDependency { name: dep_node.name, pkg: pkg_by_id[&dep_node.pkg] }; packages[source].dependencies.push(dep); } + packages[source].features.extend(node.features); } Ok(CargoWorkspace { packages, targets, workspace_root: meta.workspace_root }) diff --git a/crates/ra_project_model/src/json_project.rs b/crates/ra_project_model/src/json_project.rs index 54ddca2cb..b0d339f38 100644 --- a/crates/ra_project_model/src/json_project.rs +++ b/crates/ra_project_model/src/json_project.rs @@ -19,6 +19,8 @@ pub struct Crate { pub(crate) root_module: PathBuf, pub(crate) edition: Edition, pub(crate) deps: Vec, + #[serde(default)] + pub(crate) features: Vec, } #[derive(Clone, Copy, Debug, Deserialize)] diff --git a/crates/ra_project_model/src/lib.rs b/crates/ra_project_model/src/lib.rs index 5ff3971e0..05e49f5ce 100644 --- a/crates/ra_project_model/src/lib.rs +++ b/crates/ra_project_model/src/lib.rs @@ -9,6 +9,7 @@ use std::{ fs::File, io::BufReader, path::{Path, PathBuf}, + process::Command, }; use ra_cfg::CfgOptions; @@ -118,6 +119,7 @@ impl ProjectWorkspace { pub fn to_crate_graph( &self, + default_cfg_options: &CfgOptions, load: &mut dyn FnMut(&Path) -> Option, ) -> (CrateGraph, FxHashMap) { let mut crate_graph = CrateGraph::default(); @@ -134,7 +136,9 @@ impl ProjectWorkspace { }; // FIXME: cfg options // Default to enable test for workspace crates. - let cfg_options = CfgOptions::default().atom("test".into()); + let cfg_options = default_cfg_options + .clone() + .features(krate.features.iter().map(Into::into)); crates.insert( crate_id, crate_graph.add_crate_root(file_id, edition, cfg_options), @@ -164,9 +168,8 @@ impl ProjectWorkspace { let mut sysroot_crates = FxHashMap::default(); for krate in sysroot.crates() { if let Some(file_id) = load(krate.root(&sysroot)) { - // FIXME: cfg options // Crates from sysroot have `cfg(test)` disabled - let cfg_options = CfgOptions::default(); + let cfg_options = default_cfg_options.clone().remove_atom(&"test".into()); let crate_id = crate_graph.add_crate_root(file_id, Edition::Edition2018, cfg_options); sysroot_crates.insert(krate, crate_id); @@ -197,9 +200,9 @@ impl ProjectWorkspace { let root = tgt.root(&cargo); if let Some(file_id) = load(root) { let edition = pkg.edition(&cargo); - // FIXME: cfg options - // Default to enable test for workspace crates. - let cfg_options = CfgOptions::default().atom("test".into()); + let cfg_options = default_cfg_options + .clone() + .features(pkg.features(&cargo).iter().map(Into::into)); let crate_id = crate_graph.add_crate_root(file_id, edition, cfg_options); names.insert(crate_id, pkg.name(&cargo).to_string()); @@ -301,3 +304,32 @@ fn find_cargo_toml(path: &Path) -> Result { } Err(format!("can't find Cargo.toml at {}", path.display()))? } + +pub fn get_rustc_cfg_options() -> CfgOptions { + let mut cfg_options = CfgOptions::default(); + + match (|| -> Result<_> { + // `cfg(test)` ans `cfg(debug_assertion)` is handled outside, so we suppress them here. + let output = Command::new("rustc").args(&["--print", "cfg", "-O"]).output()?; + if !output.status.success() { + Err("failed to get rustc cfgs")?; + } + Ok(String::from_utf8(output.stdout)?) + })() { + Ok(rustc_cfgs) => { + for line in rustc_cfgs.lines() { + match line.find('=') { + None => cfg_options = cfg_options.atom(line.into()), + Some(pos) => { + let key = &line[..pos]; + let value = line[pos + 1..].trim_matches('"'); + cfg_options = cfg_options.key_value(key.into(), value.into()); + } + } + } + } + Err(e) => log::error!("failed to get rustc cfgs: {}", e), + } + + cfg_options +} -- cgit v1.2.3 From c6303d9fee98232ac83a77f943c39d65c9c6b6db Mon Sep 17 00:00:00 2001 From: oxalica Date: Sat, 5 Oct 2019 20:55:27 +0800 Subject: Use raw cfgs in json project and fix typo --- crates/ra_project_model/src/json_project.rs | 5 +++-- crates/ra_project_model/src/lib.rs | 14 ++++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) (limited to 'crates/ra_project_model/src') diff --git a/crates/ra_project_model/src/json_project.rs b/crates/ra_project_model/src/json_project.rs index b0d339f38..1bacb1d09 100644 --- a/crates/ra_project_model/src/json_project.rs +++ b/crates/ra_project_model/src/json_project.rs @@ -2,6 +2,7 @@ use std::path::PathBuf; +use rustc_hash::{FxHashMap, FxHashSet}; use serde::Deserialize; /// A root points to the directory which contains Rust crates. rust-analyzer watches all files in @@ -19,8 +20,8 @@ pub struct Crate { pub(crate) root_module: PathBuf, pub(crate) edition: Edition, pub(crate) deps: Vec, - #[serde(default)] - pub(crate) features: Vec, + pub(crate) atom_cfgs: FxHashSet, + pub(crate) key_value_cfgs: FxHashMap, } #[derive(Clone, Copy, Debug, Deserialize)] diff --git a/crates/ra_project_model/src/lib.rs b/crates/ra_project_model/src/lib.rs index 05e49f5ce..640a5ebd3 100644 --- a/crates/ra_project_model/src/lib.rs +++ b/crates/ra_project_model/src/lib.rs @@ -134,11 +134,13 @@ impl ProjectWorkspace { json_project::Edition::Edition2015 => Edition::Edition2015, json_project::Edition::Edition2018 => Edition::Edition2018, }; - // FIXME: cfg options - // Default to enable test for workspace crates. - let cfg_options = default_cfg_options - .clone() - .features(krate.features.iter().map(Into::into)); + let mut cfg_options = default_cfg_options.clone(); + for name in &krate.atom_cfgs { + cfg_options = cfg_options.atom(name.into()); + } + for (key, value) in &krate.key_value_cfgs { + cfg_options = cfg_options.key_value(key.into(), value.into()); + } crates.insert( crate_id, crate_graph.add_crate_root(file_id, edition, cfg_options), @@ -309,7 +311,7 @@ pub fn get_rustc_cfg_options() -> CfgOptions { let mut cfg_options = CfgOptions::default(); match (|| -> Result<_> { - // `cfg(test)` ans `cfg(debug_assertion)` is handled outside, so we suppress them here. + // `cfg(test)` and `cfg(debug_assertion)` are handled outside, so we suppress them here. let output = Command::new("rustc").args(&["--print", "cfg", "-O"]).output()?; if !output.status.success() { Err("failed to get rustc cfgs")?; -- cgit v1.2.3