Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions ci/lint.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,13 @@ def lint_single_file(file_path):
return 1

# Format single file
result = run_cmd(["uv", "run", "rustfmt", file_path])
result = run_cmd(["uv", "run", "soldr", "rustfmt", file_path])
if result.returncode != 0:
return result.returncode

# Clippy on the affected crate (or workspace if unknown)
crate = detect_crate(file_path)
cmd = ["uv", "run", "cargo", "clippy"]
cmd = ["uv", "run", "soldr", "cargo", "clippy"]
if crate:
cmd += ["-p", crate]
else:
Expand All @@ -74,14 +74,14 @@ def lint_single_file(file_path):
def lint_workspace():
"""Full workspace lint: fmt check + clippy."""
# Format check
result = run_cmd(["uv", "run", "cargo", "fmt", "--all", "--check"])
result = run_cmd(["uv", "run", "soldr", "cargo", "fmt", "--all", "--check"])
if result.returncode != 0:
print("Formatting issues found. Run './lint --fix' to auto-fix.", file=sys.stderr)
return result.returncode

# Clippy
result = run_cmd([
"uv", "run", "cargo", "clippy", "--workspace", "--all-targets",
"uv", "run", "soldr", "cargo", "clippy", "--workspace", "--all-targets",
"--", "-D", "warnings",
])
return result.returncode
Expand All @@ -93,13 +93,13 @@ def main():
# Handle --fix flag
if "--fix" in args:
args.remove("--fix")
result = run_cmd(["uv", "run", "cargo", "fmt", "--all"])
result = run_cmd(["uv", "run", "soldr", "cargo", "fmt", "--all"])
if result.returncode != 0:
return result.returncode
if not args:
# After fixing fmt, run clippy
result = run_cmd([
"uv", "run", "cargo", "clippy", "--workspace", "--all-targets",
"uv", "run", "soldr", "cargo", "clippy", "--workspace", "--all-targets",
"--", "-D", "warnings",
])
return result.returncode
Expand Down
2 changes: 1 addition & 1 deletion ci/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@


def main():
cmd = ["uv", "run", "cargo", "test"]
cmd = ["uv", "run", "soldr", "cargo", "test"]

args = sys.argv[1:]
full = "--full" in args
Expand Down
14 changes: 7 additions & 7 deletions lint
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,13 @@ def main() -> int:

# --fix mode
if fix:
rc = run(["uv", "run", "cargo", "fmt", "--all"])
rc = run(["uv", "run", "soldr", "cargo", "fmt", "--all"])
if rc != 0:
return rc
if not file_arg:
return run(
[
"uv", "run", "cargo", "clippy",
"uv", "run", "soldr", "cargo", "clippy",
"--workspace", "--all-targets", "--", "-D", "warnings",
]
)
Expand All @@ -66,27 +66,27 @@ def main() -> int:
if not os.path.isfile(file_path):
print(f"File not found: {file_path}", file=sys.stderr)
return 1
rc = run(["uv", "run", "rustfmt", file_path])
rc = run(["uv", "run", "soldr", "rustfmt", file_path])
if rc != 0:
return rc
crate = detect_crate(file_path)
if crate:
return run(
[
"uv", "run", "cargo", "clippy",
"uv", "run", "soldr", "cargo", "clippy",
"-p", crate, "--all-targets", "--", "-D", "warnings",
]
)
else:
return run(
[
"uv", "run", "cargo", "clippy",
"uv", "run", "soldr", "cargo", "clippy",
"--workspace", "--all-targets", "--", "-D", "warnings",
]
)

# Full workspace mode
rc = run(["uv", "run", "cargo", "fmt", "--all", "--check"])
rc = run(["uv", "run", "soldr", "cargo", "fmt", "--all", "--check"])
if rc != 0:
print(
"Formatting issues found. Run 'uv run --script lint --fix' to auto-fix.",
Expand All @@ -95,7 +95,7 @@ def main() -> int:
return 1
return run(
[
"uv", "run", "cargo", "clippy",
"uv", "run", "soldr", "cargo", "clippy",
"--workspace", "--all-targets", "--", "-D", "warnings",
]
)
Expand Down
2 changes: 1 addition & 1 deletion perf
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ SCRIPT_DIR = Path(__file__).parent.resolve()

def main():
cmd = [
"uv", "run", "cargo", "test",
"uv", "run", "soldr", "cargo", "test",
"-p", "fbuild-daemon",
"--test", "perf_bench_test",
"--",
Expand Down
Loading