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

Change management of test cfg to better support json projects

Browse source
This commit is contained in:
Paul Daniel Faria 2020-06-07 10:29:03 -04:00
parent dc340f12a3
commit 3937b225e7
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -349,11 +349,7 @@ impl ProjectWorkspace {
let file_id = load(&sysroot[krate].root)?; let file_id = load(&sysroot[krate].root)?;
// Crates from sysroot have `cfg(test)` disabled // Crates from sysroot have `cfg(test)` disabled
let cfg_options = { let cfg_options = default_cfg_options.clone();
let mut opts = default_cfg_options.clone();
opts.remove_atom("test");
opts
};
let env = Env::default(); let env = Env::default();
let extern_source = ExternSource::default(); let extern_source = ExternSource::default();
@ -404,7 +400,12 @@ impl ProjectWorkspace {
if let Some(file_id) = load(root) { if let Some(file_id) = load(root) {
let edition = cargo[pkg].edition; let edition = cargo[pkg].edition;
let cfg_options = { let cfg_options = {
let mut opts = {
let mut opts = default_cfg_options.clone(); let mut opts = default_cfg_options.clone();
opts.insert_atom("test".into());
opts
};
for feature in cargo[pkg].features.iter() { for feature in cargo[pkg].features.iter() {
opts.insert_key_value("feature".into(), feature.into()); opts.insert_key_value("feature".into(), feature.into());
} }

1
crates/rust-analyzer/src/cli/load_cargo.rs
View file

@ -151,7 +151,6 @@ pub(crate) fn load(
// FIXME: cfg options? // FIXME: cfg options?
let default_cfg_options = { let default_cfg_options = {
let mut opts = get_rustc_cfg_options(None); let mut opts = get_rustc_cfg_options(None);
opts.insert_atom("test".into());
opts.insert_atom("debug_assertion".into()); opts.insert_atom("debug_assertion".into());
opts opts
}; };

1
crates/rust-analyzer/src/global_state.rs
View file

@ -138,7 +138,6 @@ impl GlobalState {
// FIXME: Read default cfgs from config // FIXME: Read default cfgs from config
let default_cfg_options = { let default_cfg_options = {
let mut opts = get_rustc_cfg_options(config.cargo.target.as_ref()); let mut opts = get_rustc_cfg_options(config.cargo.target.as_ref());
opts.insert_atom("test".into());
opts.insert_atom("debug_assertion".into()); opts.insert_atom("debug_assertion".into());
opts opts
}; };