Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/project_model/src/cargo_workspace.rs')
| -rw-r--r-- | crates/project_model/src/cargo_workspace.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crates/project_model/src/cargo_workspace.rs b/crates/project_model/src/cargo_workspace.rs index e942b13e47..851a264ca3 100644 --- a/crates/project_model/src/cargo_workspace.rs +++ b/crates/project_model/src/cargo_workspace.rs @@ -135,8 +135,8 @@ pub struct PackageData { pub manifest: ManifestPath, /// Targets provided by the crate (lib, bin, example, test, ...) pub targets: Vec<Target>, - /// Is this package a member of the current workspace - pub is_member: bool, + /// Does this package come from the local filesystem (and is editable)? + pub is_local: bool, /// List of packages this package depends on pub dependencies: Vec<PackageDependency>, /// Rust edition for this package @@ -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::<PackageMetadata>(metadata.clone()).unwrap_or_default(); - let is_member = ws_members.contains(id); let edition = edition.parse::<Edition>().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_local = meta_pkg.source.is_none(); let pkg = packages.alloc(PackageData { id: id.repr.clone(), @@ -316,7 +316,7 @@ impl CargoWorkspace { version: version.clone(), manifest: AbsPathBuf::assert(PathBuf::from(&manifest_path)).try_into().unwrap(), targets: Vec::new(), - is_member, + is_local, edition, dependencies: Vec::new(), features: meta_pkg.features.clone().into_iter().collect(), |