diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-05-07 19:50:00 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-05-07 19:50:00 +0100 |
| commit | 1b136aae0b92b4b75ae1aad28ccf27d8b2b6cf73 (patch) | |
| tree | e76f5011154b29d1987e098e06ae6e1d05b8f650 /crates/ra_project_model/src/lib.rs | |
| parent | 97b9b364d65b00ce2246da7670a3823a0bccc1d3 (diff) | |
| parent | f2dd233ddc60b647fe9c32ea2d712224005ae99e (diff) | |
Merge #4296
4296: Support cargo:rustc-cfg in build.rs r=matklad a=robojumper
Fixes #4238.
Co-authored-by: robojumper <[email protected]>
Diffstat (limited to 'crates/ra_project_model/src/lib.rs')
| -rw-r--r-- | crates/ra_project_model/src/lib.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crates/ra_project_model/src/lib.rs b/crates/ra_project_model/src/lib.rs index c2b33c1dc..8703429d4 100644 --- a/crates/ra_project_model/src/lib.rs +++ b/crates/ra_project_model/src/lib.rs | |||
| @@ -399,6 +399,7 @@ impl ProjectWorkspace { | |||
| 399 | let cfg_options = { | 399 | let cfg_options = { |
| 400 | let mut opts = default_cfg_options.clone(); | 400 | let mut opts = default_cfg_options.clone(); |
| 401 | opts.insert_features(cargo[pkg].features.iter().map(Into::into)); | 401 | opts.insert_features(cargo[pkg].features.iter().map(Into::into)); |
| 402 | opts.insert_cfgs(cargo[pkg].cfgs.iter().map(Into::into)); | ||
| 402 | opts | 403 | opts |
| 403 | }; | 404 | }; |
| 404 | let mut env = Env::default(); | 405 | let mut env = Env::default(); |