Skip to content

Skip default members when canonicalize fails #4942

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Skip default members when canonicalize fails #4942

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81b3d85
fix: avoid crashing when searching default members outside the main w…
newfla Nov 9, 2025
9e1abed
fix: typo correction
newfla Nov 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions packages/cli/src/workspace.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,29 +306,29 @@ impl Workspace {
if let Some(ws) = &self.cargo_toml.workspace {
for default in &ws.default_members {
let mut workspace_members = self.krates.workspace_members();
let default_member_path = std::fs::canonicalize(default).unwrap();

let found = workspace_members.find_map(|node| {
if let krates::Node::Krate { id, krate, .. } = node {
// Skip this default member if it doesn't have any binary targets
if !krate
.targets
.iter()
.any(|t| t.kind.contains(&krates::cm::TargetKind::Bin))
{
return None;
}
let member_path =
std::fs::canonicalize(krate.manifest_path.parent().unwrap()).unwrap();
if member_path == default_member_path {
return Some(id);
if let Ok(default_member_path) = std::fs::canonicalize(default) {
let found = workspace_members.find_map(|node| {
if let krates::Node::Krate { id, krate, .. } = node {
// Skip this default member if it doesn't have any binary targets
if !krate
.targets
.iter()
.any(|t| t.kind.contains(&krates::cm::TargetKind::Bin))
{
return None;
}
if std::fs::canonicalize(krate.manifest_path.parent().unwrap())
.is_ok_and(|member_path| member_path == default_member_path)
{
return Some(id);
}
}
}
None
});
None
});

if let Some(kid) = found {
return Ok(self.krates.nid_for_kid(kid).unwrap());
if let Some(kid) = found {
return Ok(self.krates.nid_for_kid(kid).unwrap());
}
}
}
}
Expand Down