Merge branch 'main' into main

Author: pycoder49

Cargo.toml

@@ -74,6 +74,7 @@ unsafe_code = "forbid"
 allow_attributes = "deny"
 dbg_macro = "deny"
 expect_used = "deny"
+explicit_iter_loop = "deny"
 if_not_else = "deny"
 ignored_unit_patterns = "deny"
 manual_string_new = "deny"
@@ -88,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>,

evaluations/src/helpers.rs

@@ -27,7 +27,7 @@ pub async fn get_tool_params_args(
         FunctionConfig::Chat(function_config) => {
             let mut additional_tools = Vec::new();
             let mut allowed_tools = Vec::new();
-            for tool in tool_params.tools_available.iter() {
+            for tool in &tool_params.tools_available {
                 if function_config.tools.contains(&tool.name) {
                     allowed_tools.push(tool.name.clone());
                 } else {

evaluations/src/stats.rs

@@ -77,8 +77,8 @@ impl EvaluationStats {
         debug!(evaluators = ?evaluators.keys().collect::<Vec<_>>(), "Initialized data collectors for evaluators");
         // Collect evaluation inference data into vectors by evaluation (all as floats)
         debug!("Processing evaluation results into statistics");
-        for evaluation_info in self.evaluation_infos.iter() {
-            for (evaluation_name, evaluation_result) in evaluation_info.evaluations.iter() {
+        for evaluation_info in &self.evaluation_infos {
+            for (evaluation_name, evaluation_result) in &evaluation_info.evaluations {
                 match evaluation_result {
                     Some(Value::Number(n)) => {
                         if let Some(data_vec) = data.get_mut(evaluation_name) {

examples/integrations/cursor/feedback/src/ted/mod.rs

@@ -202,7 +202,7 @@ impl<'tree, L: Eq> Tree<'tree, L> {
     ) -> Self {
         let key_roots = Self::compute_key_roots(left_most_leaf_descendant_root, parent_offset);
         debug_assert!(!key_roots.is_empty(), "key_roots must have ≥1 node");
-        for root in key_roots.iter() {
+        for root in &key_roots {
             debug_assert!(*root < post.len(), "key_root must be within bounds");
         }
         debug_assert_eq!(

internal/tensorzero-derive/src/lib.rs

@@ -119,9 +119,9 @@ pub fn tensorzero_derive(input: TokenStream) -> TokenStream {
     // other derive macros (e.g. `#[strum]`0. We're not applying any derive macros
     // to our new enum, so we need to avoid copying over other attributes to prevent errors.
     let mut stripped_variants = data.variants.clone();
-    for variant in stripped_variants.iter_mut() {
+    for variant in &mut stripped_variants {
         variant.attrs.retain(|attr| attr.path().is_ident("serde"));
-        for field in variant.fields.iter_mut() {
+        for field in &mut variant.fields {
             field.attrs.retain(|attr| attr.path().is_ident("serde"));
         }
     }

tensorzero-core/src/clickhouse/mod.rs

@@ -659,7 +659,7 @@ fn set_clickhouse_format_settings(database_url: &mut Url) {
         }
     }
 
-    for setting in OVERRIDDEN_SETTINGS.iter() {
+    for setting in &OVERRIDDEN_SETTINGS {
         database_url.query_pairs_mut().append_pair(setting, "0");
     }
     database_url.query_pairs_mut().finish();

tensorzero-core/src/config_parser/mod.rs

@@ -977,7 +977,7 @@ impl UninitializedFunctionConfig {
                     .into_iter()
                     .map(|(name, variant)| variant.load().map(|v| (name, Arc::new(v))))
                     .collect::<Result<HashMap<_, _>, Error>>()?;
-                for (name, variant) in variants.iter() {
+                for (name, variant) in &variants {
                     if let VariantConfig::ChatCompletion(chat_config) = &variant.inner {
                         if chat_config.json_mode.is_some() {
                             return Err(ErrorDetails::Config {
@@ -1025,7 +1025,7 @@ impl UninitializedFunctionConfig {
                     .map(|(name, variant)| variant.load().map(|v| (name, Arc::new(v))))
                     .collect::<Result<HashMap<_, _>, Error>>()?;
 
-                for (name, variant) in variants.iter() {
+                for (name, variant) in &variants {
                     let mut warn_variant = None;
                     match &variant.inner {
                         VariantConfig::ChatCompletion(chat_config) => {

tensorzero-core/src/endpoints/dynamic_evaluation_run.rs

@@ -141,7 +141,7 @@ pub fn validate_variant_pins(
     variant_pins: &HashMap<String, String>,
     config: &Config,
 ) -> Result<(), Error> {
-    for (function_name, variant_name) in variant_pins.iter() {
+    for (function_name, variant_name) in variant_pins {
         let function_config = config.get_function(function_name)?;
         function_config
             .variants()

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> {