Skip to content

style: cargo fmt #328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kacy merged 1 commit into from
Feb 27, 2026
Merged

style: cargo fmt #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions crates/ember-client/src/commands.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,12 +365,12 @@ fn scan_page(frame: Frame) -> Result<ScanPage, ClientError> {

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) => {
Expand Down
8 changes: 6 additions & 2 deletions crates/ember-server/src/connection/execute.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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;
Expand Down
56 changes: 49 additions & 7 deletions crates/ember-server/src/connection_common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,22 +472,40 @@ 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")));
}

#[test]
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]
Expand All @@ -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")));
}

Expand All @@ -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")));
}

Expand All @@ -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")));
}

Expand All @@ -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")));
}

Expand Down
4 changes: 3 additions & 1 deletion crates/ember-server/src/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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::<Result<Vec<_>, std::io::Error>>()?;

Expand Down
Loading