openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-11-07 20:30:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade argument comment lint to Dylint 6.3.0 (#59505)

Browse Source 
## Why

Dylint 6.1.0 required a Git branch alias to accommodate rust-clippy's removed `master` branch.

## What changed

- Upgrade the lint dependencies and CI/release tooling to Dylint 6.3.0, updating the Cargo and Bazel lockfiles.
- Remove the Clippy compatibility script and run `cargo test --locked` directly in CI.
- Update installation instructions and wrapper diagnostics to recommend the matching tool versions.

GitOrigin-RevId: 18ac1489cd3faa7a80abf26b092e5478881f142d
This commit is contained in:
Sean Huang
2026-11-04 22:34:04 +00:00
committed by copyberry
parent e115d5f90d
commit e15c5fc2b9
9 changed files with 33 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/argument-comment-lint/Cargo.lock
Generated
+15 -8
View File
@@ -206,9 +206,9 @@ dependencies = [
[[package]]
name = "dylint"
version = "6.1.0"
version = "6.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "36143945826ac0fcdcfbe5428074d84cac9510aa28584435a71e51f22d644119"
checksum = "a34a586a3d22e87c5cd6b0b45158c4d4ec3a7fc2ea49800c8f3127eea239538b"
dependencies = [
"anstyle",
"anyhow",
@@ -224,9 +224,9 @@ dependencies = [
[[package]]
name = "dylint_internal"
version = "6.1.0"
version = "6.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2d852b4a08f8591389714911e6b381bcd3da3778650a05baef91a801869917e"
checksum = "7bc061f49eb5a4d2a440a8b40a65e3d8860f92516d118090573cfadf8c0d2fa4"
dependencies = [
"anstyle",
"anyhow",
@@ -235,6 +235,7 @@ dependencies = [
"git2",
"home",
"log",
"pastey",
"regex",
"semver",
"serde",
@@ -248,9 +249,9 @@ dependencies = [
[[package]]
name = "dylint_linting"
version = "6.1.0"
version = "6.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a7c61575df18252a32cd5fbd4224454b62a37352cf18943476370c991ca6b8c"
checksum = "1d190d4d3c83bd2e7a9ed94eaf98d58dbb89afbabd2bf4ad2d75c76a0c383718"
dependencies = [
"cargo_metadata",
"dylint_internal",
@@ -263,9 +264,9 @@ dependencies = [
[[package]]
name = "dylint_testing"
version = "6.1.0"
version = "6.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a33b8cd0529c5a22ade9665181c9c3471316db3e44b6a47b3a5516672a99081"
checksum = "0abbaa51fb13d56446702ca2105dcf0fd390183d1ba3ea210d08b216c0805a09"
dependencies = [
"anyhow",
"cargo_metadata",
@@ -627,6 +628,12 @@ version = "1.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
[[package]]
name = "pastey"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2ee67f1008b1ba2321834326597b8e186293b049a023cdef258527550b9935b4"
[[package]]
name = "pin-project-lite"
version = "0.2.17"
tools/argument-comment-lint/Cargo.toml
+2 -2
View File
@@ -13,10 +13,10 @@ bazel_native = []
[dependencies]
clippy_utils = { git = "https://github.com/rust-lang/rust-clippy", rev = "21baba9c10c5d179915cae82e6247bc2337872fb" }
dylint_linting = "6.1.0"
dylint_linting = "6.3.0"
[dev-dependencies]
dylint_testing = "6.1.0"
dylint_testing = "6.3.0"
[workspace]
tools/argument-comment-lint/README.md
+1 -1
View File
@@ -64,7 +64,7 @@ rustup toolchain install nightly-2026-08-20 \
--component rustc-dev \
--component rust-src
rustup run nightly-2026-08-20 cargo install --locked \
cargo-dylint@6.1.0 dylint-link@6.1.0
cargo-dylint@6.3.0 dylint-link@6.3.0
```
Run the lint crate tests:
tools/argument-comment-lint/test-with-clippy-compat.sh
-13
View File
@@ -1,13 +0,0 @@
#!/usr/bin/env bash
set -euo pipefail
# Dylint 6.1.0 still checks out rust-clippy's removed master branch. Add an
# alias only to that clone until we upgrade to a Dylint version that uses main.
clippy_config="$(mktemp)"
trap 'rm -f -- "$clippy_config"' EXIT
git config --file "$clippy_config" remote.origin.fetch '+refs/heads/main:refs/heads/master'
config_index="${GIT_CONFIG_COUNT:-0}"
export "GIT_CONFIG_KEY_${config_index}=includeIf.hasconfig:remote.*.url:https://github.com/rust-lang/rust-clippy.path"
export "GIT_CONFIG_VALUE_${config_index}=$clippy_config"
GIT_CONFIG_COUNT="$((config_index + 1))" cargo test "$@"
tools/argument-comment-lint/wrapper_common.py
+2 -2
View File
@@ -200,14 +200,14 @@ def ensure_source_prerequisites(env: MutableMapping[str, str]) -> None:
"argument-comment-lint source wrapper requires cargo-dylint and dylint-link.\n"
"Install them with:\n"
f" rustup run {TOOLCHAIN_CHANNEL} cargo install --locked "
"cargo-dylint@6.1.0 dylint-link@6.1.0",
"cargo-dylint@6.3.0 dylint-link@6.3.0",
)
require_command(
"dylint-link",
"argument-comment-lint source wrapper requires cargo-dylint and dylint-link.\n"
"Install them with:\n"
f" rustup run {TOOLCHAIN_CHANNEL} cargo install --locked "
"cargo-dylint@6.1.0 dylint-link@6.1.0",
"cargo-dylint@6.3.0 dylint-link@6.3.0",
)