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

Set debug_assertions and miri cfgs as config defaults, allowing them to be overwritten

Browse source
This commit is contained in:
Lukas Wirth 2024-04-19 11:06:55 +02:00
parent 8989dcffd6
commit 0485a85ee2
6 changed files with 35 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1454,8 +1454,14 @@ fn sysroot_to_crate_graph(
None,
rustc_cfg,
&CfgOverrides {
global: CfgDiff::new(vec![CfgAtom::Flag("debug_assertions".into())], vec![])
.unwrap(),
global: CfgDiff::new(
vec![
CfgAtom::Flag("debug_assertions".into()),
CfgAtom::Flag("miri".into()),
],
vec![],
)
.unwrap(),
..Default::default()
},
&WorkspaceBuildScripts::default(),
@ -1519,6 +1525,7 @@ fn sysroot_to_crate_graph(
let mut cfg_options = CfgOptions::default();
cfg_options.extend(rustc_cfg);
cfg_options.insert_atom("debug_assertions".into());
cfg_options.insert_atom("miri".into());
cfg_options
});
let sysroot_crates: FxHashMap<SysrootCrate, CrateId> = stitched