From 8bc62f30e2ebbcd33fa8e9deb22d540178f7a2ae Mon Sep 17 00:00:00 2001 From: Kevin GRONDIN Date: Tue, 6 Feb 2024 11:24:27 +0100 Subject: [PATCH] chore: Use workspace_default_members from Cargo 1.71 --- src/workspace.rs | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/workspace.rs b/src/workspace.rs index 09e6e93..4377557 100644 --- a/src/workspace.rs +++ b/src/workspace.rs @@ -39,19 +39,10 @@ impl Workspace { Packages::from_flags(self.workspace || self.all, &self.exclude, &self.package); let workspace_members: std::collections::HashSet<_> = meta.workspace_members.iter().collect(); + let workspace_default_members: std::collections::HashSet<_> = + meta.workspace_default_members.iter().collect(); let base_ids: std::collections::HashSet<_> = match selection { - Packages::Default => { - // Deviating from cargo because Metadata doesn't have default members - let resolve = meta.resolve.as_ref().expect("no-deps is unsupported"); - match &resolve.root { - Some(root) => { - let mut base_ids = std::collections::HashSet::new(); - base_ids.insert(root); - base_ids - } - None => workspace_members, - } - } + Packages::Default => workspace_default_members, Packages::All => workspace_members, Packages::OptOut(_) => workspace_members, // Deviating from cargo by only checking workspace members Packages::Packages(patterns) => {