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

Enable CfgOptions test for workspace crates

Browse source
This commit is contained in:
uHOOCCOOHu 2019-09-30 07:38:16 +08:00
parent b1ed887d81
commit d2ea776b8f
No known key found for this signature in database
GPG key ID: CED392DE0C483D00
9 changed files with 134 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

1
crates/ra_project_model/Cargo.toml
View file

@ -12,6 +12,7 @@ cargo_metadata = "0.8.2"
ra_arena = { path = "../ra_arena" }
ra_db = { path = "../ra_db" }
ra_cfg = { path = "../ra_cfg" }
serde = { version = "1.0.89", features = ["derive"] }
serde_json = "1.0.39"

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

@ -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);