diff options
| author | bors <bors@rust-lang.org> | 2024-04-02 13:06:35 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-04-02 13:06:35 +0000 |
| commit | 54faa0312156c79b0af9e9f4fef8f3bada41e69f (patch) | |
| tree | 65e6090833ef2b6a05f5d6d5530af084cd654337 | |
| parent | 23dd54b010ec0013438e097b17fe2fd47628fb28 (diff) | |
| parent | 600747a1b42c0cd666d19b102e91ded048dac567 (diff) | |
| download | rust-54faa0312156c79b0af9e9f4fef8f3bada41e69f.tar.gz rust-54faa0312156c79b0af9e9f4fef8f3bada41e69f.zip | |
Auto merge of #16997 - Veykril:cfg-if-patch, r=Veykril
fix: Fix `patch_cfg_if` not applying with stitched sysroot The condition was inverted accidentally..
| -rw-r--r-- | crates/project-model/src/workspace.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/project-model/src/workspace.rs b/crates/project-model/src/workspace.rs index d752b2f32ee..b59c0d59e47 100644 --- 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") |