rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fallback to target in cfg if not specified in project json config

Browse Source
This commit is contained in:
Paul Daniel Faria
2020-07-04 13:50:27 -04:00
parent db99f2dd7e
commit 5b96d4103e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/ra_project_model/src/lib.rs
View File

@@ -267,7 +267,7 @@ impl ProjectWorkspace {
.clone() .clone()
.map(|it| proc_macro_client.by_dylib_path(&it)); .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 let target_cfgs = target_cfg_map
.entry(target.clone()) .entry(target.clone())
.or_insert_with(|| get_rustc_cfg_options(target.as_deref())); .or_insert_with(|| get_rustc_cfg_options(target.as_deref()));