From 7a21e9302e194d5ed2a008417130c54cfa52ca24 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 20 Oct 2020 12:34:39 +0200 Subject: Add a hacky remidy for #6038 The proper fix I think is: * move rust-lang/rust library crates to a separate workspace * when packaging rust-src component, vendor sources of external deps --- crates/project_model/src/lib.rs | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'crates/project_model') diff --git a/crates/project_model/src/lib.rs b/crates/project_model/src/lib.rs index d1e7602fc..ea95d1c77 100644 --- a/crates/project_model/src/lib.rs +++ b/crates/project_model/src/lib.rs @@ -485,6 +485,11 @@ impl ProjectWorkspace { } } } + if crate_graph.patch_cfg_if() { + log::debug!("Patched std to depend on cfg-if") + } else { + log::debug!("Did not patch std to depend on cfg-if") + } crate_graph } } -- cgit v1.2.3