Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-28 14:03:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #16997 - Veykril:cfg-if-patch, r=Veykril

Browse source 
fix: Fix `patch_cfg_if` not applying with stitched sysroot

The condition was inverted accidentally..
This commit is contained in:
bors 2024-04-02 13:06:35 +00:00
commit 54faa03121
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -775,7 +775,7 @@ impl ProjectWorkspace {
), ),
}; };
if matches!(sysroot.as_ref().map(|it| it.mode()), Ok(SysrootMode::Workspace(_))) if matches!(sysroot.as_ref().map(|it| it.mode()), Ok(SysrootMode::Stitched(_)))
&& crate_graph.patch_cfg_if() && crate_graph.patch_cfg_if()
{ {
tracing::debug!("Patched std to depend on cfg-if") tracing::debug!("Patched std to depend on cfg-if")