ci: Reformat aggressively

Author: CSRessel

codex-rs/Cargo.lock

@@ -10,7 +10,14 @@ pub use registry::get_agent_config;
 pub use tracing_setup::init_file_tracing;
 
 // Re-export commonly used types from agent-client-protocol
-pub use agent_client_protocol::{
-    Agent, Client, ClientSideConnection, InitializeRequest, InitializeResponse, NewSessionRequest,
-    NewSessionResponse, PromptRequest, PromptResponse, SessionNotification, SessionUpdate,
-};
+pub use agent_client_protocol::Agent;
+pub use agent_client_protocol::Client;
+pub use agent_client_protocol::ClientSideConnection;
+pub use agent_client_protocol::InitializeRequest;
+pub use agent_client_protocol::InitializeResponse;
+pub use agent_client_protocol::NewSessionRequest;
+pub use agent_client_protocol::NewSessionResponse;
+pub use agent_client_protocol::PromptRequest;
+pub use agent_client_protocol::PromptResponse;
+pub use agent_client_protocol::SessionNotification;
+pub use agent_client_protocol::SessionUpdate;

codex-rs/acp/src/lib.rs

@@ -2,9 +2,13 @@
 //!
 //! Provides initialization for logging ACP activity to a file using the tracing framework.
 
-use anyhow::{Context, Result};
+use anyhow::Context;
+use anyhow::Result;
 use std::path::Path;
-use tracing_subscriber::{EnvFilter, fmt, layer::SubscriberExt, util::SubscriberInitExt};
+use tracing_subscriber::EnvFilter;
+use tracing_subscriber::fmt;
+use tracing_subscriber::layer::SubscriberExt;
+use tracing_subscriber::util::SubscriberInitExt;
 
 /// Initialize file-based tracing subscriber
 ///

codex-rs/acp/src/tracing_setup.rs

@@ -1,7 +1,10 @@
 use serial_test::serial;
 use std::fs;
 use tempfile::TempDir;
-use tracing::{debug, error, info, warn};
+use tracing::debug;
+use tracing::error;
+use tracing::info;
+use tracing::warn;
 
 /// Comprehensive test that verifies all tracing functionality
 /// This must be a single test because the global subscriber can only be set once

codex-rs/acp/tests/tracing_test.rs

@@ -2,7 +2,8 @@
 
 #[cfg(test)]
 mod tests {
-    use crate::model_provider_info::{WireApi, built_in_model_providers};
+    use crate::model_provider_info::WireApi;
+    use crate::model_provider_info::built_in_model_providers;
 
     #[test]
     fn test_mock_acp_provider_exists() {

codex-rs/core/src/client_acp_tests.rs

@@ -1332,7 +1332,8 @@ fn default_review_model() -> String {
 /// This allows users to specify just `--model mock-acp` without needing to also
 /// specify `--model-provider mock-acp`.
 fn infer_provider_from_model(model: &str) -> Option<String> {
-    use crate::model_provider_info::{GEMINI_ACP_PROVIDER_ID, MOCK_ACP_PROVIDER_ID};
+    use crate::model_provider_info::GEMINI_ACP_PROVIDER_ID;
+    use crate::model_provider_info::MOCK_ACP_PROVIDER_ID;
     tracing::debug!("Inferring provider! found model {model}");
 
     // Check for ACP-based models that have their own provider

codex-rs/core/src/config/mod.rs

@@ -1,12 +1,18 @@
 //! Mock ACP agent for testing nori-cli
 
-use std::{cell::Cell, path::PathBuf, rc::Rc};
+use std::cell::Cell;
+use std::path::PathBuf;
+use std::rc::Rc;
 
-use agent_client_protocol::{self as acp, Client as _};
+use agent_client_protocol::Client as _;
+use agent_client_protocol::{self as acp};
 use serde_json::json;
-use tokio::sync::{mpsc, oneshot};
-use tokio::time::{Duration, sleep};
-use tokio_util::compat::{TokioAsyncReadCompatExt as _, TokioAsyncWriteCompatExt as _};
+use tokio::sync::mpsc;
+use tokio::sync::oneshot;
+use tokio::time::Duration;
+use tokio::time::sleep;
+use tokio_util::compat::TokioAsyncReadCompatExt as _;
+use tokio_util::compat::TokioAsyncWriteCompatExt as _;
 
 enum MockClientRequest {
     ReadFile {

codex-rs/mock-acp-agent/src/main.rs

@@ -1,8 +1,12 @@
 use anyhow::Result;
-use portable_pty::{native_pty_system, CommandBuilder, PtySize};
+use portable_pty::native_pty_system;
+use portable_pty::CommandBuilder;
+use portable_pty::PtySize;
 use std::collections::HashMap;
-use std::io::{Read, Write};
-use std::time::{Duration, Instant};
+use std::io::Read;
+use std::io::Write;
+use std::time::Duration;
+use std::time::Instant;
 use vt100::Parser;
 
 #[cfg(unix)]

codex-rs/tui-integration-tests/src/lib.rs

@@ -1,6 +1,9 @@
 use insta::assert_snapshot;
 use std::time::Duration;
-use tui_integration_tests::{normalize_for_snapshot, Key, TuiSession, TIMEOUT};
+use tui_integration_tests::normalize_for_snapshot;
+use tui_integration_tests::Key;
+use tui_integration_tests::TuiSession;
+use tui_integration_tests::TIMEOUT;
 
 #[test]
 fn test_ctrl_c_clears_input() {

codex-rs/tui-integration-tests/tests/input_handling.rs

@@ -1,6 +1,8 @@
 use insta::assert_snapshot;
 use std::time::Duration;
-use tui_integration_tests::{Key, SessionConfig, TuiSession};
+use tui_integration_tests::Key;
+use tui_integration_tests::SessionConfig;
+use tui_integration_tests::TuiSession;
 
 const TIMEOUT: Duration = Duration::from_secs(10);