From 447fa5286e8e90380d52dcc851805179e50dc301 Mon Sep 17 00:00:00 2001 From: Himanshu Neema Date: Mon, 10 Nov 2025 16:55:15 -0800 Subject: [PATCH] cargo clippy fixes --- .../src/types/chat/{chat.rs => chat_types.rs} | 1 - async-openai/src/types/chat/mod.rs | 4 +-- .../{containers.rs => container.rs} | 0 async-openai/src/types/containers/mod.rs | 4 +-- .../src/types/finetuning/fine_tuning.rs | 3 ++- async-openai/src/types/impls.rs | 27 +++++++------------ async-openai/src/types/responses/response.rs | 3 ++- 7 files changed, 18 insertions(+), 24 deletions(-) rename async-openai/src/types/chat/{chat.rs => chat_types.rs} (99%) rename async-openai/src/types/containers/{containers.rs => container.rs} (100%) diff --git a/async-openai/src/types/chat/chat.rs b/async-openai/src/types/chat/chat_types.rs similarity index 99% rename from async-openai/src/types/chat/chat.rs rename to async-openai/src/types/chat/chat_types.rs index c6409473..a56c414c 100644 --- a/async-openai/src/types/chat/chat.rs +++ b/async-openai/src/types/chat/chat_types.rs @@ -1346,7 +1346,6 @@ pub struct ChatCompletionDeleted { #[derive(Debug, Serialize, Deserialize, Clone, PartialEq)] #[serde(tag = "type")] #[serde(rename_all = "snake_case")] - pub enum ContentPart { Text(ChatCompletionRequestMessageContentPartText), ImageUrl(ChatCompletionRequestMessageContentPartImage), diff --git a/async-openai/src/types/chat/mod.rs b/async-openai/src/types/chat/mod.rs index 5d0ed72d..4634f935 100644 --- a/async-openai/src/types/chat/mod.rs +++ b/async-openai/src/types/chat/mod.rs @@ -1,3 +1,3 @@ -mod chat; +mod chat_types; -pub use chat::*; +pub use chat_types::*; diff --git a/async-openai/src/types/containers/containers.rs b/async-openai/src/types/containers/container.rs similarity index 100% rename from async-openai/src/types/containers/containers.rs rename to async-openai/src/types/containers/container.rs diff --git a/async-openai/src/types/containers/mod.rs b/async-openai/src/types/containers/mod.rs index f8f3c54e..f6990dfa 100644 --- a/async-openai/src/types/containers/mod.rs +++ b/async-openai/src/types/containers/mod.rs @@ -1,3 +1,3 @@ -mod containers; +mod container; -pub use containers::*; +pub use container::*; diff --git a/async-openai/src/types/finetuning/fine_tuning.rs b/async-openai/src/types/finetuning/fine_tuning.rs index 32f1dd5d..920882f3 100644 --- a/async-openai/src/types/finetuning/fine_tuning.rs +++ b/async-openai/src/types/finetuning/fine_tuning.rs @@ -146,7 +146,8 @@ pub enum FineTuneMethod { dpo: FineTuneDPOMethod, }, Reinforcement { - reinforcement: FineTuneReinforcementMethod, + // Boxed because https://rust-lang.github.io/rust-clippy/rust-1.91.0/index.html#large_enum_variant + reinforcement: Box, }, } diff --git a/async-openai/src/types/impls.rs b/async-openai/src/types/impls.rs index d9bbaa54..6195fbc5 100644 --- a/async-openai/src/types/impls.rs +++ b/async-openai/src/types/impls.rs @@ -26,8 +26,7 @@ use crate::{ ChatCompletionRequestSystemMessageContent, ChatCompletionRequestToolMessage, ChatCompletionRequestToolMessageContent, ChatCompletionRequestUserMessage, ChatCompletionRequestUserMessageContent, ChatCompletionRequestUserMessageContentPart, - ChatCompletionToolChoiceOption, FunctionName, ImageUrl, Prompt, Role, - StopConfiguration, + FunctionName, ImageUrl, Prompt, Role, StopConfiguration, }, containers::CreateContainerFileRequest, embeddings::EmbeddingInput, @@ -38,7 +37,7 @@ use crate::{ }, images::{ImageBackground, ImageEditInput, ImageOutputFormat, ImageQuality, InputFidelity}, moderations::ModerationInput, - responses::{EasyInputContent, Role as ResponsesRole}, + responses::EasyInputContent, uploads::AddUploadPartRequest, videos::{CreateVideoRequest, VideoSize}, CreateMessageRequestContent, InputSource, @@ -223,50 +222,50 @@ impl From for ImageEditInput { // Arrays of path-like values impl From<[&str; N]> for ImageEditInput { fn from(value: [&str; N]) -> Self { - Self::Images(value.into_iter().map(|v| ImageInput::from(v)).collect()) + Self::Images(value.into_iter().map(ImageInput::from).collect()) } } impl From<[String; N]> for ImageEditInput { fn from(value: [String; N]) -> Self { - Self::Images(value.into_iter().map(|v| ImageInput::from(v)).collect()) + Self::Images(value.into_iter().map(ImageInput::from).collect()) } } impl From<[&Path; N]> for ImageEditInput { fn from(value: [&Path; N]) -> Self { - Self::Images(value.into_iter().map(|v| ImageInput::from(v)).collect()) + Self::Images(value.into_iter().map(ImageInput::from).collect()) } } impl From<[PathBuf; N]> for ImageEditInput { fn from(value: [PathBuf; N]) -> Self { - Self::Images(value.into_iter().map(|v| ImageInput::from(v)).collect()) + Self::Images(value.into_iter().map(ImageInput::from).collect()) } } // Vectors of path-like values impl<'a> From> for ImageEditInput { fn from(value: Vec<&'a str>) -> Self { - Self::Images(value.into_iter().map(|v| ImageInput::from(v)).collect()) + Self::Images(value.into_iter().map(ImageInput::from).collect()) } } impl From> for ImageEditInput { fn from(value: Vec) -> Self { - Self::Images(value.into_iter().map(|v| ImageInput::from(v)).collect()) + Self::Images(value.into_iter().map(ImageInput::from).collect()) } } impl From> for ImageEditInput { fn from(value: Vec<&Path>) -> Self { - Self::Images(value.into_iter().map(|v| ImageInput::from(v)).collect()) + Self::Images(value.into_iter().map(ImageInput::from).collect()) } } impl From> for ImageEditInput { fn from(value: Vec) -> Self { - Self::Images(value.into_iter().map(|v| ImageInput::from(v)).collect()) + Self::Images(value.into_iter().map(ImageInput::from).collect()) } } @@ -1327,12 +1326,6 @@ impl Default for EasyInputContent { } } -impl Default for ResponsesRole { - fn default() -> Self { - Self::User - } -} - impl From for EasyInputContent { fn from(value: String) -> Self { Self::Text(value) diff --git a/async-openai/src/types/responses/response.rs b/async-openai/src/types/responses/response.rs index f1a91387..0c293226 100644 --- a/async-openai/src/types/responses/response.rs +++ b/async-openai/src/types/responses/response.rs @@ -9,9 +9,10 @@ use serde::{Deserialize, Serialize}; use std::collections::HashMap; /// Role of messages in the API. -#[derive(Debug, Serialize, Deserialize, Clone, Copy, PartialEq)] +#[derive(Debug, Serialize, Deserialize, Clone, Copy, PartialEq, Default)] #[serde(rename_all = "lowercase")] pub enum Role { + #[default] User, Assistant, System,