From 5b96d4103ea25a2dbb9811b082365ff77a89c94d Mon Sep 17 00:00:00 2001 From: Paul Daniel Faria Date: Sat, 4 Jul 2020 13:50:27 -0400 Subject: Fallback to target in cfg if not specified in project json config --- crates/ra_project_model/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'crates') 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 { .clone() .map(|it| proc_macro_client.by_dylib_path(&it)); - let target = krate.target.as_deref(); + let target = krate.target.as_deref().or(target); let target_cfgs = target_cfg_map .entry(target.clone()) .or_insert_with(|| get_rustc_cfg_options(target.as_deref())); -- cgit v1.2.3