hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-16 16:53:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rust: strengthen linting script

Browse Source 
* `bazel run //rust/ast-generator:inject-sources` could fail on macOS
  if a non-coreutils `cp` was used
* that is now also run by `lint.py` to ensure the sources cargo needs
  are present
This commit is contained in:
Paolo Tranquilli
2025-02-20 10:39:14 +01:00
parent a1b7096125
commit 292b962513
2 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rust/ast-generator/BUILD.bazel
View File

@@ -66,7 +66,9 @@ write_file(
'DST_DIR="$(dirname "$(rlocation "$1")")"', 'DST_DIR="$(dirname "$(rlocation "$1")")"',
'mkdir -p "$DST_DIR/src/codegen/grammar"', 'mkdir -p "$DST_DIR/src/codegen/grammar"',
] + [ ] + [
'cp -f --no-preserve=mode "$(rlocation "$%s")" "$DST_DIR/%s"' % item # using cat instead of cp to honor default umask
# (also, macOS does not support `cp --no-preserve=mode`)
'cat "$(rlocation "$%s")" > "$DST_DIR/%s"' % item
for item in enumerate(_codegen_outs, 2) for item in enumerate(_codegen_outs, 2)
], ],
is_executable = True, is_executable = True,

30
rust/lint.py
View File

@@ -1,20 +1,38 @@
#!/bin/env python3 #!/usr/bin/env python3
import subprocess import subprocess
import pathlib import pathlib
import shutil import shutil
import sys import sys
def tool(name):
ret = shutil.which(name)
assert ret, f"no {name} binary found on `PATH`"
return ret
this_dir = pathlib.Path(__file__).resolve().parent this_dir = pathlib.Path(__file__).resolve().parent
cargo = shutil.which("cargo") cargo = tool("cargo")
assert cargo, "no cargo binary found on `PATH`" bazel = tool("bazel")
runs = [] runs = []
runs.append(subprocess.run([cargo, "fmt", "--all", "--quiet"], cwd=this_dir))
def run(tool, args, *, cwd=this_dir):
print("+", tool, args)
runs.append(subprocess.run([tool] + args.split(), cwd=cwd))
# make sure bazel-provided sources are put in tree for `cargo` to work with them
run(bazel, "run ast-generator:inject-sources")
run(cargo, "fmt --all --quiet")
for manifest in this_dir.rglob("Cargo.toml"): for manifest in this_dir.rglob("Cargo.toml"):
if not manifest.is_relative_to(this_dir / "ql") and not manifest.is_relative_to(this_dir / "integration-tests"): if not manifest.is_relative_to(this_dir / "ql") and not manifest.is_relative_to(this_dir / "integration-tests"):
runs.append(subprocess.run([cargo, "clippy", "--fix", "--allow-dirty", "--allow-staged", "--quiet", "--", "-D", "warnings"], run(cargo,
cwd=manifest.parent)) "clippy --fix --allow-dirty --allow-staged --quiet -- -D warnings",
cwd=manifest.parent)
sys.exit(max(r.returncode for r in runs)) sys.exit(max(r.returncode for r in runs))