diff options
author | Paul Daniel Faria <[email protected]> | 2020-06-12 18:08:51 +0100 |
---|---|---|
committer | Paul Daniel Faria <[email protected]> | 2020-07-04 18:49:44 +0100 |
commit | db99f2dd7e8e244b858926bbf1d2a49e25f44733 (patch) | |
tree | 8c57a0a494e1a6e6250b5081276f57e8467a92cd /crates/ra_project_model/src/project_json.rs | |
parent | c815d5b49660e9b93c6a70039abef5fa02ae8013 (diff) |
Add optional target to crates in json project, lookup default cfgs per target when generating cfg list
Diffstat (limited to 'crates/ra_project_model/src/project_json.rs')
-rw-r--r-- | crates/ra_project_model/src/project_json.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/crates/ra_project_model/src/project_json.rs b/crates/ra_project_model/src/project_json.rs index b0fe09333..b96227949 100644 --- a/crates/ra_project_model/src/project_json.rs +++ b/crates/ra_project_model/src/project_json.rs | |||
@@ -31,6 +31,7 @@ pub struct Crate { | |||
31 | pub(crate) edition: Edition, | 31 | pub(crate) edition: Edition, |
32 | pub(crate) deps: Vec<Dependency>, | 32 | pub(crate) deps: Vec<Dependency>, |
33 | pub(crate) cfg: CfgOptions, | 33 | pub(crate) cfg: CfgOptions, |
34 | pub(crate) target: Option<String>, | ||
34 | pub(crate) out_dir: Option<AbsPathBuf>, | 35 | pub(crate) out_dir: Option<AbsPathBuf>, |
35 | pub(crate) proc_macro_dylib_path: Option<AbsPathBuf>, | 36 | pub(crate) proc_macro_dylib_path: Option<AbsPathBuf>, |
36 | } | 37 | } |
@@ -65,6 +66,7 @@ impl ProjectJson { | |||
65 | } | 66 | } |
66 | cfg | 67 | cfg |
67 | }, | 68 | }, |
69 | target: crate_data.target, | ||
68 | out_dir: crate_data.out_dir.map(|it| base.join(it)), | 70 | out_dir: crate_data.out_dir.map(|it| base.join(it)), |
69 | proc_macro_dylib_path: crate_data.proc_macro_dylib_path.map(|it| base.join(it)), | 71 | proc_macro_dylib_path: crate_data.proc_macro_dylib_path.map(|it| base.join(it)), |
70 | }) | 72 | }) |
@@ -86,6 +88,7 @@ struct CrateData { | |||
86 | deps: Vec<DepData>, | 88 | deps: Vec<DepData>, |
87 | #[serde(default)] | 89 | #[serde(default)] |
88 | cfg: FxHashSet<String>, | 90 | cfg: FxHashSet<String>, |
91 | target: Option<String>, | ||
89 | out_dir: Option<PathBuf>, | 92 | out_dir: Option<PathBuf>, |
90 | proc_macro_dylib_path: Option<PathBuf>, | 93 | proc_macro_dylib_path: Option<PathBuf>, |
91 | } | 94 | } |