fix clippy warnings and formatting

Author: alexylon

src/api/client.rs

@@ -1,5 +1,5 @@
-use crate::error::{Result, SofosError};
 use super::types::*;
+use crate::error::{Result, SofosError};
 use futures::stream::{Stream, StreamExt};
 use reqwest::header::{HeaderMap, HeaderValue, CONTENT_TYPE};
 use std::pin::Pin;
@@ -21,10 +21,7 @@ impl AnthropicClient {
             HeaderValue::from_str(&api_key)
                 .map_err(|e| SofosError::Config(format!("Invalid API key format: {}", e)))?,
         );
-        headers.insert(
-            "anthropic-version",
-            HeaderValue::from_static(API_VERSION),
-        );
+        headers.insert("anthropic-version", HeaderValue::from_static(API_VERSION));
         headers.insert(CONTENT_TYPE, HeaderValue::from_static("application/json"));
 
         let client = reqwest::Client::builder()
@@ -42,12 +39,7 @@ impl AnthropicClient {
     ) -> Result<CreateMessageResponse> {
         let url = format!("{}/messages", API_BASE);
 
-        let response = self
-            .client
-            .post(&url)
-            .json(&request)
-            .send()
-            .await?;
+        let response = self.client.post(&url).json(&request).send().await?;
 
         if !response.status().is_success() {
             let status = response.status();
@@ -69,12 +61,7 @@ impl AnthropicClient {
         request.stream = Some(true);
         let url = format!("{}/messages", API_BASE);
 
-        let response = self
-            .client
-            .post(&url)
-            .json(&request)
-            .send()
-            .await?;
+        let response = self.client.post(&url).json(&request).send().await?;
 
         if !response.status().is_success() {
             let status = response.status();
@@ -88,12 +75,10 @@ impl AnthropicClient {
         let stream = response
             .bytes_stream()
             .map(|result| {
-                result
-                    .map_err(SofosError::from)
-                    .and_then(|bytes| {
-                        let text = String::from_utf8_lossy(&bytes);
-                        _parse_sse_events(&text)
-                    })
+                result.map_err(SofosError::from).and_then(|bytes| {
+                    let text = String::from_utf8_lossy(&bytes);
+                    _parse_sse_events(&text)
+                })
             })
             .flat_map(|result| {
                 futures::stream::iter(match result {
@@ -110,8 +95,7 @@ fn _parse_sse_events(text: &str) -> Result<Vec<_StreamEvent>> {
     let mut events = Vec::new();
 
     for line in text.lines() {
-        if line.starts_with("data: ") {
-            let json_str = &line[6..]; // Skip "data: "
+        if let Some(json_str) = line.strip_prefix("data: ") {
             if json_str.trim() == "[DONE]" {
                 break;
             }

src/api/morph.rs

@@ -84,12 +84,7 @@ impl MorphClient {
 
         let url = format!("{}/chat/completions", MORPH_BASE_URL);
 
-        let response = self
-            .client
-            .post(&url)
-            .json(&request)
-            .send()
-            .await?;
+        let response = self.client.post(&url).json(&request).send().await?;
 
         if !response.status().is_success() {
             let status = response.status();
@@ -102,11 +97,11 @@ impl MorphClient {
 
         let result: MorphResponse = response.json().await?;
 
-        Ok(result
+        result
             .choices
             .first()
             .map(|c| c.message.content.clone())
-            .ok_or_else(|| SofosError::Api("No response from Morph API".to_string()))?)
+            .ok_or_else(|| SofosError::Api("No response from Morph API".to_string()))
     }
 }
 

src/api/types.rs

@@ -36,9 +36,7 @@ impl Message {
     pub fn user_with_tool_results(results: Vec<MessageContentBlock>) -> Self {
         Self {
             role: "user".to_string(),
-            content: MessageContent::Blocks {
-                content: results,
-            },
+            content: MessageContent::Blocks { content: results },
         }
     }
 }
@@ -114,9 +112,7 @@ pub enum MessageContentBlock {
 impl MessageContentBlock {
     pub fn from_content_block(block: &ContentBlock) -> Self {
         match block {
-            ContentBlock::Text { text } => MessageContentBlock::Text {
-                text: text.clone(),
-            },
+            ContentBlock::Text { text } => MessageContentBlock::Text { text: text.clone() },
             ContentBlock::ToolUse { id, name, input } => MessageContentBlock::ToolUse {
                 id: id.clone(),
                 name: name.clone(),
@@ -154,10 +150,7 @@ pub enum _StreamEventType {
         content_block: ContentBlock,
     },
     #[serde(rename = "content_block_delta")]
-    ContentBlockDelta {
-        index: usize,
-        delta: _ContentDelta,
-    },
+    ContentBlockDelta { index: usize, delta: _ContentDelta },
     #[serde(rename = "content_block_stop")]
     ContentBlockStop { index: usize },
     #[serde(rename = "message_delta")]

src/conversation.rs

@@ -126,13 +126,13 @@ mod tests {
     #[test]
     fn test_message_limit_trimming() {
         let mut history = ConversationHistory::new();
-        
+
         for i in 0..60 {
             history.add_user_message(format!("Message {}", i));
         }
-        
+
         assert_eq!(history.messages().len(), 50);
-        
+
         if let crate::api::MessageContent::Text { content } = &history.messages()[0].content {
             assert_eq!(content, "Message 10");
         }
@@ -141,25 +141,25 @@ mod tests {
     #[test]
     fn test_message_limit_with_blocks() {
         let mut history = ConversationHistory::new();
-        
+
         for i in 0..30 {
             history.add_user_message(format!("User {}", i));
-            history.add_assistant_with_blocks(vec![
-                MessageContentBlock::Text { text: format!("Assistant {}", i) }
-            ]);
+            history.add_assistant_with_blocks(vec![MessageContentBlock::Text {
+                text: format!("Assistant {}", i),
+            }]);
         }
-        
+
         assert_eq!(history.messages().len(), 50);
     }
 
     #[test]
     fn test_no_trimming_below_limit() {
         let mut history = ConversationHistory::new();
-        
+
         for i in 0..20 {
             history.add_user_message(format!("Message {}", i));
         }
-        
+
         assert_eq!(history.messages().len(), 20);
     }
 }

src/main.rs

@@ -36,8 +36,9 @@ fn main() -> Result<()> {
         }
     };
 
-    let workspace = env::current_dir()
-        .map_err(|e| error::SofosError::Config(format!("Failed to get current directory: {}", e)))?;
+    let workspace = env::current_dir().map_err(|e| {
+        error::SofosError::Config(format!("Failed to get current directory: {}", e))
+    })?;
 
     println!(
         "{} {}",
@@ -52,7 +53,11 @@ fn main() -> Result<()> {
                 Some(client)
             }
             Err(e) => {
-                eprintln!("{} Failed to initialize Morph client: {}", "Warning:".bright_yellow(), e);
+                eprintln!(
+                    "{} Failed to initialize Morph client: {}",
+                    "Warning:".bright_yellow(),
+                    e
+                );
                 None
             }
         }