mirror of
https://github.com/openai/codex.git
synced 2026-05-14 16:22:51 +00:00
## Why `argument-comment-lint` was green in CI even though the repo still had many uncommented literal arguments. The main gap was target coverage: the repo wrapper did not force Cargo to inspect test-only call sites, so examples like the `latest_session_lookup_params(true, ...)` tests in `codex-rs/tui_app_server/src/lib.rs` never entered the blocking CI path. This change cleans up the existing backlog, makes the default repo lint path cover all Cargo targets, and starts rolling that stricter CI enforcement out on the platform where it is currently validated. ## What changed - mechanically fixed existing `argument-comment-lint` violations across the `codex-rs` workspace, including tests, examples, and benches - updated `tools/argument-comment-lint/run-prebuilt-linter.sh` and `tools/argument-comment-lint/run.sh` so non-`--fix` runs default to `--all-targets` unless the caller explicitly narrows the target set - fixed both wrappers so forwarded cargo arguments after `--` are preserved with a single separator - documented the new default behavior in `tools/argument-comment-lint/README.md` - updated `rust-ci` so the macOS lint lane keeps the plain wrapper invocation and therefore enforces `--all-targets`, while Linux and Windows temporarily pass `-- --lib --bins` That temporary CI split keeps the stricter all-targets check where it is already cleaned up, while leaving room to finish the remaining Linux- and Windows-specific target-gated cleanup before enabling `--all-targets` on those runners. The Linux and Windows failures on the intermediate revision were caused by the wrapper forwarding bug, not by additional lint findings in those lanes. ## Validation - `bash -n tools/argument-comment-lint/run.sh` - `bash -n tools/argument-comment-lint/run-prebuilt-linter.sh` - shell-level wrapper forwarding check for `-- --lib --bins` - shell-level wrapper forwarding check for `-- --tests` - `just argument-comment-lint` - `cargo test` in `tools/argument-comment-lint` - `cargo test -p codex-terminal-detection` ## Follow-up - Clean up remaining Linux-only target-gated callsites, then switch the Linux lint lane back to the plain wrapper invocation. - Clean up remaining Windows-only target-gated callsites, then switch the Windows lint lane back to the plain wrapper invocation.
194 lines
5.6 KiB
Rust
194 lines
5.6 KiB
Rust
use std::borrow::Borrow;
|
|
use std::hash::Hash;
|
|
use std::num::NonZeroUsize;
|
|
|
|
use lru::LruCache;
|
|
use sha1::Digest;
|
|
use sha1::Sha1;
|
|
use tokio::sync::Mutex;
|
|
use tokio::sync::MutexGuard;
|
|
|
|
/// A minimal LRU cache protected by a Tokio mutex.
|
|
/// Calls outside a Tokio runtime are no-ops.
|
|
pub struct BlockingLruCache<K, V> {
|
|
inner: Mutex<LruCache<K, V>>,
|
|
}
|
|
|
|
impl<K, V> BlockingLruCache<K, V>
|
|
where
|
|
K: Eq + Hash,
|
|
{
|
|
/// Creates a cache with the provided non-zero capacity.
|
|
#[must_use]
|
|
pub fn new(capacity: NonZeroUsize) -> Self {
|
|
Self {
|
|
inner: Mutex::new(LruCache::new(capacity)),
|
|
}
|
|
}
|
|
|
|
/// Returns a clone of the cached value for `key`, or computes and inserts it.
|
|
pub fn get_or_insert_with(&self, key: K, value: impl FnOnce() -> V) -> V
|
|
where
|
|
V: Clone,
|
|
{
|
|
if let Some(mut guard) = lock_if_runtime(&self.inner) {
|
|
if let Some(v) = guard.get(&key) {
|
|
return v.clone();
|
|
}
|
|
let v = value();
|
|
// Insert and return a clone to keep ownership in the cache.
|
|
guard.put(key, v.clone());
|
|
return v;
|
|
}
|
|
value()
|
|
}
|
|
|
|
/// Like `get_or_insert_with`, but the value factory may fail.
|
|
pub fn get_or_try_insert_with<E>(
|
|
&self,
|
|
key: K,
|
|
value: impl FnOnce() -> Result<V, E>,
|
|
) -> Result<V, E>
|
|
where
|
|
V: Clone,
|
|
{
|
|
if let Some(mut guard) = lock_if_runtime(&self.inner) {
|
|
if let Some(v) = guard.get(&key) {
|
|
return Ok(v.clone());
|
|
}
|
|
let v = value()?;
|
|
guard.put(key, v.clone());
|
|
return Ok(v);
|
|
}
|
|
value()
|
|
}
|
|
|
|
/// Builds a cache if `capacity` is non-zero, returning `None` otherwise.
|
|
#[must_use]
|
|
pub fn try_with_capacity(capacity: usize) -> Option<Self> {
|
|
NonZeroUsize::new(capacity).map(Self::new)
|
|
}
|
|
|
|
/// Returns a clone of the cached value corresponding to `key`, if present.
|
|
pub fn get<Q>(&self, key: &Q) -> Option<V>
|
|
where
|
|
K: Borrow<Q>,
|
|
Q: Hash + Eq + ?Sized,
|
|
V: Clone,
|
|
{
|
|
let mut guard = lock_if_runtime(&self.inner)?;
|
|
guard.get(key).cloned()
|
|
}
|
|
|
|
/// Inserts `value` for `key`, returning the previous entry if it existed.
|
|
pub fn insert(&self, key: K, value: V) -> Option<V> {
|
|
let mut guard = lock_if_runtime(&self.inner)?;
|
|
guard.put(key, value)
|
|
}
|
|
|
|
/// Removes the entry for `key` if it exists, returning it.
|
|
pub fn remove<Q>(&self, key: &Q) -> Option<V>
|
|
where
|
|
K: Borrow<Q>,
|
|
Q: Hash + Eq + ?Sized,
|
|
{
|
|
let mut guard = lock_if_runtime(&self.inner)?;
|
|
guard.pop(key)
|
|
}
|
|
|
|
/// Clears all entries from the cache.
|
|
pub fn clear(&self) {
|
|
if let Some(mut guard) = lock_if_runtime(&self.inner) {
|
|
guard.clear();
|
|
}
|
|
}
|
|
|
|
/// Executes `callback` with a mutable reference to the underlying cache.
|
|
pub fn with_mut<R>(&self, callback: impl FnOnce(&mut LruCache<K, V>) -> R) -> R {
|
|
if let Some(mut guard) = lock_if_runtime(&self.inner) {
|
|
callback(&mut guard)
|
|
} else {
|
|
let mut disabled = LruCache::unbounded();
|
|
callback(&mut disabled)
|
|
}
|
|
}
|
|
|
|
/// Provides direct access to the cache guard when a Tokio runtime is available.
|
|
pub fn blocking_lock(&self) -> Option<MutexGuard<'_, LruCache<K, V>>> {
|
|
lock_if_runtime(&self.inner)
|
|
}
|
|
}
|
|
|
|
fn lock_if_runtime<K, V>(m: &Mutex<LruCache<K, V>>) -> Option<MutexGuard<'_, LruCache<K, V>>>
|
|
where
|
|
K: Eq + Hash,
|
|
{
|
|
tokio::runtime::Handle::try_current().ok()?;
|
|
Some(tokio::task::block_in_place(|| m.blocking_lock()))
|
|
}
|
|
|
|
/// Computes the SHA-1 digest of `bytes`.
|
|
///
|
|
/// Useful for content-based cache keys when you want to avoid staleness
|
|
/// caused by path-only keys.
|
|
#[must_use]
|
|
pub fn sha1_digest(bytes: &[u8]) -> [u8; 20] {
|
|
let mut hasher = Sha1::new();
|
|
hasher.update(bytes);
|
|
let result = hasher.finalize();
|
|
let mut out = [0; 20];
|
|
out.copy_from_slice(&result);
|
|
out
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::BlockingLruCache;
|
|
use std::num::NonZeroUsize;
|
|
|
|
#[tokio::test(flavor = "multi_thread")]
|
|
async fn stores_and_retrieves_values() {
|
|
let cache = BlockingLruCache::new(NonZeroUsize::new(2).expect("capacity"));
|
|
|
|
assert!(cache.get(&"first").is_none());
|
|
cache.insert("first", /*value*/ 1);
|
|
assert_eq!(cache.get(&"first"), Some(1));
|
|
}
|
|
|
|
#[tokio::test(flavor = "multi_thread")]
|
|
async fn evicts_least_recently_used() {
|
|
let cache = BlockingLruCache::new(NonZeroUsize::new(2).expect("capacity"));
|
|
cache.insert("a", /*value*/ 1);
|
|
cache.insert("b", /*value*/ 2);
|
|
assert_eq!(cache.get(&"a"), Some(1));
|
|
|
|
cache.insert("c", /*value*/ 3);
|
|
|
|
assert!(cache.get(&"b").is_none());
|
|
assert_eq!(cache.get(&"a"), Some(1));
|
|
assert_eq!(cache.get(&"c"), Some(3));
|
|
}
|
|
|
|
#[test]
|
|
fn disabled_without_runtime() {
|
|
let cache = BlockingLruCache::new(NonZeroUsize::new(2).expect("capacity"));
|
|
cache.insert("first", /*value*/ 1);
|
|
assert!(cache.get(&"first").is_none());
|
|
|
|
assert_eq!(cache.get_or_insert_with("first", || 2), 2);
|
|
assert!(cache.get(&"first").is_none());
|
|
|
|
assert!(cache.remove(&"first").is_none());
|
|
cache.clear();
|
|
|
|
let result = cache.with_mut(|inner| {
|
|
inner.put("tmp", 3);
|
|
inner.get(&"tmp").cloned()
|
|
});
|
|
assert_eq!(result, Some(3));
|
|
assert!(cache.get(&"tmp").is_none());
|
|
|
|
assert!(cache.blocking_lock().is_none());
|
|
}
|
|
}
|