diff --git a/crates/ember-client/src/commands.rs b/crates/ember-client/src/commands.rs index c01a30f5..99a7817b 100644 --- a/crates/ember-client/src/commands.rs +++ b/crates/ember-client/src/commands.rs @@ -365,12 +365,12 @@ fn scan_page(frame: Frame) -> Result { let mut iter = elems.into_iter(); // Safety: length was validated to be exactly 2 above. - let cursor_frame = iter.next().ok_or_else(|| { - ClientError::Protocol("SCAN response missing cursor element".into()) - })?; - let keys_frame = iter.next().ok_or_else(|| { - ClientError::Protocol("SCAN response missing keys element".into()) - })?; + let cursor_frame = iter + .next() + .ok_or_else(|| ClientError::Protocol("SCAN response missing cursor element".into()))?; + let keys_frame = iter + .next() + .ok_or_else(|| ClientError::Protocol("SCAN response missing keys element".into()))?; let cursor = match cursor_frame { Frame::Bulk(b) => { diff --git a/crates/ember-server/src/connection/execute.rs b/crates/ember-server/src/connection/execute.rs index 78e694e3..a5a7f6e6 100644 --- a/crates/ember-server/src/connection/execute.rs +++ b/crates/ember-server/src/connection/execute.rs @@ -29,7 +29,9 @@ fn set_expire_to_duration(expire: SetExpire) -> Duration { let now = SystemTime::now() .duration_since(UNIX_EPOCH) .unwrap_or_else(|_| { - tracing::warn!("system clock is before UNIX epoch; EXAT TTL calculations may be incorrect"); + tracing::warn!( + "system clock is before UNIX epoch; EXAT TTL calculations may be incorrect" + ); Duration::ZERO }) .as_secs(); @@ -39,7 +41,9 @@ fn set_expire_to_duration(expire: SetExpire) -> Duration { let now_ms = SystemTime::now() .duration_since(UNIX_EPOCH) .unwrap_or_else(|_| { - tracing::warn!("system clock is before UNIX epoch; PXAT TTL calculations may be incorrect"); + tracing::warn!( + "system clock is before UNIX epoch; PXAT TTL calculations may be incorrect" + ); Duration::ZERO }) .as_millis() as u64; diff --git a/crates/ember-server/src/connection_common.rs b/crates/ember-server/src/connection_common.rs index c8ce235c..ef7094b2 100644 --- a/crates/ember-server/src/connection_common.rs +++ b/crates/ember-server/src/connection_common.rs @@ -472,14 +472,26 @@ mod tests { nx: false, xx: false, }; - assert!(validate_command_sizes(&cmd, DEFAULT_MAX_KEY_LEN, DEFAULT_MAX_VALUE_LEN, DEFAULT_MAX_COMMAND_MEMORY).is_none()); + assert!(validate_command_sizes( + &cmd, + DEFAULT_MAX_KEY_LEN, + DEFAULT_MAX_VALUE_LEN, + DEFAULT_MAX_COMMAND_MEMORY + ) + .is_none()); } #[test] fn oversized_key_rejected() { let big_key = "x".repeat(DEFAULT_MAX_KEY_LEN + 1); let cmd = Command::Get { key: big_key }; - let err = validate_command_sizes(&cmd, DEFAULT_MAX_KEY_LEN, DEFAULT_MAX_VALUE_LEN, DEFAULT_MAX_COMMAND_MEMORY).unwrap(); + let err = validate_command_sizes( + &cmd, + DEFAULT_MAX_KEY_LEN, + DEFAULT_MAX_VALUE_LEN, + DEFAULT_MAX_COMMAND_MEMORY, + ) + .unwrap(); assert!(matches!(err, Frame::Error(ref msg) if msg.contains("key length"))); } @@ -487,7 +499,13 @@ mod tests { fn key_at_limit_passes() { let key = "k".repeat(DEFAULT_MAX_KEY_LEN); let cmd = Command::Get { key }; - assert!(validate_command_sizes(&cmd, DEFAULT_MAX_KEY_LEN, DEFAULT_MAX_VALUE_LEN, DEFAULT_MAX_COMMAND_MEMORY).is_none()); + assert!(validate_command_sizes( + &cmd, + DEFAULT_MAX_KEY_LEN, + DEFAULT_MAX_VALUE_LEN, + DEFAULT_MAX_COMMAND_MEMORY + ) + .is_none()); } #[test] @@ -500,7 +518,13 @@ mod tests { nx: false, xx: false, }; - let err = validate_command_sizes(&cmd, DEFAULT_MAX_KEY_LEN, DEFAULT_MAX_VALUE_LEN, DEFAULT_MAX_COMMAND_MEMORY).unwrap(); + let err = validate_command_sizes( + &cmd, + DEFAULT_MAX_KEY_LEN, + DEFAULT_MAX_VALUE_LEN, + DEFAULT_MAX_COMMAND_MEMORY, + ) + .unwrap(); assert!(matches!(err, Frame::Error(ref msg) if msg.contains("value length"))); } @@ -510,7 +534,13 @@ mod tests { let cmd = Command::MSet { pairs: vec![(big_key, Bytes::from_static(b"v"))], }; - let err = validate_command_sizes(&cmd, DEFAULT_MAX_KEY_LEN, DEFAULT_MAX_VALUE_LEN, DEFAULT_MAX_COMMAND_MEMORY).unwrap(); + let err = validate_command_sizes( + &cmd, + DEFAULT_MAX_KEY_LEN, + DEFAULT_MAX_VALUE_LEN, + DEFAULT_MAX_COMMAND_MEMORY, + ) + .unwrap(); assert!(matches!(err, Frame::Error(ref msg) if msg.contains("key length"))); } @@ -521,7 +551,13 @@ mod tests { key: "mylist".into(), values: vec![Bytes::from_static(b"ok"), big_val], }; - let err = validate_command_sizes(&cmd, DEFAULT_MAX_KEY_LEN, DEFAULT_MAX_VALUE_LEN, DEFAULT_MAX_COMMAND_MEMORY).unwrap(); + let err = validate_command_sizes( + &cmd, + DEFAULT_MAX_KEY_LEN, + DEFAULT_MAX_VALUE_LEN, + DEFAULT_MAX_COMMAND_MEMORY, + ) + .unwrap(); assert!(matches!(err, Frame::Error(ref msg) if msg.contains("value length"))); } @@ -531,7 +567,13 @@ mod tests { let cmd = Command::Del { keys: vec!["ok".into(), big_key], }; - let err = validate_command_sizes(&cmd, DEFAULT_MAX_KEY_LEN, DEFAULT_MAX_VALUE_LEN, DEFAULT_MAX_COMMAND_MEMORY).unwrap(); + let err = validate_command_sizes( + &cmd, + DEFAULT_MAX_KEY_LEN, + DEFAULT_MAX_VALUE_LEN, + DEFAULT_MAX_COMMAND_MEMORY, + ) + .unwrap(); assert!(matches!(err, Frame::Error(ref msg) if msg.contains("key length"))); } diff --git a/crates/ember-server/src/server.rs b/crates/ember-server/src/server.rs index d42f47b7..8c6a4b5c 100644 --- a/crates/ember-server/src/server.rs +++ b/crates/ember-server/src/server.rs @@ -811,7 +811,9 @@ pub async fn run_threaded( // give in-flight connection handlers time to finish rt.shutdown_timeout(Duration::from_secs(30)); }) - .map_err(|e| std::io::Error::other(format!("failed to spawn worker thread {id}: {e}"))) + .map_err(|e| { + std::io::Error::other(format!("failed to spawn worker thread {id}: {e}")) + }) }) .collect::, std::io::Error>>()?;