diff options
| author | Paul Daniel Faria <[email protected]> | 2020-07-04 18:50:27 +0100 |
|---|---|---|
| committer | Paul Daniel Faria <[email protected]> | 2020-07-04 18:50:27 +0100 |
| commit | 5b96d4103ea25a2dbb9811b082365ff77a89c94d (patch) | |
| tree | 241c448b6c5781a703bad41d7fc0baf71acc7c31 /crates | |
| parent | db99f2dd7e8e244b858926bbf1d2a49e25f44733 (diff) | |
Fallback to target in cfg if not specified in project json config
Diffstat (limited to 'crates')
| -rw-r--r-- | crates/ra_project_model/src/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_project_model/src/lib.rs b/crates/ra_project_model/src/lib.rs index 4b50b9b69..5d1f871c4 100644 --- a/crates/ra_project_model/src/lib.rs +++ b/crates/ra_project_model/src/lib.rs | |||
| @@ -267,7 +267,7 @@ impl ProjectWorkspace { | |||
| 267 | .clone() | 267 | .clone() |
| 268 | .map(|it| proc_macro_client.by_dylib_path(&it)); | 268 | .map(|it| proc_macro_client.by_dylib_path(&it)); |
| 269 | 269 | ||
| 270 | let target = krate.target.as_deref(); | 270 | let target = krate.target.as_deref().or(target); |
| 271 | let target_cfgs = target_cfg_map | 271 | let target_cfgs = target_cfg_map |
| 272 | .entry(target.clone()) | 272 | .entry(target.clone()) |
| 273 | .or_insert_with(|| get_rustc_cfg_options(target.as_deref())); | 273 | .or_insert_with(|| get_rustc_cfg_options(target.as_deref())); |