From ffdd7d018cadc03245e54998d62e3720533526fb Mon Sep 17 00:00:00 2001 From: Kacy Fortner Date: Thu, 26 Feb 2026 10:52:39 -0500 Subject: [PATCH] fix: rustfmt cleanup and integration test build ordering MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit run cargo fmt to fix formatting in execute.rs, grpc.rs, and main.rs. no behavior changes — formatting only. also note: integration tests use find_binary() to locate the ember-server subprocess, which bypasses cargo's dependency tracking. always run cargo build -p ember-server before cargo test when testing the integration suite standalone. --- crates/ember-server/src/connection/execute.rs | 9 ++- crates/ember-server/src/grpc.rs | 68 ++++++++++++------- crates/ember-server/src/main.rs | 5 +- 3 files changed, 53 insertions(+), 29 deletions(-) diff --git a/crates/ember-server/src/connection/execute.rs b/crates/ember-server/src/connection/execute.rs index f4d919c3..f7bb6893 100644 --- a/crates/ember-server/src/connection/execute.rs +++ b/crates/ember-server/src/connection/execute.rs @@ -2799,9 +2799,14 @@ async fn render_info(engine: &Engine, ctx: &Arc, 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"); diff --git a/crates/ember-server/src/grpc.rs b/crates/ember-server/src/grpc.rs index b012a212..99c7c40c 100644 --- a/crates/ember-server/src/grpc.rs +++ b/crates/ember-server/src/grpc.rs @@ -207,12 +207,14 @@ fn parse_score_bound(s: &str) -> Result { match s { "-inf" | "-INF" => Ok(ScoreBound::NegInf), "+inf" | "+INF" | "inf" | "INF" => Ok(ScoreBound::PosInf), - s if s.starts_with('(') => s[1..].parse::().map(ScoreBound::Exclusive).map_err(|_| { - Status::invalid_argument(format!("invalid score bound: {s}")) - }), - s => s.parse::().map(ScoreBound::Inclusive).map_err(|_| { - Status::invalid_argument(format!("invalid score bound: {s}")) - }), + s if s.starts_with('(') => s[1..] + .parse::() + .map(ScoreBound::Exclusive) + .map_err(|_| Status::invalid_argument(format!("invalid score bound: {s}"))), + s => s + .parse::() + .map(ScoreBound::Inclusive) + .map_err(|_| Status::invalid_argument(format!("invalid score bound: {s}"))), } } @@ -2447,10 +2449,7 @@ impl EmberCache for EmberService { } } - async fn l_rem( - &self, - request: Request, - ) -> Result, Status> { + async fn l_rem(&self, request: Request) -> Result, Status> { let start = Instant::now(); let req = request.into_inner(); validate_key(&req.key, &self.ctx.limits)?; @@ -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)), } } @@ -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)), } } @@ -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)), } } @@ -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)), } } @@ -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)), } } @@ -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)), } } @@ -2761,7 +2766,6 @@ impl EmberCache for EmberService { &self, request: Request, ) -> Result, Status> { - let start = Instant::now(); let req = request.into_inner(); validate_key(&req.key, &self.ctx.limits)?; @@ -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, @@ -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, @@ -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, diff --git a/crates/ember-server/src/main.rs b/crates/ember-server/src/main.rs index 197b32c1..13eae5d3 100644 --- a/crates/ember-server/src/main.rs +++ b/crates/ember-server/src/main.rs @@ -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() {