mirror of
https://github.com/openai/codex.git
synced 2026-05-01 09:56:37 +00:00
## 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
112 lines
3.0 KiB
Rust
112 lines
3.0 KiB
Rust
use std::convert::TryFrom;
|
|
use std::time::Duration;
|
|
use std::time::Instant;
|
|
|
|
use rand::Rng as _;
|
|
|
|
use crate::frames::ALL_VARIANTS;
|
|
use crate::frames::FRAME_TICK_DEFAULT;
|
|
use crate::tui::FrameRequester;
|
|
|
|
/// Drives ASCII art animations shared across popups and onboarding widgets.
|
|
pub(crate) struct AsciiAnimation {
|
|
request_frame: FrameRequester,
|
|
variants: &'static [&'static [&'static str]],
|
|
variant_idx: usize,
|
|
frame_tick: Duration,
|
|
start: Instant,
|
|
}
|
|
|
|
impl AsciiAnimation {
|
|
pub(crate) fn new(request_frame: FrameRequester) -> Self {
|
|
Self::with_variants(request_frame, ALL_VARIANTS, /*variant_idx*/ 0)
|
|
}
|
|
|
|
pub(crate) fn with_variants(
|
|
request_frame: FrameRequester,
|
|
variants: &'static [&'static [&'static str]],
|
|
variant_idx: usize,
|
|
) -> Self {
|
|
assert!(
|
|
!variants.is_empty(),
|
|
"AsciiAnimation requires at least one animation variant",
|
|
);
|
|
let clamped_idx = variant_idx.min(variants.len() - 1);
|
|
Self {
|
|
request_frame,
|
|
variants,
|
|
variant_idx: clamped_idx,
|
|
frame_tick: FRAME_TICK_DEFAULT,
|
|
start: Instant::now(),
|
|
}
|
|
}
|
|
|
|
pub(crate) fn schedule_next_frame(&self) {
|
|
let tick_ms = self.frame_tick.as_millis();
|
|
if tick_ms == 0 {
|
|
self.request_frame.schedule_frame();
|
|
return;
|
|
}
|
|
let elapsed_ms = self.start.elapsed().as_millis();
|
|
let rem_ms = elapsed_ms % tick_ms;
|
|
let delay_ms = if rem_ms == 0 {
|
|
tick_ms
|
|
} else {
|
|
tick_ms - rem_ms
|
|
};
|
|
if let Ok(delay_ms_u64) = u64::try_from(delay_ms) {
|
|
self.request_frame
|
|
.schedule_frame_in(Duration::from_millis(delay_ms_u64));
|
|
} else {
|
|
self.request_frame.schedule_frame();
|
|
}
|
|
}
|
|
|
|
pub(crate) fn current_frame(&self) -> &'static str {
|
|
let frames = self.frames();
|
|
if frames.is_empty() {
|
|
return "";
|
|
}
|
|
let tick_ms = self.frame_tick.as_millis();
|
|
if tick_ms == 0 {
|
|
return frames[0];
|
|
}
|
|
let elapsed_ms = self.start.elapsed().as_millis();
|
|
let idx = ((elapsed_ms / tick_ms) % frames.len() as u128) as usize;
|
|
frames[idx]
|
|
}
|
|
|
|
pub(crate) fn pick_random_variant(&mut self) -> bool {
|
|
if self.variants.len() <= 1 {
|
|
return false;
|
|
}
|
|
let mut rng = rand::rng();
|
|
let mut next = self.variant_idx;
|
|
while next == self.variant_idx {
|
|
next = rng.random_range(0..self.variants.len());
|
|
}
|
|
self.variant_idx = next;
|
|
self.request_frame.schedule_frame();
|
|
true
|
|
}
|
|
|
|
#[allow(dead_code)]
|
|
pub(crate) fn request_frame(&self) {
|
|
self.request_frame.schedule_frame();
|
|
}
|
|
|
|
fn frames(&self) -> &'static [&'static str] {
|
|
self.variants[self.variant_idx]
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn frame_tick_must_be_nonzero() {
|
|
assert!(FRAME_TICK_DEFAULT.as_millis() > 0);
|
|
}
|
|
}
|