mirror of
https://github.com/openai/codex.git
synced 2026-04-28 02:11:08 +03:00
b77fe8fefe
## Why Once the repo-local lint exists, `codex-rs` needs to follow the checked-in convention and CI needs to keep it from drifting. This commit applies the fallback `/*param*/` style consistently across existing positional literal call sites without changing those APIs. The longer-term preference is still to avoid APIs that require comments by choosing clearer parameter types and call shapes. This PR is intentionally the mechanical follow-through for the places where the existing signatures stay in place. After rebasing onto newer `main`, the rollout also had to cover newly introduced `tui_app_server` call sites. That made it clear the first cut of the CI job was too expensive for the common path: it was spending almost as much time installing `cargo-dylint` and re-testing the lint crate as a representative test job spends running product tests. The CI update keeps the full workspace enforcement but trims that extra overhead from ordinary `codex-rs` PRs. ## What changed - keep a dedicated `argument_comment_lint` job in `rust-ci` - mechanically annotate remaining opaque positional literals across `codex-rs` with exact `/*param*/` comments, including the rebased `tui_app_server` call sites that now fall under the lint - keep the checked-in style aligned with the lint policy by using `/*param*/` and leaving string and char literals uncommented - cache `cargo-dylint`, `dylint-link`, and the relevant Cargo registry/git metadata in the lint job - split changed-path detection so the lint crate's own `cargo test` step runs only when `tools/argument-comment-lint/*` or `rust-ci.yml` changes - continue to run the repo wrapper over the `codex-rs` workspace, so product-code enforcement is unchanged Most of the code changes in this commit are intentionally mechanical comment rewrites or insertions driven by the lint itself. ## Verification - `./tools/argument-comment-lint/run.sh --workspace` - `cargo test -p codex-tui-app-server -p codex-tui` - parsed `.github/workflows/rust-ci.yml` locally with PyYAML --- * -> #14652 * #14651
92 lines
2.2 KiB
Bash
Executable File
92 lines
2.2 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
|
|
set -euo pipefail
|
|
|
|
repo_root="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
|
|
lint_path="$repo_root/tools/argument-comment-lint"
|
|
manifest_path="$repo_root/codex-rs/Cargo.toml"
|
|
strict_lint="uncommented-anonymous-literal-argument"
|
|
noise_lint="unknown_lints"
|
|
|
|
has_manifest_path=false
|
|
has_package_selection=false
|
|
has_no_deps=false
|
|
has_library_selection=false
|
|
expect_value=""
|
|
|
|
for arg in "$@"; do
|
|
if [[ -n "$expect_value" ]]; then
|
|
case "$expect_value" in
|
|
manifest_path)
|
|
has_manifest_path=true
|
|
;;
|
|
package_selection)
|
|
has_package_selection=true
|
|
;;
|
|
library_selection)
|
|
has_library_selection=true
|
|
;;
|
|
esac
|
|
expect_value=""
|
|
continue
|
|
fi
|
|
|
|
case "$arg" in
|
|
--)
|
|
break
|
|
;;
|
|
--manifest-path)
|
|
expect_value="manifest_path"
|
|
;;
|
|
--manifest-path=*)
|
|
has_manifest_path=true
|
|
;;
|
|
-p|--package)
|
|
expect_value="package_selection"
|
|
;;
|
|
--package=*)
|
|
has_package_selection=true
|
|
;;
|
|
--workspace)
|
|
has_package_selection=true
|
|
;;
|
|
--no-deps)
|
|
has_no_deps=true
|
|
;;
|
|
--lib|--lib-path)
|
|
expect_value="library_selection"
|
|
;;
|
|
--lib=*|--lib-path=*)
|
|
has_library_selection=true
|
|
;;
|
|
esac
|
|
done
|
|
|
|
cmd=(cargo dylint --path "$lint_path")
|
|
if [[ "$has_library_selection" == false ]]; then
|
|
cmd+=(--all)
|
|
fi
|
|
if [[ "$has_manifest_path" == false ]]; then
|
|
cmd+=(--manifest-path "$manifest_path")
|
|
fi
|
|
if [[ "$has_package_selection" == false ]]; then
|
|
cmd+=(--workspace)
|
|
fi
|
|
if [[ "$has_no_deps" == false ]]; then
|
|
cmd+=(--no-deps)
|
|
fi
|
|
cmd+=("$@")
|
|
|
|
if [[ "${DYLINT_RUSTFLAGS:-}" != *"$strict_lint"* ]]; then
|
|
export DYLINT_RUSTFLAGS="${DYLINT_RUSTFLAGS:+${DYLINT_RUSTFLAGS} }-D $strict_lint"
|
|
fi
|
|
if [[ "${DYLINT_RUSTFLAGS:-}" != *"$noise_lint"* ]]; then
|
|
export DYLINT_RUSTFLAGS="${DYLINT_RUSTFLAGS:+${DYLINT_RUSTFLAGS} }-A $noise_lint"
|
|
fi
|
|
|
|
if [[ -z "${CARGO_INCREMENTAL:-}" ]]; then
|
|
export CARGO_INCREMENTAL=0
|
|
fi
|
|
|
|
exec "${cmd[@]}"
|