Migrate all crates to Rust 2024

Cargo.toml

@@ -1,5 +1,5 @@
 [workspace]
-resolver = "2"
+resolver = "3"
 members = [
     "rig-core",
     "rig-lancedb",
@@ -15,6 +15,9 @@ members = [
     "rig-bedrock", "rig-milvus",
 ]
 
+[workspace.package]
+edition = "2024"
+
 [workspace.dependencies]
 anyhow = "1.0.94"
 arrow-array = "55.1"

rig-bedrock/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "rig-bedrock"
 version = "0.2.0"
-edition = "2021"
+edition = { workspace = true }
 license = "MIT"
 readme = "README.md"
 description = "AWS Bedrock model provider for Rig integration."

rig-bedrock/examples/document_with_bedrock.rs

@@ -1,11 +1,11 @@
 use reqwest::Client;
 
 use rig::{
-    completion::{message::Document, Prompt},
+    completion::{Prompt, message::Document},
     message::{ContentFormat, DocumentMediaType},
 };
 
-use base64::{prelude::BASE64_STANDARD, Engine};
+use base64::{Engine, prelude::BASE64_STANDARD};
 use rig::client::CompletionClient;
 use rig_bedrock::{client::ClientBuilder, completion::AMAZON_NOVA_LITE};
 use tracing::info;

rig-bedrock/examples/embedding_with_bedrock.rs

@@ -1,5 +1,5 @@
-use rig::client::EmbeddingsClient;
 use rig::Embed;
+use rig::client::EmbeddingsClient;
 use rig_bedrock::{client::ClientBuilder, embedding::AMAZON_TITAN_EMBED_TEXT_V2_0};
 use tracing::info;
 

rig-bedrock/examples/image_with_bedrock.rs

@@ -1,11 +1,11 @@
 use reqwest::Client;
 
 use rig::{
-    completion::{message::Image, Prompt},
+    completion::{Prompt, message::Image},
     message::{ContentFormat, ImageMediaType},
 };
 
-use base64::{prelude::BASE64_STANDARD, Engine};
+use base64::{Engine, prelude::BASE64_STANDARD};
 use rig::client::CompletionClient;
 use rig_bedrock::{client::ClientBuilder, completion::AMAZON_NOVA_LITE};
 use tracing::info;

rig-bedrock/examples/rag_with_bedrock.rs

@@ -2,8 +2,8 @@ use std::vec;
 
 use rig::client::{CompletionClient, EmbeddingsClient};
 use rig::{
-    completion::Prompt, embeddings::EmbeddingsBuilder,
-    vector_store::in_memory_store::InMemoryVectorStore, Embed,
+    Embed, completion::Prompt, embeddings::EmbeddingsBuilder,
+    vector_store::in_memory_store::InMemoryVectorStore,
 };
 use rig_bedrock::{
     client::ClientBuilder, completion::AMAZON_NOVA_LITE, embedding::AMAZON_TITAN_EMBED_TEXT_V2_0,

rig-bedrock/examples/streaming_with_bedrock.rs

@@ -1,5 +1,5 @@
 use rig::client::CompletionClient;
-use rig::streaming::{stream_to_stdout, StreamingPrompt};
+use rig::streaming::{StreamingPrompt, stream_to_stdout};
 use rig_bedrock::{client::ClientBuilder, completion::AMAZON_NOVA_LITE};
 
 #[tokio::main]

rig-bedrock/examples/streaming_with_bedrock_and_tools.rs

@@ -1,5 +1,5 @@
 use rig::client::CompletionClient;
-use rig::streaming::{stream_to_stdout, StreamingPrompt};
+use rig::streaming::{StreamingPrompt, stream_to_stdout};
 use rig_bedrock::{client::ClientBuilder, completion::AMAZON_NOVA_LITE};
 mod common;
 

rig-bedrock/src/types/assistant_content.rs

@@ -2,9 +2,9 @@ use aws_sdk_bedrockruntime::operation::converse::ConverseOutput;
 use aws_sdk_bedrockruntime::types as aws_bedrock;
 
 use rig::{
+    OneOrMany,
     completion::CompletionError,
     message::{AssistantContent, Text, ToolCall, ToolFunction},
-    OneOrMany,
 };
 
 use crate::types::message::RigMessage;
@@ -116,7 +116,7 @@ mod tests {
 
     use super::AwsConverseOutput;
     use aws_sdk_bedrockruntime::types as aws_bedrock;
-    use rig::{completion, message::AssistantContent, OneOrMany};
+    use rig::{OneOrMany, completion, message::AssistantContent};
 
     #[test]
     fn aws_converse_output_to_completion_response() {

rig-bedrock/src/types/completion_request.rs

@@ -5,9 +5,9 @@ use aws_sdk_bedrockruntime::types::{
     InferenceConfiguration, SystemContentBlock, Tool, ToolConfiguration, ToolInputSchema,
     ToolSpecification,
 };
+use rig::OneOrMany;
 use rig::completion::{CompletionError, Message};
 use rig::message::{ContentFormat, DocumentMediaType, UserContent};
-use rig::OneOrMany;
 
 pub struct AwsCompletionRequest(pub rig::completion::CompletionRequest);
 

rig-bedrock/src/types/document.rs

@@ -5,7 +5,7 @@ use rig::{
 };
 
 pub(crate) use crate::types::media_types::RigDocumentMediaType;
-use base64::{prelude::BASE64_STANDARD, Engine};
+use base64::{Engine, prelude::BASE64_STANDARD};
 use uuid::Uuid;
 
 #[derive(Clone)]
@@ -76,7 +76,7 @@ impl TryFrom<aws_bedrock::DocumentBlock> for RigDocument {
 #[cfg(test)]
 mod tests {
     use aws_sdk_bedrockruntime::types as aws_bedrock;
-    use base64::{prelude::BASE64_STANDARD, Engine};
+    use base64::{Engine, prelude::BASE64_STANDARD};
     use rig::{
         completion::CompletionError,
         message::{ContentFormat, Document, DocumentMediaType},

rig-bedrock/src/types/image.rs

@@ -5,7 +5,7 @@ use rig::{
     message::{ContentFormat, Image, ImageMediaType, MimeType},
 };
 
-use base64::{prelude::BASE64_STANDARD, Engine};
+use base64::{Engine, prelude::BASE64_STANDARD};
 
 #[derive(Clone)]
 pub struct RigImage(pub Image);
@@ -80,7 +80,7 @@ impl TryFrom<aws_bedrock::ImageBlock> for RigImage {
 #[cfg(test)]
 mod tests {
     use aws_sdk_bedrockruntime::types as aws_bedrock;
-    use base64::{prelude::BASE64_STANDARD, Engine};
+    use base64::{Engine, prelude::BASE64_STANDARD};
     use rig::{
         completion::CompletionError,
         message::{ContentFormat, Image, ImageMediaType},

rig-bedrock/src/types/message.rs

@@ -1,9 +1,9 @@
 use aws_sdk_bedrockruntime::types as aws_bedrock;
 
 use rig::{
+    OneOrMany,
     completion::CompletionError,
     message::{AssistantContent, Message, UserContent},
-    OneOrMany,
 };
 
 use super::{assistant_content::RigAssistantContent, user_content::RigUserContent};
@@ -90,8 +90,8 @@ mod tests {
     use crate::types::message::RigMessage;
     use aws_sdk_bedrockruntime::types as aws_bedrock;
     use rig::{
-        message::{Message, UserContent},
         OneOrMany,
+        message::{Message, UserContent},
     };
 
     #[test]

rig-bedrock/src/types/text_to_image.rs

@@ -1,5 +1,5 @@
-use base64::prelude::BASE64_STANDARD;
 use base64::Engine;
+use base64::prelude::BASE64_STANDARD;
 use rig::image_generation;
 use rig::image_generation::ImageGenerationError;
 use serde::{Deserialize, Serialize};

rig-bedrock/src/types/tool.rs

@@ -54,7 +54,7 @@ impl TryFrom<aws_bedrock::ToolResultContentBlock> for RigToolResultContent {
 #[cfg(test)]
 mod tests {
     use aws_sdk_bedrockruntime::types as aws_bedrock;
-    use base64::{prelude::BASE64_STANDARD, Engine};
+    use base64::{Engine, prelude::BASE64_STANDARD};
     use rig::{
         completion::CompletionError,
         message::{ContentFormat, Image, ImageMediaType, Text, ToolResultContent},

rig-bedrock/src/types/user_content.rs

@@ -1,9 +1,9 @@
 use aws_sdk_bedrockruntime::types as aws_bedrock;
 
 use rig::{
+    OneOrMany,
     completion::CompletionError,
     message::{Text, ToolResult, ToolResultContent, UserContent},
-    OneOrMany,
 };
 
 use super::{document::RigDocument, image::RigImage, tool::RigToolResultContent};
@@ -96,9 +96,9 @@ mod tests {
     use crate::types::user_content::RigUserContent;
     use aws_sdk_bedrockruntime::types as aws_bedrock;
     use rig::{
+        OneOrMany,
         completion::CompletionError,
         message::{ToolResultContent, UserContent},
-        OneOrMany,
     };
 
     #[test]

rig-core/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "rig-core"
 version = "0.13.0"
-edition = "2021"
+edition = { workspace = true }
 license = "MIT"
 readme = "README.md"
 description = "An opinionated library for building LLM powered applications."

rig-core/examples/agent_parallelization.rs

@@ -7,7 +7,7 @@ use rig::providers::openai::client::Client;
 
 use rig::{
     parallel,
-    pipeline::{self, passthrough, Op},
+    pipeline::{self, Op, passthrough},
 };
 
 use schemars::JsonSchema;

rig-core/examples/agent_with_echochambers.rs

@@ -1,5 +1,5 @@
 use anyhow::Result;
-use reqwest::header::{HeaderMap, HeaderValue, CONTENT_TYPE};
+use reqwest::header::{CONTENT_TYPE, HeaderMap, HeaderValue};
 use rig::prelude::*;
 use rig::{
     cli_chatbot::cli_chatbot,

rig-core/examples/agent_with_mira.rs

@@ -32,7 +32,10 @@ async fn main() -> Result<(), anyhow::Error> {
             println!("\nProceeding with chat completion...\n");
         }
         Err(e) => {
-            return Err(anyhow::anyhow!("Failed to connect to Mira API: {}. Please verify your API key and network connection.", e));
+            return Err(anyhow::anyhow!(
+                "Failed to connect to Mira API: {}. Please verify your API key and network connection.",
+                e
+            ));
         }
     }
 

rig-core/examples/anthropic_streaming.rs

@@ -1,7 +1,7 @@
 use rig::prelude::*;
 use rig::{
     providers::anthropic::{self, CLAUDE_3_5_SONNET},
-    streaming::{stream_to_stdout, StreamingPrompt},
+    streaming::{StreamingPrompt, stream_to_stdout},
 };
 #[tokio::main]
 async fn main() -> Result<(), anyhow::Error> {

rig-core/examples/chain.rs

@@ -4,7 +4,7 @@ use std::env;
 use rig::{
     embeddings::EmbeddingsBuilder,
     parallel,
-    pipeline::{self, agent_ops::lookup, passthrough, Op},
+    pipeline::{self, Op, agent_ops::lookup, passthrough},
     providers::openai::{Client, TEXT_EMBEDDING_ADA_002},
     vector_store::in_memory_store::InMemoryVectorStore,
 };

rig-core/examples/cohere_streaming.rs

@@ -1,6 +1,6 @@
 use rig::prelude::*;
 use rig::providers::cohere;
-use rig::streaming::{stream_to_stdout, StreamingPrompt};
+use rig::streaming::{StreamingPrompt, stream_to_stdout};
 
 #[tokio::main]
 async fn main() -> Result<(), anyhow::Error> {

rig-core/examples/gemini_embeddings.rs

@@ -1,6 +1,6 @@
+use rig::Embed;
 use rig::prelude::*;
 use rig::providers::gemini;
-use rig::Embed;
 
 #[derive(Embed, Debug)]
 struct Greetings {

rig-core/examples/gemini_streaming.rs

@@ -1,7 +1,7 @@
 use rig::prelude::*;
 use rig::{
     providers::gemini::{self, completion::GEMINI_1_5_FLASH},
-    streaming::{stream_to_stdout, StreamingPrompt},
+    streaming::{StreamingPrompt, stream_to_stdout},
 };
 
 #[tokio::main]

rig-core/examples/huggingface_streaming.rs

@@ -3,7 +3,7 @@ use std::env;
 
 use rig::{
     providers::huggingface::{self},
-    streaming::{stream_to_stdout, StreamingPrompt},
+    streaming::{StreamingPrompt, stream_to_stdout},
 };
 
 #[tokio::main]

rig-core/examples/image.rs

@@ -1,12 +1,12 @@
 use reqwest::Client;
 use rig::prelude::*;
 use rig::{
-    completion::{message::Image, Prompt},
+    completion::{Prompt, message::Image},
     message::{ContentFormat, ImageMediaType},
     providers::anthropic::{self, CLAUDE_3_5_SONNET},
 };
 
-use base64::{prelude::BASE64_STANDARD, Engine};
+use base64::{Engine, prelude::BASE64_STANDARD};
 
 const IMAGE_URL: &str =
     "https://upload.wikimedia.org/wikipedia/commons/a/a7/Camponotus_flavomarginatus_ant.jpg";

rig-core/examples/image_ollama.rs

@@ -1,8 +1,8 @@
-use base64::{prelude::BASE64_STANDARD, Engine};
+use base64::{Engine, prelude::BASE64_STANDARD};
 use rig::prelude::*;
 use rig::providers::ollama;
 use rig::{
-    completion::{message::Image, Prompt},
+    completion::{Prompt, message::Image},
     message::{ContentFormat, ImageMediaType},
 };
 use tokio::fs;

rig-core/examples/mistral_embeddings.rs

@@ -1,9 +1,9 @@
+use rig::Embed;
 use rig::client::{EmbeddingsClient, ProviderClient};
 use rig::embeddings::EmbeddingsBuilder;
 use rig::providers::mistral;
-use rig::vector_store::in_memory_store::InMemoryVectorStore;
 use rig::vector_store::VectorStoreIndex;
-use rig::Embed;
+use rig::vector_store::in_memory_store::InMemoryVectorStore;
 use serde::{Deserialize, Serialize};
 
 #[derive(Embed, Debug, Serialize, Deserialize, Eq, PartialEq)]

rig-core/examples/multi_extract.rs

@@ -1,6 +1,6 @@
 use rig::prelude::*;
 use rig::{
-    pipeline::{self, agent_ops, TryOp},
+    pipeline::{self, TryOp, agent_ops},
     providers::openai,
     try_parallel,
 };

rig-core/examples/multi_turn_streaming.rs

@@ -1,13 +1,13 @@
 use futures::{Stream, StreamExt};
 use rig::{
+    OneOrMany,
     agent::Agent,
     client::{CompletionClient, ProviderClient},
     completion::{self, CompletionError, CompletionModel, PromptError, ToolDefinition},
     message::{AssistantContent, Message, Text, ToolResultContent, UserContent},
     providers::anthropic,
     streaming::StreamingCompletion,
     tool::{Tool, ToolSetError},
-    OneOrMany,
 };
 use serde::{Deserialize, Serialize};
 use serde_json::json;

rig-core/examples/ollama_streaming.rs

@@ -1,7 +1,7 @@
 use rig::prelude::*;
 use rig::providers::ollama;
 
-use rig::streaming::{stream_to_stdout, StreamingPrompt};
+use rig::streaming::{StreamingPrompt, stream_to_stdout};
 
 #[tokio::main]
 

rig-core/examples/openai_streaming.rs

@@ -1,6 +1,6 @@
 use rig::prelude::*;
 use rig::providers::openai;
-use rig::streaming::{stream_to_stdout, StreamingPrompt};
+use rig::streaming::{StreamingPrompt, stream_to_stdout};
 
 #[tokio::main]
 async fn main() -> Result<(), anyhow::Error> {

rig-core/examples/openai_streaming_with_tools.rs

@@ -1,12 +1,12 @@
 use anyhow::Result;
-use futures::{stream, StreamExt};
+use futures::{StreamExt, stream};
+use rig::OneOrMany;
 use rig::agent::Agent;
 use rig::completion::{CompletionError, CompletionModel};
 use rig::message::{AssistantContent, UserContent};
 use rig::prelude::*;
-use rig::streaming::{stream_to_stdout, StreamingChat};
+use rig::streaming::{StreamingChat, stream_to_stdout};
 use rig::tool::ToolSetError;
-use rig::OneOrMany;
 use rig::{
     completion::{Message, ToolDefinition},
     providers,