Skip to content

Commit

Permalink
Finish updating members via find_path_deps before setting up default_…
Browse files Browse the repository at this point in the history
…members
  • Loading branch information
tedinski committed Jul 13, 2022
1 parent 380be40 commit 917b87e
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/cargo/core/workspace.rs
Original file line number Diff line number Diff line change
Expand Up @@ -686,13 +686,13 @@ impl<'cfg> Workspace<'cfg> {
})?;
}

self.find_path_deps(&root_manifest_path, &root_manifest_path, false)?;

if let Some(default) = default_members_paths {
for path in default {
let normalized_path = paths::normalize_path(&path);
let manifest_path = normalized_path.join("Cargo.toml");
if !self.members.contains(&manifest_path)
&& (self.is_virtual() || manifest_path != root_manifest_path)
{
if !self.members.contains(&manifest_path) {
// default-members are allowed to be excluded, but they
// still must be referred to by the original (unfiltered)
// members list. Note that we aren't testing against the
Expand All @@ -718,7 +718,7 @@ impl<'cfg> Workspace<'cfg> {
self.default_members.push(self.current_manifest.clone())
}

self.find_path_deps(&root_manifest_path, &root_manifest_path, false)
Ok(())
}

fn find_path_deps(
Expand Down

0 comments on commit 917b87e

Please sign in to comment.