From 055b9b64bce2808ed31eb4547cea16ec282d6897 Mon Sep 17 00:00:00 2001 From: Aaron Wood Date: Wed, 3 Jun 2020 14:54:05 -0700 Subject: Finish transition to cfgs from the separate atoms and features. --- crates/ra_project_model/src/json_project.rs | 42 +---------------------------- crates/ra_project_model/src/lib.rs | 6 ----- 2 files changed, 1 insertion(+), 47 deletions(-) (limited to 'crates') diff --git a/crates/ra_project_model/src/json_project.rs b/crates/ra_project_model/src/json_project.rs index 09c06fef9..ee2de4c25 100644 --- a/crates/ra_project_model/src/json_project.rs +++ b/crates/ra_project_model/src/json_project.rs @@ -2,7 +2,7 @@ use std::path::PathBuf; -use rustc_hash::{FxHashMap, FxHashSet}; +use rustc_hash::FxHashSet; use serde::Deserialize; /// Roots and crates that compose this Rust project. @@ -28,16 +28,9 @@ pub struct Crate { pub(crate) edition: Edition, pub(crate) deps: Vec, - // This is the preferred method of providing cfg options. #[serde(default)] pub(crate) cfg: FxHashSet, - // These two are here for transition only. - #[serde(default)] - pub(crate) atom_cfgs: FxHashSet, - #[serde(default)] - pub(crate) key_value_cfgs: FxHashMap, - pub(crate) out_dir: Option, pub(crate) proc_macro_dylib_path: Option, } @@ -99,37 +92,4 @@ mod tests { assert!(krate.cfg.contains(&"feature=feature_2".to_string())); assert!(krate.cfg.contains(&"other=value".to_string())); } - - #[test] - fn test_crate_deserialization_old_json() { - let raw_json = json!( { - "crate_id": 2, - "root_module": "this/is/a/file/path.rs", - "deps": [ - { - "crate": 1, - "name": "some_dep_crate" - }, - ], - "edition": "2015", - "atom_cfgs": [ - "atom_1", - "atom_2", - ], - "key_value_cfgs": { - "feature": "feature_1", - "feature": "feature_2", - "other": "value", - }, - }); - - let krate: Crate = serde_json::from_value(raw_json).unwrap(); - - assert!(krate.atom_cfgs.contains(&"atom_1".to_string())); - assert!(krate.atom_cfgs.contains(&"atom_2".to_string())); - assert!(krate.key_value_cfgs.contains_key(&"feature".to_string())); - assert_eq!(krate.key_value_cfgs.get("feature"), Some(&"feature_2".to_string())); - assert!(krate.key_value_cfgs.contains_key(&"other".to_string())); - assert_eq!(krate.key_value_cfgs.get("other"), Some(&"value".to_string())); - } } diff --git a/crates/ra_project_model/src/lib.rs b/crates/ra_project_model/src/lib.rs index fe03b509e..47fa34ddf 100644 --- a/crates/ra_project_model/src/lib.rs +++ b/crates/ra_project_model/src/lib.rs @@ -280,12 +280,6 @@ impl ProjectWorkspace { } } } - for name in &krate.atom_cfgs { - opts.insert_atom(name.into()); - } - for (key, value) in &krate.key_value_cfgs { - opts.insert_key_value(key.into(), value.into()); - } opts }; -- cgit v1.2.3