Skip to content

Commit 917b87e

Browse files
committed
Finish updating members via find_path_deps before setting up default_members
1 parent 380be40 commit 917b87e

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/cargo/core/workspace.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -686,13 +686,13 @@ impl<'cfg> Workspace<'cfg> {
686686
})?;
687687
}
688688

689+
self.find_path_deps(&root_manifest_path, &root_manifest_path, false)?;
690+
689691
if let Some(default) = default_members_paths {
690692
for path in default {
691693
let normalized_path = paths::normalize_path(&path);
692694
let manifest_path = normalized_path.join("Cargo.toml");
693-
if !self.members.contains(&manifest_path)
694-
&& (self.is_virtual() || manifest_path != root_manifest_path)
695-
{
695+
if !self.members.contains(&manifest_path) {
696696
// default-members are allowed to be excluded, but they
697697
// still must be referred to by the original (unfiltered)
698698
// members list. Note that we aren't testing against the
@@ -718,7 +718,7 @@ impl<'cfg> Workspace<'cfg> {
718718
self.default_members.push(self.current_manifest.clone())
719719
}
720720

721-
self.find_path_deps(&root_manifest_path, &root_manifest_path, false)
721+
Ok(())
722722
}
723723

724724
fn find_path_deps(

0 commit comments

Comments
 (0)