Skip to content

Commit f4ad0ef

Browse files
committed
cargo: Handle the case default-members is not defined
It should fallback to root package, then all members: https://doc.rust-lang.org/cargo/reference/workspaces.html#the-default-members-field
1 parent 7b7c2a1 commit f4ad0ef

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

mesonbuild/cargo/interpreter.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,14 @@ def interpret_workspace(self, workspace: Workspace, build: builder.Builder, subd
151151
self.environment.wrap_resolver.load_and_merge(subprojects_dir, T.cast('SubProject', name))
152152
ast: T.List[mparser.BaseNode] = []
153153
if not ws.required_members:
154-
for member in ws.workspace.default_members:
155-
self._require_workspace_member(ws, member)
154+
if ws.workspace.default_members:
155+
for member in ws.workspace.default_members:
156+
self._require_workspace_member(ws, member)
157+
elif ws.workspace.root_package:
158+
self._require_workspace_member(ws, '.')
159+
else:
160+
for member in ws.workspace.members:
161+
self._require_workspace_member(ws, member)
156162

157163
# Call subdir() for each required member of the workspace. The order is
158164
# important, if a member depends on another member, that member must be

0 commit comments

Comments
 (0)