language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-18 16:20:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Move features into potential_cfg_options

Browse source
This commit is contained in:
Jamie Cunliffe 2021-05-31 20:45:01 +01:00
parent 284483b347
commit ae823aa23f
6 changed files with 32 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

15
crates/project_model/src/workspace.rs
View file

@ -384,10 +384,10 @@ fn project_json_to_crate_graph(
file_id,
krate.edition,
krate.display_name.clone(),
cfg_options.clone(),
cfg_options,
env,
proc_macro.unwrap_or_default(),
Default::default(),
),
)
})
@ -581,9 +581,9 @@ fn detached_files_to_crate_graph(
Edition::Edition2018,
display_name,
cfg_options.clone(),
cfg_options.clone(),
Env::default(),
Vec::new(),
Default::default(),
);
for (name, krate) in public_deps.iter() {
@ -721,14 +721,21 @@ fn add_target_crate_root(
.unwrap_or_default();
let display_name = CrateDisplayName::from_canonical_name(cargo_name.to_string());
let mut potential_cfg_options = cfg_options.clone();
potential_cfg_options.extend(
pkg.features
.iter()
.map(|feat| CfgFlag::KeyValue { key: "feature".into(), value: feat.0.into() }),
);
let crate_id = crate_graph.add_crate_root(
file_id,
edition,
Some(display_name),
cfg_options,
potential_cfg_options,
env,
proc_macro,
pkg.features.clone(),
);
crate_id
@ -756,9 +763,9 @@ fn sysroot_to_crate_graph(
Edition::Edition2018,
Some(display_name),
cfg_options.clone(),
cfg_options.clone(),
env,
proc_macro,
Default::default(),
);
Some((krate, crate_id))
})