Skip to content

fix: rustfmt cleanup #311

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 26, 2026
+53 −29
Merged

fix: rustfmt cleanup #311

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
9 changes: 7 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 @@ -2799,9 +2799,14 @@ async fn render_info(engine: &Engine, ctx: &Arc<ServerContext>, section: Option<
}

if want("PERSISTENCE") {
let last_save = ctx.last_save_timestamp.load(std::sync::atomic::Ordering::Relaxed);
let last_save = ctx
.last_save_timestamp
.load(std::sync::atomic::Ordering::Relaxed);
out.push_str("# Persistence\r\n");
out.push_str(&format!("aof_enabled:{}\r\n", if ctx.aof_enabled { 1 } else { 0 }));
out.push_str(&format!(
"aof_enabled:{}\r\n",
if ctx.aof_enabled { 1 } else { 0 }
));
out.push_str("aof_last_bgrewrite_status:ok\r\n");
out.push_str(&format!("rdb_last_save_time:{last_save}\r\n"));
out.push_str("\r\n");
Expand Down
68 changes: 42 additions & 26 deletions crates/ember-server/src/grpc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,12 +207,14 @@ fn parse_score_bound(s: &str) -> Result<ScoreBound, Status> {
match s {
"-inf" | "-INF" => Ok(ScoreBound::NegInf),
"+inf" | "+INF" | "inf" | "INF" => Ok(ScoreBound::PosInf),
s if s.starts_with('(') => s[1..].parse::<f64>().map(ScoreBound::Exclusive).map_err(|_| {
Status::invalid_argument(format!("invalid score bound: {s}"))
}),
s => s.parse::<f64>().map(ScoreBound::Inclusive).map_err(|_| {
Status::invalid_argument(format!("invalid score bound: {s}"))
}),
s if s.starts_with('(') => s[1..]
.parse::<f64>()
.map(ScoreBound::Exclusive)
.map_err(|_| Status::invalid_argument(format!("invalid score bound: {s}"))),
s => s
.parse::<f64>()
.map(ScoreBound::Inclusive)
.map_err(|_| Status::invalid_argument(format!("invalid score bound: {s}"))),
}
}

Expand Down Expand Up @@ -2447,10 +2449,7 @@ impl EmberCache for EmberService {
}
}

async fn l_rem(
&self,
request: Request<LRemRequest>,
) -> Result<Response<IntResponse>, Status> {
async fn l_rem(&self, request: Request<LRemRequest>) -> Result<Response<IntResponse>, Status> {
let start = Instant::now();
let req = request.into_inner();
validate_key(&req.key, &self.ctx.limits)?;
Expand Down Expand Up @@ -2564,7 +2563,9 @@ impl EmberCache for EmberService {
self.record_command(start, "SUNION");

match resp {
ShardResponse::StringArray(members) => Ok(Response::new(KeysResponse { keys: members })),
ShardResponse::StringArray(members) => {
Ok(Response::new(KeysResponse { keys: members }))
}
other => Err(unexpected_response(&other)),
}
}
Expand All @@ -2587,7 +2588,9 @@ impl EmberCache for EmberService {
self.record_command(start, "SINTER");

match resp {
ShardResponse::StringArray(members) => Ok(Response::new(KeysResponse { keys: members })),
ShardResponse::StringArray(members) => {
Ok(Response::new(KeysResponse { keys: members }))
}
other => Err(unexpected_response(&other)),
}
}
Expand All @@ -2610,7 +2613,9 @@ impl EmberCache for EmberService {
self.record_command(start, "SDIFF");

match resp {
ShardResponse::StringArray(members) => Ok(Response::new(KeysResponse { keys: members })),
ShardResponse::StringArray(members) => {
Ok(Response::new(KeysResponse { keys: members }))
}
other => Err(unexpected_response(&other)),
}
}
Expand Down Expand Up @@ -2638,9 +2643,9 @@ impl EmberCache for EmberService {
self.record_command(start, "SUNIONSTORE");

match resp {
ShardResponse::SetStoreResult { count, .. } => {
Ok(Response::new(IntResponse { value: count as i64 }))
}
ShardResponse::SetStoreResult { count, .. } => Ok(Response::new(IntResponse {
value: count as i64,
})),
other => Err(unexpected_response(&other)),
}
}
Expand Down Expand Up @@ -2668,9 +2673,9 @@ impl EmberCache for EmberService {
self.record_command(start, "SINTERSTORE");

match resp {
ShardResponse::SetStoreResult { count, .. } => {
Ok(Response::new(IntResponse { value: count as i64 }))
}
ShardResponse::SetStoreResult { count, .. } => Ok(Response::new(IntResponse {
value: count as i64,
})),
other => Err(unexpected_response(&other)),
}
}
Expand Down Expand Up @@ -2698,9 +2703,9 @@ impl EmberCache for EmberService {
self.record_command(start, "SDIFFSTORE");

match resp {
ShardResponse::SetStoreResult { count, .. } => {
Ok(Response::new(IntResponse { value: count as i64 }))
}
ShardResponse::SetStoreResult { count, .. } => Ok(Response::new(IntResponse {
value: count as i64,
})),
other => Err(unexpected_response(&other)),
}
}
Expand Down Expand Up @@ -2761,7 +2766,6 @@ impl EmberCache for EmberService {
&self,
request: Request<SMisMemberRequest>,
) -> Result<Response<BoolArrayResponse>, Status> {

let start = Instant::now();
let req = request.into_inner();
validate_key(&req.key, &self.ctx.limits)?;
Expand Down Expand Up @@ -2795,7 +2799,11 @@ impl EmberCache for EmberService {
let start = Instant::now();
let req = request.into_inner();
validate_key(&req.key, &self.ctx.limits)?;
let count = if req.count == 0 { 10 } else { req.count as usize };
let count = if req.count == 0 {
10
} else {
req.count as usize
};
let resp = self
.route(
&req.key,
Expand Down Expand Up @@ -3159,7 +3167,11 @@ impl EmberCache for EmberService {
let start = Instant::now();
let req = request.into_inner();
validate_key(&req.key, &self.ctx.limits)?;
let count = if req.count == 0 { 10 } else { req.count as usize };
let count = if req.count == 0 {
10
} else {
req.count as usize
};
let resp = self
.route(
&req.key,
Expand Down Expand Up @@ -3207,7 +3219,11 @@ impl EmberCache for EmberService {
let start = Instant::now();
let req = request.into_inner();
validate_key(&req.key, &self.ctx.limits)?;
let count = if req.count == 0 { 10 } else { req.count as usize };
let count = if req.count == 0 {
10
} else {
req.count as usize
};
let resp = self
.route(
&req.key,
Expand Down
5 changes: 4 additions & 1 deletion crates/ember-server/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,10 @@ fn healthcheck(host: &str, port: u16) -> i32 {
Ok(s) => s,
Err(_) => return 1,
};
if stream.set_read_timeout(Some(Duration::from_secs(2))).is_err() {
if stream
.set_read_timeout(Some(Duration::from_secs(2)))
.is_err()
{
return 1;
}
if stream.write_all(b"*1\r\n$4\r\nPING\r\n").is_err() {
Expand Down