From 9af43fbeb3809838b6ae4418568563b6e2c9b43a Mon Sep 17 00:00:00 2001 From: pjh456 <147148383@qq.com> Date: Sun, 11 Oct 2026 16:49:07 +0000 Subject: [PATCH] =?UTF-8?q?style:=20=E8=87=AA=E5=8A=A8=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crates/oxide_cli/src/server/client.rs | 4 +++- crates/oxide_cli/src/server/spawn.rs | 10 ++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/crates/oxide_cli/src/server/client.rs b/crates/oxide_cli/src/server/client.rs index e7ab0dee..01da6d6a 100644 --- a/crates/oxide_cli/src/server/client.rs +++ b/crates/oxide_cli/src/server/client.rs @@ -96,7 +96,9 @@ pub fn send_control_request_from(sidecar_path: &Path, request: &ServerRequest) - /// /// # 副作用 /// - 建立并关闭一条连接(Unix socket 或 TCP)。 -pub fn send_control_request_at(endpoint: &Endpoint, token: &str, request: &ServerRequest) -> Result { +pub fn send_control_request_at( + endpoint: &Endpoint, token: &str, request: &ServerRequest, +) -> Result { // 连接:5 秒超时是安全网,本地连接立即完成或立即失败。 let stream = connect_with_timeout(endpoint, CONNECT_TIMEOUT)?; diff --git a/crates/oxide_cli/src/server/spawn.rs b/crates/oxide_cli/src/server/spawn.rs index 3933f85b..ff540134 100644 --- a/crates/oxide_cli/src/server/spawn.rs +++ b/crates/oxide_cli/src/server/spawn.rs @@ -83,10 +83,12 @@ pub fn wait_server_ready(deadline: Duration) -> Result<(), String> { /// - 每轮建立并关闭一条连接(Unix socket 或 TCP)。 pub fn wait_server_ready_remote(endpoint: &Endpoint, token: &str, deadline: Duration) -> Result<(), String> { wait_ready_until( - || matches!( - send_control_request_at(endpoint, token, &ServerRequest::Health), - Ok(ServerResponse::Health { healthy: true }) - ), + || { + matches!( + send_control_request_at(endpoint, token, &ServerRequest::Health), + Ok(ServerResponse::Health { healthy: true }) + ) + }, deadline, ) }