diff options
author | Paul Daniel Faria <[email protected]> | 2020-06-07 15:29:03 +0100 |
---|---|---|
committer | Paul Daniel Faria <[email protected]> | 2020-06-07 15:29:03 +0100 |
commit | 3937b225e7918ae6d75849a0959754af43fbf08c (patch) | |
tree | edcf3d514f87a8772fa5c97aae2a58e5ddcb7b35 /crates/ra_project_model/src/lib.rs | |
parent | dc340f12a39e7cd8b495b84c009052c4d441d867 (diff) |
Change management of test cfg to better support json projects
Diffstat (limited to 'crates/ra_project_model/src/lib.rs')
-rw-r--r-- | crates/ra_project_model/src/lib.rs | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/crates/ra_project_model/src/lib.rs b/crates/ra_project_model/src/lib.rs index 7ad941279..ef443fc09 100644 --- a/crates/ra_project_model/src/lib.rs +++ b/crates/ra_project_model/src/lib.rs | |||
@@ -349,11 +349,7 @@ impl ProjectWorkspace { | |||
349 | let file_id = load(&sysroot[krate].root)?; | 349 | let file_id = load(&sysroot[krate].root)?; |
350 | 350 | ||
351 | // Crates from sysroot have `cfg(test)` disabled | 351 | // Crates from sysroot have `cfg(test)` disabled |
352 | let cfg_options = { | 352 | let cfg_options = default_cfg_options.clone(); |
353 | let mut opts = default_cfg_options.clone(); | ||
354 | opts.remove_atom("test"); | ||
355 | opts | ||
356 | }; | ||
357 | 353 | ||
358 | let env = Env::default(); | 354 | let env = Env::default(); |
359 | let extern_source = ExternSource::default(); | 355 | let extern_source = ExternSource::default(); |
@@ -404,7 +400,12 @@ impl ProjectWorkspace { | |||
404 | if let Some(file_id) = load(root) { | 400 | if let Some(file_id) = load(root) { |
405 | let edition = cargo[pkg].edition; | 401 | let edition = cargo[pkg].edition; |
406 | let cfg_options = { | 402 | let cfg_options = { |
407 | let mut opts = default_cfg_options.clone(); | 403 | let mut opts = { |
404 | let mut opts = default_cfg_options.clone(); | ||
405 | opts.insert_atom("test".into()); | ||
406 | opts | ||
407 | }; | ||
408 | |||
408 | for feature in cargo[pkg].features.iter() { | 409 | for feature in cargo[pkg].features.iter() { |
409 | opts.insert_key_value("feature".into(), feature.into()); | 410 | opts.insert_key_value("feature".into(), feature.into()); |
410 | } | 411 | } |