Rustfmt

src/maestro/bootstrap.rs

@@ -6,9 +6,7 @@ use tracing::{info, warn};
 use tracing_subscriber::{EnvFilter, fmt, prelude::*, reload as tracing_reload};
 
 use crate::config::{LogLevel, ProxyConfig};
-use crate::startup::{
-    COMPONENT_CONFIG_LOAD, COMPONENT_TRACING_INIT, StartupTracker,
-};
+use crate::startup::{COMPONENT_CONFIG_LOAD, COMPONENT_TRACING_INIT, StartupTracker};
 
 use super::helpers::{
     parse_cli, print_maestro_line, resolve_runtime_base_dir, resolve_runtime_config_path,

src/maestro/listeners/accept.rs

@@ -251,8 +251,9 @@ impl ListenerSlot {
     pub(super) async fn stop(&mut self) -> Result<(), String> {
         self.cancellation.cancel();
         if let Some(task) = self.task.take() {
-            task.await
-                .map_err(|error_value| format!("listener {} task failed: {error_value}", self.spec.addr))?;
+            task.await.map_err(|error_value| {
+                format!("listener {} task failed: {error_value}", self.spec.addr)
+            })?;
         }
         Ok(())
     }

src/maestro/listeners/bind.rs

@@ -10,8 +10,8 @@ use tracing::{error, info, warn};
 
 use crate::config::ProxyConfig;
 use crate::startup::{COMPONENT_LISTENERS_BIND, StartupTracker};
-use crate::transport::socket::{activate_listener_socket, bind_listener_socket};
 use crate::transport::find_listener_processes;
+use crate::transport::socket::{activate_listener_socket, bind_listener_socket};
 
 use super::plan::{ListenerBindSpec, listener_bind_plan};
 use crate::maestro::helpers::print_proxy_links;
@@ -88,9 +88,7 @@ fn log_bind_error(addr: SocketAddr, reuse_allow: bool, error_value: &std::io::Er
     }
 }
 
-pub(super) fn prepare_listener(
-    spec: ListenerBindSpec,
-) -> std::io::Result<PreparedTcpListener> {
+pub(super) fn prepare_listener(spec: ListenerBindSpec) -> std::io::Result<PreparedTcpListener> {
     match bind_listener_socket(spec.addr, &spec.options) {
         Ok(socket) => Ok(PreparedTcpListener { socket, spec }),
         Err(error_value) => {
@@ -165,7 +163,12 @@ fn print_configured_links(
     if config.general.links.show.is_empty() || config.general.links.public_host.is_none() {
         return;
     }
-    let host = config.general.links.public_host.as_deref().unwrap_or_default();
+    let host = config
+        .general
+        .links
+        .public_host
+        .as_deref()
+        .unwrap_or_default();
     let port = config
         .general
         .links

src/maestro/listeners/control.rs

@@ -8,9 +8,7 @@ use crate::config::ProxyConfig;
 use crate::maestro::generation::RuntimeGeneration;
 
 use super::accept::ListenerSlot;
-use super::bind::{
-    BoundListeners, BoundTcpListener, PreparedTcpListener, prepare_listener,
-};
+use super::bind::{BoundListeners, BoundTcpListener, PreparedTcpListener, prepare_listener};
 use super::plan::{ListenerBindSpec, listener_bind_plan};
 #[cfg(unix)]
 use super::unix::UnixAcceptHandle;

src/maestro/listeners/plan.rs

@@ -15,10 +15,7 @@ pub(super) struct ListenerBindSpec {
     pub(super) tls_response_fragment_size: Option<u16>,
 }
 
-fn listener_port_or_legacy(
-    listener: &crate::config::ListenerConfig,
-    server: &ServerConfig,
-) -> u16 {
+fn listener_port_or_legacy(listener: &crate::config::ListenerConfig, server: &ServerConfig) -> u16 {
     listener.port.unwrap_or(server.port)
 }
 

src/maestro/listeners/unix.rs

@@ -74,8 +74,7 @@ async fn run_unix_accept_loop(
                 };
 
                 let connection_id = connection_counter.fetch_add(1, Ordering::Relaxed);
-                let fake_peer =
-                    SocketAddr::from(([127, 0, 0, 1], (connection_id % 65535) as u16));
+                let fake_peer = SocketAddr::from(([127, 0, 0, 1], (connection_id % 65535) as u16));
                 let stats = runtime.stats.clone();
                 let upstream_manager = runtime.upstream_manager.clone();
                 let replay_checker = runtime.replay_checker.clone();

src/maestro/orchestrator.rs

@@ -8,9 +8,7 @@ use tracing::{error, info, warn};
 use crate::api;
 use crate::ip_tracker::UserIpTracker;
 use crate::network::probe::{decide_network_capabilities, log_probe_result, run_probe};
-use crate::proxy::direct_buffer_budget::{
-    DirectBufferBudget, resolve_direct_buffer_hard_limit,
-};
+use crate::proxy::direct_buffer_budget::{DirectBufferBudget, resolve_direct_buffer_hard_limit};
 use crate::proxy::route_mode::{RelayRouteMode, RouteRuntimeController};
 use crate::proxy::shared_state::ProxySharedState;
 use crate::startup::{COMPONENT_API_BOOTSTRAP, COMPONENT_NETWORK_PROBE};

src/maestro/reload.rs

@@ -3,8 +3,8 @@ use std::sync::Arc;
 use std::sync::atomic::{AtomicU64, Ordering};
 use std::time::{SystemTime, UNIX_EPOCH};
 
-use serde::{Deserialize, Serialize};
 use parking_lot::Mutex;
+use serde::{Deserialize, Serialize};
 use tokio::sync::mpsc;
 
 use crate::config::ProxyConfig;
@@ -260,9 +260,9 @@ impl ReloadControl {
             .active_generation
             .load(Ordering::Acquire)
             .saturating_add(1);
-        let status = self
-            .status_store
-            .reserve(target_generation, config_revision, request.clone())?;
+        let status =
+            self.status_store
+                .reserve(target_generation, config_revision, request.clone())?;
         Ok(ReloadReservation {
             permit: Some(permit),
             status,

src/maestro/reload_supervisor.rs

@@ -3,8 +3,8 @@ use std::sync::Arc;
 use std::time::Duration;
 
 use arc_swap::ArcSwap;
-use tokio::sync::watch;
 use tokio::sync::Mutex;
+use tokio::sync::watch;
 use tokio_util::sync::CancellationToken;
 use tracing::{info, warn};
 
@@ -158,10 +158,7 @@ impl ReloadSupervisor {
         let old_runtime = self.active_runtime.load_full();
         let resolved = resolve_reload_config(&old_runtime.config(), &command.config);
         self.control
-            .set_deferred_fields(
-                command.reload_id,
-                resolved.deferred_process_fields.clone(),
-            )
+            .set_deferred_fields(command.reload_id, resolved.deferred_process_fields.clone())
             .await;
 
         let prepared = match prepare_runtime(

src/maestro/runtime_build.rs

@@ -337,8 +337,8 @@ pub(crate) fn resolve_reload_config(
         || old.server.listen_backlog != desired.server.listen_backlog;
     let listener_policy_changed =
         listener_identity_matches && !listener_process_fields_equal(&old.server, &desired.server);
-    let unsupported_identity_change = !listener_identity_matches
-        && !listener_rebind_supported(old, desired);
+    let unsupported_identity_change =
+        !listener_identity_matches && !listener_rebind_supported(old, desired);
     if global_listener_policy_changed || listener_policy_changed || unsupported_identity_change {
         fields.push("server.listeners".to_string());
         effective.server.port = old.server.port;
@@ -402,9 +402,7 @@ pub(crate) fn resolve_reload_config(
         fields.push("general.data_path".to_string());
         effective.general.data_path = old.general.data_path.clone();
     }
-    if serde_json::to_value(&old.logging).ok()
-        != serde_json::to_value(&desired.logging).ok()
-    {
+    if serde_json::to_value(&old.logging).ok() != serde_json::to_value(&desired.logging).ok() {
         fields.push("logging".to_string());
         effective.logging = old.logging.clone();
     }

src/maestro/runtime_startup.rs

@@ -11,15 +11,13 @@ use crate::conntrack_control;
 use crate::crypto::SecureRandom;
 use crate::ip_tracker::UserIpTracker;
 use crate::network::probe::{NetworkDecision, NetworkProbe};
-use crate::proxy::direct_buffer_budget::{
-    DirectBufferBudget, run_direct_buffer_budget_controller,
-};
+use crate::proxy::direct_buffer_budget::{DirectBufferBudget, run_direct_buffer_budget_controller};
 use crate::proxy::route_mode::RouteRuntimeController;
 use crate::proxy::shared_state::ProxySharedState;
 use crate::startup::{
-    COMPONENT_DC_CONNECTIVITY_PING, COMPONENT_ME_CONNECTIVITY_PING,
-    COMPONENT_ME_POOL_CONSTRUCT, COMPONENT_ME_POOL_INIT_STAGE1, COMPONENT_ME_PROXY_CONFIG_V4,
-    COMPONENT_ME_PROXY_CONFIG_V6, COMPONENT_ME_SECRET_FETCH, StartupMeStatus, StartupTracker,
+    COMPONENT_DC_CONNECTIVITY_PING, COMPONENT_ME_CONNECTIVITY_PING, COMPONENT_ME_POOL_CONSTRUCT,
+    COMPONENT_ME_POOL_INIT_STAGE1, COMPONENT_ME_PROXY_CONFIG_V4, COMPONENT_ME_PROXY_CONFIG_V6,
+    COMPONENT_ME_SECRET_FETCH, StartupMeStatus, StartupTracker,
 };
 use crate::stats::beobachten::BeobachtenStore;
 use crate::stats::{ReplayChecker, Stats};