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

bors · bors · commit 54faa0312156 · 2024-04-02T13:06:35.000Z
fix: Fix `patch_cfg_if` not applying with stitched sysroot

The condition was inverted accidentally..
diff --git a/crates/project-model/src/workspace.rs b/crates/project-model/src/workspace.rs
@@ -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()
         {
             tracing::debug!("Patched std to depend on cfg-if")

Original file line number	Diff line number	Diff line change
`@@ -775,7 +775,7 @@ impl ProjectWorkspace {`
`775`	`775`	`),`
`776`	`776`	`};`
`777`	`777`
`778`		`- if matches!(sysroot.as_ref().map(\|it\| it.mode()), Ok(SysrootMode::Workspace(_)))`
	`778`	`+ if matches!(sysroot.as_ref().map(\|it\| it.mode()), Ok(SysrootMode::Stitched(_)))`
`779`	`779`	`&& crate_graph.patch_cfg_if()`
`780`	`780`	`{`
`781`	`781`	`tracing::debug!("Patched std to depend on cfg-if")`