From 101a9cdd6e545e02a98859c233133799a2eec063 Mon Sep 17 00:00:00 2001 From: Alex Clarke Date: Fri, 20 Feb 2026 15:28:21 -0700 Subject: [PATCH] style: Applied formatting to MCP module --- src/function/mod.rs | 20 ++++++++++++-------- src/mcp/mod.rs | 33 +++++++++++++++++++-------------- 2 files changed, 31 insertions(+), 22 deletions(-) diff --git a/src/function/mod.rs b/src/function/mod.rs index 927a8a9..4384982 100644 --- a/src/function/mod.rs +++ b/src/function/mod.rs @@ -1121,12 +1121,12 @@ pub fn run_llm_function( envs.insert("FORCE_COLOR".into(), "1".into()); let mut child = Command::new(&cmd_name) - .args(&cmd_args) - .envs(envs) - .stdout(Stdio::piped()) - .stderr(Stdio::piped()) - .spawn() - .map_err(|err| anyhow!("Unable to run {command_name}, {err}"))?; + .args(&cmd_args) + .envs(envs) + .stdout(Stdio::piped()) + .stderr(Stdio::piped()) + .spawn() + .map_err(|err| anyhow!("Unable to run {command_name}, {err}"))?; let stdout = child.stdout.take().expect("Failed to capture stdout"); let mut stderr = child.stderr.take().expect("Failed to capture stderr"); @@ -1136,7 +1136,9 @@ pub fn run_llm_function( let mut reader = stdout; let mut out = io::stdout(); while let Ok(n) = reader.read(&mut buffer) { - if n == 0 { break; } + if n == 0 { + break; + } let chunk = &buffer[0..n]; let mut last_pos = 0; for (i, &byte) in chunk.iter().enumerate() { @@ -1159,7 +1161,9 @@ pub fn run_llm_function( buf }); - let status = child.wait().map_err(|err| anyhow!("Unable to run {command_name}, {err}"))?; + let status = child + .wait() + .map_err(|err| anyhow!("Unable to run {command_name}, {err}"))?; let _ = stdout_thread.join(); let stderr_bytes = stderr_thread.join().unwrap_or_default(); diff --git a/src/mcp/mod.rs b/src/mcp/mod.rs index 5213bcd..993fd54 100644 --- a/src/mcp/mod.rs +++ b/src/mcp/mod.rs @@ -197,7 +197,8 @@ impl McpRegistry { } let desired_ids = self.resolve_server_ids(enabled_mcp_servers); - let ids_to_start: Vec = desired_ids.into_iter() + let ids_to_start: Vec = desired_ids + .into_iter() .filter(|id| !self.servers.contains_key(id)) .collect(); @@ -301,18 +302,20 @@ impl McpRegistry { fn resolve_server_ids(&self, enabled_mcp_servers: Option) -> Vec { if let Some(config) = &self.config - && let Some(servers) = enabled_mcp_servers { - if servers == "all" { - config.mcp_servers.keys().cloned().collect() - } else { - let enabled_servers: HashSet = - servers.split(',').map(|s| s.trim().to_string()).collect(); - config.mcp_servers - .keys() - .filter(|id| enabled_servers.contains(*id)) - .cloned() - .collect() - } + && let Some(servers) = enabled_mcp_servers + { + if servers == "all" { + config.mcp_servers.keys().cloned().collect() + } else { + let enabled_servers: HashSet = + servers.split(',').map(|s| s.trim().to_string()).collect(); + config + .mcp_servers + .keys() + .filter(|id| enabled_servers.contains(*id)) + .cloned() + .collect() + } } else { vec![] } @@ -330,7 +333,9 @@ impl McpRegistry { if let Some(server) = self.servers.remove(&id) { match Arc::try_unwrap(server) { Ok(server_inner) => { - server_inner.cancel().await + server_inner + .cancel() + .await .with_context(|| format!("Failed to stop MCP server: {id}"))?; info!("Stopped MCP server: {id}"); }