Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Require sorted Cargo workspace members

Manav Rathid3cf62410712
diff --git a/rust/checks/cargo-workspace-dependencies/check.py b/rust/checks/cargo-workspace-dependencies/check.py
index 57469fc515..e3d1b90cfa 100644
--- a/rust/checks/cargo-workspace-dependencies/check.py
+++ b/rust/checks/cargo-workspace-dependencies/check.py
@@ -32,6 +32,15 @@ for package in packages:
failed = False
+members = tomllib.loads((root / "rust/Cargo.toml").read_text())["workspace"]["members"]
+for previous, member in zip(members, members[1:]):
+ if previous > member:
+ print(
+ f"rust/Cargo.toml: workspace.members {previous!r} precedes {member!r}; sort members",
+ file=sys.stderr,
+ )
+ failed = True
+
for package in packages:
manifest = Path(package["manifest_path"])
path = manifest.relative_to(root).as_posix()
diff --git a/rust/checks/cargo-workspace-dependencies/test.py b/rust/checks/cargo-workspace-dependencies/test.py
index 9b4b65313e..f76acb70f1 100644
--- a/rust/checks/cargo-workspace-dependencies/test.py
+++ b/rust/checks/cargo-workspace-dependencies/test.py
@@ -22,11 +22,11 @@ edition = "2024"
"""
-def run(app_b):
+def run(app_b, members='"app-*"'):
with tempfile.TemporaryDirectory() as directory:
root = Path(directory)
rust = root / "rust"
- write(rust / "Cargo.toml", workspace)
+ write(rust / "Cargo.toml", workspace.replace('"app-*"', members))
write(
rust / "app-a/Cargo.toml",
package.format("app-a")
@@ -90,3 +90,11 @@ dep = { package = "tokio", version = "1.0.0" }
assert result.returncode == 1, result.stderr
assert "target.cfg(unix).dependencies.dep duplicates shared dependency 'serde'" in result.stderr
assert "target.cfg(windows)" not in result.stderr
+
+result = run("\n[dependencies]\nshared.workspace = true\n", '"app-b", "app-a"')
+assert result.returncode == 1, result.stderr
+assert "rust/Cargo.toml: workspace.members 'app-b' precedes 'app-a'; sort members" in result.stderr
+
+result = run("\n[dependencies]\nshared.workspace = true\n", '"app-a", "app-b"')
+assert result.returncode == 0, result.stderr
+assert not result.stderr