From b1529dd1954200c9f6358c5124b076cdd9da2153 Mon Sep 17 00:00:00 2001 From: "glm-5.3-flash" Date: Sat, 29 Aug 2026 08:22:10 +0000 Subject: [PATCH] style(client): cargo fmt --- src/client/http_client.rs | 67 +++++++++++++++++++-------------------- src/client/retry_after.rs | 11 ++++--- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/src/client/http_client.rs b/src/client/http_client.rs index 05ac040..0ee8454 100644 --- a/src/client/http_client.rs +++ b/src/client/http_client.rs @@ -132,10 +132,7 @@ impl Default for HttpClientConfig { connect_timeout: Some(DEFAULT_CONNECT_TIMEOUT), read_timeout: Some(DEFAULT_READ_TIMEOUT), retry_policy: ExponentialBackoff::builder() - .retry_bounds( - RETRY_BACKOFF_MIN_INTERVAL, - RETRY_BACKOFF_MAX_INTERVAL, - ) + .retry_bounds(RETRY_BACKOFF_MIN_INTERVAL, RETRY_BACKOFF_MAX_INTERVAL) .jitter(Jitter::Bounded) .base(2) .build_with_max_retries(3), @@ -263,10 +260,7 @@ struct RetryGateMiddleware { } impl RetryGateMiddleware { - fn new( - policy: ExponentialBackoff, - max_total_retry_duration: Duration, - ) -> Self { + fn new(policy: ExponentialBackoff, max_total_retry_duration: Duration) -> Self { Self { retry: Arc::new(RetryTransientMiddleware::new_with_policy( TotalRetryBudget { @@ -325,30 +319,28 @@ async fn build_client( config: &HttpClientConfig, ) -> Result { let ca_pem = match &config.ca_bundle { - Some(path) => Some( - tokio::fs::read(path) - .await - .map_err(|source| HttpClientBuildError::CaBundleRead { - path: path.clone(), - source, - })?, - ), + Some(path) => Some(tokio::fs::read(path).await.map_err(|source| { + HttpClientBuildError::CaBundleRead { + path: path.clone(), + source, + } + })?), None => None, }; let client_pems = match &config.client_cert { Some(cfg) => { - let cert_pem = tokio::fs::read(&cfg.cert_pem) - .await - .map_err(|source| HttpClientBuildError::ClientCertRead { + let cert_pem = tokio::fs::read(&cfg.cert_pem).await.map_err(|source| { + HttpClientBuildError::ClientCertRead { path: cfg.cert_pem.clone(), source, - })?; - let key_pem = tokio::fs::read(&cfg.key_pem) - .await - .map_err(|source| HttpClientBuildError::ClientCertRead { + } + })?; + let key_pem = tokio::fs::read(&cfg.key_pem).await.map_err(|source| { + HttpClientBuildError::ClientCertRead { path: cfg.key_pem.clone(), source, - })?; + } + })?; Some((cert_pem, key_pem)) } None => None, @@ -360,12 +352,14 @@ fn build_client_sync( config: &HttpClientConfig, ) -> Result { let ca_pem = match &config.ca_bundle { - Some(path) => Some(std::fs::read(path).map_err(|source| { - HttpClientBuildError::CaBundleRead { - path: path.clone(), - source, - } - })?), + Some(path) => { + Some( + std::fs::read(path).map_err(|source| HttpClientBuildError::CaBundleRead { + path: path.clone(), + source, + })?, + ) + } None => None, }; let client_pems = match &config.client_cert { @@ -464,7 +458,6 @@ mod tests { use std::time::SystemTime; use tokio::io::{AsyncReadExt, AsyncWriteExt}; - fn minimal_config() -> HttpClientConfig { HttpClientConfig { pool_max_idle_per_host: Some(8), @@ -498,7 +491,9 @@ mod tests { client_cert: None, ..minimal_config() }; - http.reload(new_config.clone()).await.expect("reload succeeds"); + http.reload(new_config.clone()) + .await + .expect("reload succeeds"); let after = http.client(); assert!( !Arc::ptr_eq(&before, &after), @@ -526,7 +521,10 @@ mod tests { assert_eq!(config.max_total_retry_duration, Duration::from_secs(10)); assert_eq!(config.retry_after_ceiling, Duration::from_secs(300)); assert_eq!(config.retry_policy.max_n_retries, Some(3)); - assert_eq!(config.retry_policy.max_retry_interval, Duration::from_secs(2)); + assert_eq!( + config.retry_policy.max_retry_interval, + Duration::from_secs(2) + ); assert!(config.ca_bundle.is_none()); assert!(config.client_cert.is_none()); } @@ -786,8 +784,7 @@ mod tests { let request = String::from_utf8_lossy(&buf[..n]); if request.contains("GET /final") { hits.fetch_add(1, Ordering::SeqCst); - let response = - "HTTP/1.1 200 OK\r\ncontent-length: 2\r\n\r\nok"; + let response = "HTTP/1.1 200 OK\r\ncontent-length: 2\r\n\r\nok"; let _ = sock.write_all(response.as_bytes()).await; } else { let response = format!( diff --git a/src/client/retry_after.rs b/src/client/retry_after.rs index 9c1fa86..78325ef 100644 --- a/src/client/retry_after.rs +++ b/src/client/retry_after.rs @@ -291,7 +291,9 @@ mod tests { let target = url("https://api.example.com/v1/chat"); let response = synthetic_response(StatusCode::TOO_MANY_REQUESTS, Some("3600")); mw.record_if_throttled(target.clone(), &response); - let deadline = mw.deadline_for_test(&target).expect("clamped deadline kept"); + let deadline = mw + .deadline_for_test(&target) + .expect("clamped deadline kept"); let upper = SystemTime::now() + Duration::from_secs(5); assert!(deadline <= upper, "custom ceiling must be honored"); assert!(deadline > SystemTime::now()); @@ -420,8 +422,9 @@ mod tests { let elapsed = SystemTime::now().duration_since(started).unwrap(); let max_jitter = max_sleep_jitter(remaining); assert!( - elapsed <= remaining.checked_sub(max_jitter).unwrap_or(remaining) - + Duration::from_millis(50), + elapsed + <= remaining.checked_sub(max_jitter).unwrap_or(remaining) + + Duration::from_millis(50), "wake must happen roughly a jitter-slice before the deadline, took {elapsed:?}" ); assert!(max_jitter > Duration::ZERO, "jitter must be non-zero"); @@ -438,4 +441,4 @@ mod tests { "jitter is capped at 2 s even for long waits" ); } -} \ No newline at end of file +}