chore: bump rust edition, version, cargo resolver, and update lockfile (#300)

* update lockfile

* fix compilation errors after bumping rust edition to 2024

* fix lints

* run fmt

* deny fixes

Author: chaynabors

Cargo.lock

@@ -1,5 +1,5 @@
 [workspace]
-resolver = "2"
+resolver = "3"
 members = [
     "crates/*",
     "crates/fig_desktop/fuzz",
@@ -16,7 +16,7 @@ authors = [
     "Chay Nabors ([email protected])",
     "Brandon Kiser ([email protected])",
 ]
-edition = "2021"
+edition = "2024"
 homepage = "https://aws.amazon.com/q/"
 publish = false
 version = "1.12.1"
@@ -128,7 +128,7 @@ reqwest = { version = "0.12.14", default-features = false, features = [
 ring = "0.17.14"
 rusqlite = { version = "0.32.1", features = ["bundled", "serde_json"] }
 shellexpand = "3.0.0"
-shell-color = { path = "crates/shell-color" }
+shell-color = "1.0.0"
 semver = { version = "1.0.26", features = ["serde"] }
 serde = { version = "1.0.219", features = ["derive", "rc"] }
 serde_json = "1.0.140"

Cargo.toml

@@ -432,7 +432,7 @@ impl ApiClient {
                 match event {
                     serde_json::Value::String(assistant_text) => {
                         stream.push(ChatResponseStream::AssistantResponseEvent {
-                            content: assistant_text.to_string(),
+                            content: assistant_text.clone(),
                         });
                     },
                     serde_json::Value::Object(tool_use) => {

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

@@ -584,7 +584,7 @@ impl ContextManager {
 
         for (hook_list, is_global) in configs {
             hooks.extend(hook_list.iter_mut().map(|(name, h)| {
-                h.name = name.to_string();
+                h.name = name.clone();
                 h.is_global = is_global;
                 &*h
             }));

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

@@ -332,7 +332,7 @@ impl ConversationState {
 
         // If the last message from the assistant contains tool uses AND next_message is set, we need to
         // ensure that next_message contains tool results.
-        if let (Some((_, AssistantMessage::ToolUse { ref mut tool_uses, .. })), Some(user_msg)) = (
+        if let (Some((_, AssistantMessage::ToolUse { tool_uses, .. })), Some(user_msg)) = (
             self.history
                 .range_mut(self.valid_history_range.0..self.valid_history_range.1)
                 .last(),
@@ -377,7 +377,7 @@ impl ConversationState {
             .collect();
 
         for (_, assistant) in &mut self.history {
-            if let AssistantMessage::ToolUse { ref mut tool_uses, .. } = assistant {
+            if let AssistantMessage::ToolUse { tool_uses, .. } = assistant {
                 for tool_use in tool_uses {
                     if tool_names.contains(tool_use.name.as_str()) {
                         continue;

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

@@ -16,6 +16,7 @@ mod inner {
 
     use super::super::prompt::ChatHelper;
 
+    #[allow(clippy::large_enum_variant)]
     #[derive(Debug)]
     pub enum Inner {
         Readline(Editor<ChatHelper, FileHistory>),

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

@@ -365,11 +365,11 @@ enum ToolUseStatus {
 #[derive(Debug, Error)]
 pub enum ChatError {
     #[error("{0}")]
-    Client(#[from] crate::api_client::ApiClientError),
+    Client(Box<crate::api_client::ApiClientError>),
     #[error("{0}")]
     Auth(#[from] AuthError),
     #[error("{0}")]
-    ResponseStream(#[from] parser::RecvError),
+    ResponseStream(Box<parser::RecvError>),
     #[error("{0}")]
     Std(#[from] std::io::Error),
     #[error("{0}")]
@@ -412,6 +412,18 @@ impl ReasonCode for ChatError {
     }
 }
 
+impl From<ApiClientError> for ChatError {
+    fn from(value: ApiClientError) -> Self {
+        Self::Client(Box::new(value))
+    }
+}
+
+impl From<parser::RecvError> for ChatError {
+    fn from(value: parser::RecvError) -> Self {
+        Self::ResponseStream(Box::new(value))
+    }
+}
+
 pub struct ChatSession {
     /// For output read by humans and machine
     pub stdout: std::io::Stdout,
@@ -631,7 +643,7 @@ impl ChatSession {
 
                 ("Tool use was interrupted", Report::from(err))
             },
-            ChatError::Client(err) => match err {
+            ChatError::Client(err) => match *err {
                 // Errors from attempting to send too large of a conversation history. In
                 // this case, attempt to automatically compact the history for the user.
                 ApiClientError::ContextWindowOverflow { .. } => {
@@ -789,6 +801,7 @@ impl Drop for ChatSession {
 ///
 /// Intended to provide more robust handling around state transitions while dealing with, e.g.,
 /// tool validation, execution, response stream handling, etc.
+#[allow(clippy::large_enum_variant)]
 #[derive(Debug)]
 enum ChatState {
     /// Prompt the user with `tool_uses`, if available.

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

@@ -146,10 +146,10 @@ impl PromptCompleter {
         let receiver = &self.receiver;
         sender
             .send(if !word.is_empty() { Some(word.to_string()) } else { None })
-            .map_err(|e| ReadlineError::Io(std::io::Error::new(std::io::ErrorKind::Other, e.to_string())))?;
+            .map_err(|e| ReadlineError::Io(std::io::Error::other(e.to_string())))?;
         let prompt_info = receiver
             .recv()
-            .map_err(|e| ReadlineError::Io(std::io::Error::new(std::io::ErrorKind::Other, e.to_string())))?
+            .map_err(|e| ReadlineError::Io(std::io::Error::other(e.to_string())))?
             .iter()
             .map(|n| format!("@{n}"))
             .collect::<Vec<_>>();

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

@@ -605,7 +605,7 @@ impl ToolManagerBuilder {
         // TODO: accommodate hot reload of mcp servers
         if let (Some(sender), Some(receiver)) = (sender, receiver) {
             let clients = clients.iter().fold(HashMap::new(), |mut acc, (n, c)| {
-                acc.insert(n.to_string(), Arc::downgrade(c));
+                acc.insert(n.clone(), Arc::downgrade(c));
                 acc
             });
             let prompts_clone = prompts.clone();
@@ -635,7 +635,7 @@ impl ToolManagerBuilder {
                                     return acc;
                                 };
                                 for (prompt_name, prompt_get) in prompt_gets.iter() {
-                                    acc.entry(prompt_name.to_string())
+                                    acc.entry(prompt_name.clone())
                                         .and_modify(|bundles| {
                                             bundles.push(PromptBundle {
                                                 server_name: server_name.to_owned(),
@@ -1156,7 +1156,7 @@ impl ToolManager {
                             .map_err(|e| GetPromptError::Synchronization(e.to_string()))?;
                         for (prompt_name, prompt_get) in prompt_gets.iter() {
                             prompts_wl
-                                .entry(prompt_name.to_string())
+                                .entry(prompt_name.clone())
                                 .and_modify(|bundles| {
                                     let mut is_modified = false;
                                     for bundle in &mut *bundles {
@@ -1224,7 +1224,6 @@ impl ToolManager {
                     has_retried = true;
                     self.refresh_prompts(&mut prompts_wl)?;
                     maybe_bundles = prompts_wl.get(&prompt_name);
-                    continue 'blk;
                 },
                 (_, _, true) => {
                     break 'blk Err(GetPromptError::PromptNotFound(prompt_name));
@@ -1243,7 +1242,7 @@ impl ToolManager {
                     return acc;
                 };
                 for (prompt_name, prompt_get) in prompt_gets.iter() {
-                    acc.entry(prompt_name.to_string())
+                    acc.entry(prompt_name.clone())
                         .and_modify(|bundles| {
                             bundles.push(PromptBundle {
                                 server_name: server_name.to_owned(),

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

@@ -77,7 +77,7 @@ pub fn handle_images_from_paths(output: &mut impl Write, paths: &[String]) -> Ri
 
                 extracted_images.push((image_block, ImageMetadata {
                     filename,
-                    filepath: path.to_string(),
+                    filepath: path.clone(),
                     size: image_size,
                 }));
             }
@@ -147,7 +147,7 @@ pub fn handle_images_from_paths(output: &mut impl Write, paths: &[String]) -> Ri
 /// * `false` otherwise
 pub fn is_supported_image_type(maybe_file_path: &str) -> bool {
     let supported_image_types = ["jpg", "jpeg", "png", "gif", "webp"];
-    if let Some(extension) = maybe_file_path.split('.').last() {
+    if let Some(extension) = maybe_file_path.split('.').next_back() {
         return supported_image_types.contains(&extension.trim().to_lowercase().as_str());
     }
     false