[Issue-1961]: Handle clippy::unnecessary_wraps (tensorzero#2856)

Author: michaldorsett

Cargo.toml

@@ -89,6 +89,7 @@ todo = "deny"
 trivially_copy_pass_by_ref = "deny"
 unimplemented = "deny"
 uninlined_format_args = "deny"
+unnecessary_wraps = "deny"
 unreachable = "deny"
 unused_self = "deny"
 unwrap_used = "deny"

clients/python/src/lib.rs

@@ -587,6 +587,7 @@ impl TensorZeroGateway {
     }
 
     // TODO - implement closing the 'reqwest' connection pool: https://github.com/tensorzero/tensorzero/issues/857
+    #[expect(clippy::unnecessary_wraps)]
     fn __exit__(
         _this: Py<Self>,
         _exc_type: Py<PyAny>,

tensorzero-core/src/evaluations/mod.rs

@@ -776,6 +776,7 @@ impl UninitializedLLMJudgeVariantInfo {
 /// We want to make sure that there is an UninitializedLLMJudgeVariantConfig for each VariantConfig.
 /// This function should complain at compile time if we forget to update it when adding a new variant type.
 #[expect(dead_code)]
+#[expect(clippy::unnecessary_wraps)]
 fn check_convert_variant_to_llm_judge_variant(
     variant: VariantConfig,
 ) -> Result<UninitializedLLMJudgeVariantConfig, Error> {

tensorzero-core/src/providers/anthropic.rs

@@ -33,6 +33,7 @@ use crate::model::{
     build_creds_caching_default, fully_qualified_name, Credential, CredentialLocation,
     ModelProvider,
 };
+use crate::providers;
 use crate::providers::helpers::{
     inject_extra_request_data_and_send, inject_extra_request_data_and_send_eventsource,
 };
@@ -664,7 +665,7 @@ impl<'a> AnthropicRequestBody<'a> {
             .iter()
             .map(AnthropicMessage::try_from)
             .collect::<Result<Vec<_>, _>>()?;
-        let messages = prepare_messages(request_messages)?;
+        let messages = prepare_messages(request_messages);
         let messages = if matches!(
             request.json_mode,
             ModelInferenceRequestJsonMode::On | ModelInferenceRequestJsonMode::Strict
@@ -711,7 +712,9 @@ impl<'a> AnthropicRequestBody<'a> {
 /// Modifies the message array to satisfy Anthropic API requirements by:
 /// - Prepending a default User message with "[listening]" if the first message is not from a User
 /// - Appending a default User message with "[listening]" if the last message is from an Assistant
-fn prepare_messages(mut messages: Vec<AnthropicMessage>) -> Result<Vec<AnthropicMessage>, Error> {
+fn prepare_messages(
+    mut messages: Vec<AnthropicMessage>,
+) -> std::vec::Vec<providers::anthropic::AnthropicMessage<'_>> {
     // Anthropic also requires that there is at least one message and it is a User message.
     // If it's not we will prepend a default User message.
     match messages.first() {
@@ -745,7 +748,7 @@ fn prepare_messages(mut messages: Vec<AnthropicMessage>) -> Result<Vec<Anthropic
             });
         }
     }
-    Ok(messages)
+    messages
 }
 
 fn prefill_json_message(messages: Vec<AnthropicMessage>) -> Vec<AnthropicMessage> {
@@ -1765,7 +1768,7 @@ mod tests {
 
         // Test case 1: Empty messages - should add listening message
         let messages = vec![];
-        let result = prepare_messages(messages).unwrap();
+        let result = prepare_messages(messages);
         assert_eq!(result, vec![listening_message.clone()]);
 
         // Test case 2: First message is Assistant - should prepend listening message
@@ -1783,7 +1786,7 @@ mod tests {
                 })],
             },
         ];
-        let result = prepare_messages(messages).unwrap();
+        let result = prepare_messages(messages);
         assert_eq!(
             result,
             vec![
@@ -1818,7 +1821,7 @@ mod tests {
                 })],
             },
         ];
-        let result = prepare_messages(messages).unwrap();
+        let result = prepare_messages(messages);
         assert_eq!(
             result,
             vec![
@@ -1859,7 +1862,7 @@ mod tests {
                 })],
             },
         ];
-        let result = prepare_messages(messages.clone()).unwrap();
+        let result = prepare_messages(messages.clone());
         assert_eq!(result, messages);
 
         // Test case 5: Both first Assistant and last Assistant - should add listening messages at both ends
@@ -1883,7 +1886,7 @@ mod tests {
                 })],
             },
         ];
-        let result = prepare_messages(messages).unwrap();
+        let result = prepare_messages(messages);
         assert_eq!(
             result,
             vec![
@@ -1917,7 +1920,7 @@ mod tests {
                 text: "Hi",
             })],
         }];
-        let result = prepare_messages(messages).unwrap();
+        let result = prepare_messages(messages);
         assert_eq!(
             result,
             vec![
@@ -1939,7 +1942,7 @@ mod tests {
                 text: "Hello",
             })],
         }];
-        let result = prepare_messages(messages.clone()).unwrap();
+        let result = prepare_messages(messages.clone());
         assert_eq!(result, messages);
     }
 

tensorzero-core/src/providers/aws_bedrock.rs

@@ -779,6 +779,7 @@ struct ConverseOutputWithMetadata<'a> {
     json_mode: &'a ModelInferenceRequestJsonMode,
 }
 
+#[expect(clippy::unnecessary_wraps)]
 fn aws_stop_reason_to_tensorzero_finish_reason(stop_reason: StopReason) -> Option<FinishReason> {
     match stop_reason {
         StopReason::ContentFiltered => Some(FinishReason::ContentFilter),

tensorzero-core/src/providers/gcp_vertex_gemini/mod.rs

@@ -2093,6 +2093,7 @@ pub fn tensorzero_to_gcp_vertex_gemini_content<'a>(
     Ok(message)
 }
 
+#[expect(clippy::unnecessary_wraps)]
 pub(crate) fn process_output_schema(output_schema: &Value) -> Result<Value, Error> {
     let mut schema = output_schema.clone();
 

tensorzero-core/src/variant/mod.rs

@@ -571,6 +571,7 @@ impl Variant for VariantInfo {
 }
 
 #[expect(clippy::too_many_arguments)]
+#[expect(clippy::unnecessary_wraps)]
 fn prepare_model_inference_request<'a, 'request>(
     messages: Vec<RequestMessage>,
     system: Option<String>,