From 8a4c35a068fa499650ecbaa34e04478129deb9c5 Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Tue, 7 Sep 2021 17:26:21 +0200 Subject: [PATCH] Treat path dependencies like workspace members --- crates/project_model/src/cargo_workspace.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/project_model/src/cargo_workspace.rs b/crates/project_model/src/cargo_workspace.rs index e942b13e4740..b15c53a1303a 100644 --- a/crates/project_model/src/cargo_workspace.rs +++ b/crates/project_model/src/cargo_workspace.rs @@ -296,19 +296,19 @@ impl CargoWorkspace { let mut packages = Arena::default(); let mut targets = Arena::default(); - let ws_members = &meta.workspace_members; - meta.packages.sort_by(|a, b| a.id.cmp(&b.id)); for meta_pkg in &meta.packages { let cargo_metadata::Package { id, edition, name, manifest_path, version, metadata, .. } = meta_pkg; let meta = from_value::(metadata.clone()).unwrap_or_default(); - let is_member = ws_members.contains(id); let edition = edition.parse::().unwrap_or_else(|err| { tracing::error!("Failed to parse edition {}", err); Edition::CURRENT }); + // We treat packages without source as "local" packages. That includes all members of + // the current workspace, as well as any path dependency outside the workspace. + let is_member = meta_pkg.source.is_none(); let pkg = packages.alloc(PackageData { id: id.repr.clone(),