language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 21:05:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Only set rust-analyzer cfg for workspace members

Browse source
This commit is contained in:
Lukas Wirth 2023-09-08 11:02:56 +02:00
parent e9e2c1ae75
commit fddef42e92
5 changed files with 5 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/project-model/src/workspace.rs
View file

@ -867,6 +867,9 @@ fn cargo_to_crate_graph(
if cargo[pkg].is_local {
cfg_options.insert_atom("test".into());
}
if cargo[pkg].is_member {
cfg_options.insert_atom("rust_analyzer".into());
}
if !override_cfg.global.is_empty() {
cfg_options.apply_diff(override_cfg.global.clone());
@ -1030,7 +1033,8 @@ fn detached_files_to_crate_graph(
None => (SysrootPublicDeps::default(), None),
};
let cfg_options = create_cfg_options(rustc_cfg);
let mut cfg_options = create_cfg_options(rustc_cfg);
cfg_options.insert_atom("rust_analyzer".into());
for detached_file in detached_files {
let file_id = match load(detached_file) {
@ -1479,6 +1483,5 @@ fn create_cfg_options(rustc_cfg: Vec<CfgFlag>) -> CfgOptions {
let mut cfg_options = CfgOptions::default();
cfg_options.extend(rustc_cfg);
cfg_options.insert_atom("debug_assertions".into());
cfg_options.insert_atom("rust_analyzer".into());
cfg_options
}