fix: Fix projects depending on rustc_private hanging

Veykril · Veykril · commit 2ad14b806924 · 2024-03-21T16:55:42.000+01:00
diff --git a/crates/project-model/src/workspace.rs b/crates/project-model/src/workspace.rs
@@ -1250,6 +1250,7 @@ fn handle_rustc_crates(
                 let kind @ TargetKind::Lib { is_proc_macro } = rustc_workspace[tgt].kind else {
                     continue;
                 };
+                let pkg_crates = &mut rustc_pkg_crates.entry(pkg).or_insert_with(Vec::new);
                 if let Some(file_id) = load(&rustc_workspace[tgt].root) {
                     let crate_id = add_target_crate_root(
                         crate_graph,
@@ -1268,7 +1269,7 @@ fn handle_rustc_crates(
                     if let Some(proc_macro) = libproc_macro {
                         add_proc_macro_dep(crate_graph, crate_id, proc_macro, is_proc_macro);
                     }
-                    rustc_pkg_crates.entry(pkg).or_insert_with(Vec::new).push(crate_id);
+                    pkg_crates.push(crate_id);
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -1250,6 +1250,7 @@ fn handle_rustc_crates(`
`1250`	`1250`	`let kind @ TargetKind::Lib { is_proc_macro } = rustc_workspace[tgt].kind else {`
`1251`	`1251`	`continue;`
`1252`	`1252`	`};`
	`1253`	`+ let pkg_crates = &mut rustc_pkg_crates.entry(pkg).or_insert_with(Vec::new);`
`1253`	`1254`	`if let Some(file_id) = load(&rustc_workspace[tgt].root) {`
`1254`	`1255`	`let crate_id = add_target_crate_root(`
`1255`	`1256`	`crate_graph,`
`@@ -1268,7 +1269,7 @@ fn handle_rustc_crates(`
`1268`	`1269`	`if let Some(proc_macro) = libproc_macro {`
`1269`	`1270`	`add_proc_macro_dep(crate_graph, crate_id, proc_macro, is_proc_macro);`
`1270`	`1271`	`}`
`1271`		`- rustc_pkg_crates.entry(pkg).or_insert_with(Vec::new).push(crate_id);`
	`1272`	`+ pkg_crates.push(crate_id);`
`1272`	`1273`	`}`
`1273`	`1274`	`}`
`1274`	`1275`	`}`