clippy --fix

Author: sbernauer

trino-lb/src/routing/trino_routing_group_header.rs

@@ -32,17 +32,17 @@ impl RouterImplementationTrait for TrinoRoutingGroupHeaderRouter {
     )]
     async fn route(&self, query: &str, headers: &http::HeaderMap) -> Option<String> {
         let target_group = headers.get(&self.config.header_name);
-        if let Some(target_group) = target_group {
-            if let Ok(target_group) = target_group.to_str() {
-                if self.valid_target_groups.contains(target_group) {
-                    return Some(target_group.to_string());
-                } else {
-                    // TODO: Maybe let the routers return client errors to the clients in case of user errors.
-                    warn!(
-                        target_group,
-                        "The client requested a target group that does not exist, skipped routing"
-                    );
-                }
+        if let Some(target_group) = target_group
+            && let Ok(target_group) = target_group.to_str()
+        {
+            if self.valid_target_groups.contains(target_group) {
+                return Some(target_group.to_string());
+            } else {
+                // TODO: Maybe let the routers return client errors to the clients in case of user errors.
+                warn!(
+                    target_group,
+                    "The client requested a target group that does not exist, skipped routing"
+                );
             }
         }
 

trino-lb/src/scaling/mod.rs

@@ -402,15 +402,15 @@ impl Scaler {
                     // We don't want to shut down the last remaining cluster obviously
                     // The only exception is the case no queries were running at all, in that case we shut down
                     // the unneeded cluster.
-                    if shut_down_candidates.len() > 1 || current_running_queries == 0 {
-                        if let Some((_, to_shut_down)) = shut_down_candidates.first() {
-                            target_states.insert(
-                                to_shut_down.name.to_owned(),
-                                ClusterState::Draining {
-                                    last_time_seen_with_queries: SystemTime::now(),
-                                },
-                            );
-                        }
+                    if (shut_down_candidates.len() > 1 || current_running_queries == 0)
+                        && let Some((_, to_shut_down)) = shut_down_candidates.first()
+                    {
+                        target_states.insert(
+                            to_shut_down.name.to_owned(),
+                            ClusterState::Draining {
+                                last_time_seen_with_queries: SystemTime::now(),
+                            },
+                        );
                     }
                 }
             }

trino-lb/src/tracing.rs

@@ -53,19 +53,19 @@ pub fn init(
     let console_output_layer = tracing_subscriber::fmt::layer().with_filter(env_filter_layer);
     let mut layers = vec![console_output_layer.boxed()];
 
-    if let Some(tracing_config) = tracing_config {
-        if tracing_config.enabled {
-            let env_filter_layer = EnvFilter::builder()
-                .with_default_directive(LevelFilter::DEBUG.into())
-                .from_env_lossy();
-            layers.push(
-                tracing_opentelemetry::layer()
-                    .with_error_records_to_exceptions(true)
-                    .with_tracer(otel_tracer(tracing_config)?)
-                    .with_filter(env_filter_layer)
-                    .boxed(),
-            );
-        }
+    if let Some(tracing_config) = tracing_config
+        && tracing_config.enabled
+    {
+        let env_filter_layer = EnvFilter::builder()
+            .with_default_directive(LevelFilter::DEBUG.into())
+            .from_env_lossy();
+        layers.push(
+            tracing_opentelemetry::layer()
+                .with_error_records_to_exceptions(true)
+                .with_tracer(otel_tracer(tracing_config)?)
+                .with_filter(env_filter_layer)
+                .boxed(),
+        );
     }
 
     let registry = prometheus::Registry::new();