Skip to content

Commit aa83c65

Browse files
author
Arjun Balaji
committed
fix all clippy errors
1 parent de32fbb commit aa83c65

File tree

2 files changed

+8
-11
lines changed

2 files changed

+8
-11
lines changed

crates/chat-cli/src/cli/chat/mod.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,7 @@ impl ChatSession {
636636

637637
let backend_state = self
638638
.conversation
639-
.backend_conversation_state(&os, false, &mut self.stdout)
639+
.backend_conversation_state(os, false, &mut self.stdout)
640640
.await;
641641
let data = backend_state?.calculate_conversation_size();
642642
let mut tokens_guard = tokens_used.lock().await;
@@ -646,7 +646,7 @@ impl ChatSession {
646646
let mut status_guard = status.lock().await;
647647
let default_state = ChatState::default();
648648
let current_chat_state = self.inner.as_ref().unwrap_or(&default_state);
649-
*status_guard = self.get_current_status(current_chat_state).to_string();
649+
*status_guard = self.get_current_status(current_chat_state);
650650
std::mem::drop(tokens_guard);
651651
std::mem::drop(status_guard);
652652
std::mem::drop(percent_guard);
@@ -1116,7 +1116,6 @@ impl ChatSession {
11161116
match stream.read(&mut buffer).await {
11171117
Ok(0) => {
11181118
eprintln!("Client disconnected");
1119-
continue;
11201119
},
11211120
Ok(n) => {
11221121
let command = std::str::from_utf8(&buffer[..n]).unwrap_or("").trim();

crates/chat-cli/src/cli/chat/tools/launch_agent.rs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ impl SubAgent {
219219
agent.agent_display_name,
220220
style::ResetColor,
221221
style::SetForegroundColor(Color::DarkGrey),
222-
format!("({})", agent.agent_cli_name.clone().unwrap_or_else(|| "Default".to_string())),
222+
format_args!("({})", agent.agent_cli_name.clone().unwrap_or_else(|| "Default".to_string())),
223223
style::ResetColor,
224224
style::SetForegroundColor(Color::Cyan),
225225
status,
@@ -297,7 +297,7 @@ async fn get_agent_status(child_pid: u32) -> Result<String, eyre::Error> {
297297
return Ok("No response".to_string());
298298
}
299299
let response_str = std::str::from_utf8(&buffer[..n]).unwrap_or("<invalid utf8>");
300-
match serde_json::from_str::<serde_json::Value>(&response_str) {
300+
match serde_json::from_str::<serde_json::Value>(response_str) {
301301
Ok(json) => {
302302
let status = json.get("status").and_then(|v| v.as_str()).unwrap_or("Running");
303303
let tokens = json.get("tokens_used").and_then(|v| v.as_u64()).unwrap_or(0);
@@ -329,7 +329,6 @@ async fn spawn_agent_task(
329329

330330
let debug_log = std::fs::OpenOptions::new()
331331
.create(true)
332-
.write(true)
333332
.append(true)
334333
.open("debug.log")?;
335334
let debug_log_stderr = debug_log.try_clone()?;
@@ -342,7 +341,7 @@ async fn spawn_agent_task(
342341

343342
let child_pid = child
344343
.id()
345-
.ok_or_else(|| std::io::Error::new(std::io::ErrorKind::Other, "Failed to get child PID"))?;
344+
.ok_or_else(|| std::io::Error::other("Failed to get child PID"))?;
346345

347346
// Only wrapping this in async tokio task causing each process on main thread
348347
// Allows extraction of child_pid before waiting on completion for status update
@@ -368,10 +367,9 @@ async fn get_grandchild_pid(parent_pid: u32) -> std::result::Result<u32, std::io
368367
if output.status.success() {
369368
let stdout = String::from_utf8_lossy(&output.stdout);
370369
if let Some(first_line) = stdout.lines().next() {
371-
return first_line
372-
.trim()
373-
.parse::<u32>()
374-
.map_err(|_| std::io::Error::new(std::io::ErrorKind::InvalidData, "Failed to parse PID"));
370+
return first_line.trim().parse::<u32>().map_err(|err| {
371+
std::io::Error::new(std::io::ErrorKind::InvalidData, format!("Failed to parse PID: {}", err))
372+
});
375373
}
376374
}
377375
Err(std::io::Error::new(

0 commit comments

Comments
 (0)