Rustfmt

src/api/config_edit.rs

@@ -176,8 +176,7 @@ async fn prepare_patch_to_path(
     for section in &touched {
         if *section == "server" {
             let rendered = render_server_listeners(&requested_cfg)?;
-            owner_contents =
+            owner_contents = upsert_toml_table(&owner_contents, "server.listeners", &rendered);
-                upsert_toml_table(&owner_contents, "server.listeners", &rendered);
         } else {
             let rendered = render_top_level_section(&requested_cfg, section)?;
             owner_contents = upsert_toml_table(&owner_contents, section, &rendered);

src/api/config_edit/tests.rs

@@ -51,8 +51,7 @@ async fn patch_revision_conflict() {
 
 #[tokio::test]
 async fn patch_sni_reports_restart_required() {
-    let (path, _d) =
+    let (path, _d) = temp_config("[censorship]\ntls_domain = \"a.com\"\n[server]\nport = 443\n");
-        temp_config("[censorship]\ntls_domain = \"a.com\"\n[server]\nport = 443\n");
     let patch: Json = serde_json::json!({"censorship": {"tls_domain": "b.com"}});
     let resp = apply_patch_to_path(&path, &patch, None).await.unwrap();
     assert!(resp.restart_required);
@@ -252,9 +251,7 @@ async fn patch_rejects_multiple_source_owners_without_writing() {
         "censorship": {"tls_domain": "new.example"}
     });
 
-    let error = apply_patch_to_path(&root, &patch, None)
+    let error = apply_patch_to_path(&root, &patch, None).await.unwrap_err();
-        .await
-        .unwrap_err();
 
     assert_eq!(error.code, "config_patch_not_atomic");
     assert_eq!(tokio::fs::read_to_string(&root).await.unwrap(), root_body);
@@ -276,10 +273,7 @@ async fn unavailable_reload_coordinator_is_detected_before_config_write() {
     drop(receiver);
 
     let error = match control
-        .reserve(
+        .reserve(prepared.response.revision.clone(), ReloadRequest::default())
-            prepared.response.revision.clone(),
-            ReloadRequest::default(),
-        )
         .await
     {
         Ok(_) => panic!("closed reload coordinator must reject the reservation"),

src/api/config_store.rs

@@ -11,14 +11,12 @@ use super::model::ApiFailure;
 // Source-preserving TOML rendering and atomic persistence helpers.
 mod persistence;
 
+#[cfg(test)]
+use persistence::{find_toml_table_bounds, render_access_section, save_sections_to_disk};
 pub(in crate::api) use persistence::{
     render_server_listeners, render_top_level_section, save_access_sections_to_disk,
     upsert_toml_table, write_atomic,
 };
-#[cfg(test)]
-use persistence::{
-    find_toml_table_bounds, render_access_section, save_sections_to_disk,
-};
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub(super) enum AccessSection {

src/api/config_store/persistence.rs

@@ -7,13 +7,13 @@ use serde::Serialize;
 
 use crate::config::{ProxyConfig, RateLimitBps};
 
+#[cfg(test)]
+use super::compute_revision;
 use super::{
     AccessSection, compute_snapshot_revision, load_candidate_snapshot, load_config_snapshot,
     resolve_single_source_owner, toml_path_exists,
 };
 use crate::api::model::ApiFailure;
-#[cfg(test)]
-use super::compute_revision;
 
 /// Re-render the given top-level tables from `cfg` and upsert each into the
 /// on-disk file, preserving every untouched section (and its comments).
@@ -80,9 +80,7 @@ pub(in crate::api) fn render_top_level_section(
 }
 
 /// Renders normalized listener entries as nested array-of-table blocks.
-pub(in crate::api) fn render_server_listeners(
+pub(in crate::api) fn render_server_listeners(cfg: &ProxyConfig) -> Result<String, ApiFailure> {
-    cfg: &ProxyConfig,
-) -> Result<String, ApiFailure> {
     let mut out = String::new();
     for listener in &cfg.server.listeners {
         out.push_str("[[server.listeners]]\n");
@@ -339,10 +337,7 @@ fn header_belongs_to(header: &str, table_name: &str) -> bool {
 /// [`find_all_table_blocks`] for the full set of (possibly scattered) blocks.
 /// Locates one complete TOML table block in source text.
 #[cfg(test)]
-pub(super) fn find_toml_table_bounds(
+pub(super) fn find_toml_table_bounds(source: &str, table_name: &str) -> Option<(usize, usize)> {
-    source: &str,
-    table_name: &str,
-) -> Option<(usize, usize)> {
     find_all_table_blocks(source, table_name).into_iter().next()
 }
 

src/api/config_store/tests.rs

@@ -31,8 +31,7 @@ async fn save_sections_preserves_other_tables_and_comments() {
 
 #[test]
 fn find_bounds_matches_array_of_tables() {
-    let src =
+    let src = "[server]\nport = 1\n\n[[upstreams]]\nkind = \"a\"\n\n[[upstreams]]\nkind = \"b\"\n";
-        "[server]\nport = 1\n\n[[upstreams]]\nkind = \"a\"\n\n[[upstreams]]\nkind = \"b\"\n";
     let bounds = find_toml_table_bounds(src, "upstreams");
     assert!(bounds.is_some(), "should locate [[upstreams]] block start");
     let (start, end) = bounds.unwrap();
@@ -242,8 +241,7 @@ async fn access_mutation_writes_only_the_single_included_owner() {
     let root = dir.path().join("config.toml");
     let included = dir.path().join("users.toml");
     let root_body = "include = \"users.toml\"\n[censorship]\ntls_domain = \"example.com\"\n";
-    let included_body =
+    let included_body = "[access.users]\nalice = \"00000000000000000000000000000000\"\n";
-        "[access.users]\nalice = \"00000000000000000000000000000000\"\n";
     tokio::fs::write(&root, root_body).await.unwrap();
     tokio::fs::write(&included, included_body).await.unwrap();
     let mut cfg = load_config_from_disk(&root).await.unwrap();
@@ -303,8 +301,8 @@ fn render_user_rate_limits_section() {
         },
     );
 
-    let rendered = render_access_section(&cfg, AccessSection::UserRateLimits)
+    let rendered =
-        .expect("section must render");
+        render_access_section(&cfg, AccessSection::UserRateLimits).expect("section must render");
 
     assert!(rendered.starts_with("[access.user_rate_limits]\n"));
     assert!(rendered.contains("alice = { up_bps = 1024, down_bps = 2048 }"));

src/api/users/create.rs

@@ -175,4 +175,3 @@ pub(in crate::api) async fn create_user(
 
     Ok((CreateUserResponse { user, secret }, revision))
 }
-

src/api/users/lifecycle.rs

@@ -56,7 +56,6 @@ pub(in crate::api) async fn rotate_secret(
     ))
 }
 
-
 pub(in crate::api) async fn delete_user(
     user: &str,
     expected_revision: Option<String>,
@@ -115,4 +114,3 @@ pub(in crate::api) async fn delete_user(
 
     Ok((user.to_string(), revision))
 }
-

src/api/users/links.rs

@@ -197,4 +197,3 @@ fn resolve_extra_tls_domains(cfg: &ProxyConfig) -> Vec<&str> {
     }
     domains
 }
-

src/api/users/tests.rs

@@ -1,9 +1,9 @@
-    use super::*;
+use super::*;
-    use crate::ip_tracker::UserIpTracker;
+use crate::ip_tracker::UserIpTracker;
-    use crate::stats::Stats;
+use crate::stats::Stats;
 
-    #[tokio::test]
+#[tokio::test]
-    async fn users_from_config_reports_effective_tcp_limit_with_global_fallback() {
+async fn users_from_config_reports_effective_tcp_limit_with_global_fallback() {
     let mut cfg = ProxyConfig::default();
     cfg.access.users.insert(
         "alice".to_string(),
@@ -48,10 +48,10 @@
         .expect("alice must be present");
     assert!(!alice.in_runtime);
     assert_eq!(alice.max_tcp_conns, None);
-    }
+}
 
-    #[tokio::test]
+#[tokio::test]
-    async fn users_from_config_reports_user_rate_limits() {
+async fn users_from_config_reports_user_rate_limits() {
     let mut cfg = ProxyConfig::default();
     cfg.access.users.insert(
         "alice".to_string(),
@@ -76,10 +76,10 @@
 
     assert_eq!(alice.rate_limit_up_bps, Some(1024));
     assert_eq!(alice.rate_limit_down_bps, None);
-    }
+}
 
-    #[tokio::test]
+#[tokio::test]
-    async fn users_from_config_reports_user_enabled_default_and_override() {
+async fn users_from_config_reports_user_enabled_default_and_override() {
     let mut cfg = ProxyConfig::default();
     cfg.access.users.insert(
         "alice".to_string(),
@@ -113,10 +113,10 @@
         .find(|entry| entry.username == "bob")
         .expect("bob must be present");
     assert!(bob.enabled);
-    }
+}
 
-    #[tokio::test]
+#[tokio::test]
-    async fn users_from_config_marks_runtime_membership_when_snapshot_is_provided() {
+async fn users_from_config_marks_runtime_membership_when_snapshot_is_provided() {
     let mut disk_cfg = ProxyConfig::default();
     disk_cfg.access.users.insert(
         "alice".to_string(),
@@ -149,10 +149,10 @@
 
     assert!(alice.in_runtime);
     assert!(!bob.in_runtime);
-    }
+}
 
-    #[tokio::test]
+#[tokio::test]
-    async fn users_from_config_returns_tls_link_for_each_tls_domain() {
+async fn users_from_config_returns_tls_link_for_each_tls_domain() {
     let mut cfg = ProxyConfig::default();
     cfg.access.users.insert(
         "alice".to_string(),
@@ -225,10 +225,10 @@
             .iter()
             .any(|entry| entry.domain == "front-a.example.com")
     );
-    }
+}
 
-    #[test]
+#[test]
-    fn build_user_quota_list_skips_users_without_positive_quota_and_sorts_by_username() {
+fn build_user_quota_list_skips_users_without_positive_quota_and_sorts_by_username() {
     let mut cfg = ProxyConfig::default();
     cfg.access.users.insert(
         "alice".to_string(),
@@ -266,10 +266,10 @@
     assert_eq!(entry.data_quota_bytes, 1 << 20);
     assert_eq!(entry.used_bytes, 4096);
     assert_eq!(entry.last_reset_epoch_secs, 0);
-    }
+}
 
-    #[test]
+#[test]
-    fn build_user_quota_list_orders_multiple_users_by_username_ascending() {
+fn build_user_quota_list_orders_multiple_users_by_username_ascending() {
     let mut cfg = ProxyConfig::default();
     for name in ["charlie", "alice", "bob"] {
         cfg.access.users.insert(
@@ -289,4 +289,4 @@
         assert_eq!(entry.last_reset_epoch_secs, 0);
         assert_eq!(entry.data_quota_bytes, 1 << 30);
     }
-    }
+}

src/api/users/update.rs

@@ -194,7 +194,6 @@ pub(in crate::api) async fn patch_user(
     Ok((user_info, revision))
 }
 
-
 pub(in crate::api) async fn set_user_enabled(
     user: &str,
     enabled: bool,
@@ -243,4 +242,3 @@ pub(in crate::api) async fn set_user_enabled(
 
     Ok((user_info, revision))
 }
-

src/api/users/view.rs

@@ -110,4 +110,3 @@ pub(in crate::api) fn build_user_quota_list(cfg: &ProxyConfig, stats: &Stats) ->
     }
     UserQuotaListData { users }
 }
-

src/config/hot_reload/diff.rs

@@ -1,6 +1,5 @@
 use super::*;
 
-
 fn canonicalize_json(value: &mut serde_json::Value) {
     match value {
         serde_json::Value::Object(map) => {
@@ -44,7 +43,6 @@ fn listeners_equal(
     serde_json::to_value(lhs).ok() == serde_json::to_value(rhs).ok()
 }
 
-
 /// Warns when the requested snapshot contains fields that require restart.
 pub(super) fn warn_non_hot_changes(old: &ProxyConfig, new: &ProxyConfig, non_hot_changed: bool) {
     let mut warned = false;
@@ -231,7 +229,6 @@ pub(super) fn warn_non_hot_changes(old: &ProxyConfig, new: &ProxyConfig, non_hot
 /// 3. `detected_ip_v6` — fallback
 /// 4. `"UNKNOWN"` — warn the user to set `public_host`
 
-
 /// Which top-level config sections changed and whether any require a restart.
 #[derive(Debug, Default, Clone, serde::Serialize)]
 pub struct ChangeClassification {

src/config/hot_reload/fields.rs

@@ -1,6 +1,5 @@
 use super::*;
 
-
 /// Fields that are safe to swap without restarting listeners.
 #[derive(Debug, Clone, PartialEq)]
 pub struct HotFields {
@@ -223,7 +222,6 @@ impl HotFields {
     }
 }
 
-
 pub(super) fn overlay_hot_fields(old: &ProxyConfig, new: &ProxyConfig) -> ProxyConfig {
     let mut cfg = old.clone();
 

src/config/hot_reload/tests.rs

@@ -1,10 +1,10 @@
-    use super::*;
+use super::*;
 
-    fn sample_config() -> ProxyConfig {
+fn sample_config() -> ProxyConfig {
     ProxyConfig::default()
-    }
+}
 
-    fn write_reload_config(path: &Path, ad_tag: Option<&str>, server_port: Option<u16>) {
+fn write_reload_config(path: &Path, ad_tag: Option<&str>, server_port: Option<u16>) {
     let mut config = String::from(
         r#"
                 [censorship]
@@ -28,18 +28,18 @@
     }
 
     std::fs::write(path, config).unwrap();
-    }
+}
 
-    fn temp_config_path(prefix: &str) -> PathBuf {
+fn temp_config_path(prefix: &str) -> PathBuf {
     let nonce = std::time::SystemTime::now()
         .duration_since(std::time::UNIX_EPOCH)
         .unwrap()
         .as_nanos();
     std::env::temp_dir().join(format!("{prefix}_{nonce}.toml"))
-    }
+}
 
-    #[test]
+#[test]
-    fn overlay_applies_hot_and_preserves_non_hot() {
+fn overlay_applies_hot_and_preserves_non_hot() {
     let old = sample_config();
     let mut new = old.clone();
     new.general.hardswap = !old.general.hardswap;
@@ -48,10 +48,10 @@
     let applied = overlay_hot_fields(&old, &new);
     assert_eq!(applied.general.hardswap, new.general.hardswap);
     assert_eq!(applied.server.port, old.server.port);
-    }
+}
 
-    #[test]
+#[test]
-    fn non_hot_only_change_does_not_change_hot_snapshot() {
+fn non_hot_only_change_does_not_change_hot_snapshot() {
     let old = sample_config();
     let mut new = old.clone();
     new.server.port = old.server.port.saturating_add(1);
@@ -62,10 +62,10 @@
         HotFields::from_config(&applied)
     );
     assert_eq!(applied.server.port, old.server.port);
-    }
+}
 
-    #[test]
+#[test]
-    fn bind_stale_mode_is_hot() {
+fn bind_stale_mode_is_hot() {
     let old = sample_config();
     let mut new = old.clone();
     new.general.me_bind_stale_mode = match old.general.me_bind_stale_mode {
@@ -83,10 +83,10 @@
         HotFields::from_config(&old),
         HotFields::from_config(&applied)
     );
-    }
+}
 
-    #[test]
+#[test]
-    fn keepalive_is_not_hot() {
+fn keepalive_is_not_hot() {
     let old = sample_config();
     let mut new = old.clone();
     new.general.me_keepalive_interval_secs = old.general.me_keepalive_interval_secs + 5;
@@ -100,10 +100,10 @@
         HotFields::from_config(&old),
         HotFields::from_config(&applied)
     );
-    }
+}
 
-    #[test]
+#[test]
-    fn mixed_hot_and_non_hot_change_applies_only_hot_subset() {
+fn mixed_hot_and_non_hot_change_applies_only_hot_subset() {
     let old = sample_config();
     let mut new = old.clone();
     new.general.hardswap = !old.general.hardswap;
@@ -116,10 +116,10 @@
         old.general.use_middle_proxy
     );
     assert!(!config_equal(&applied, &new));
-    }
+}
 
-    #[test]
+#[test]
-    fn listener_synlimit_fields_are_process_owned() {
+fn listener_synlimit_fields_are_process_owned() {
     let mut old = sample_config();
     old.server.listeners.push(ListenerConfig {
         ip: "0.0.0.0".parse().unwrap(),
@@ -153,21 +153,27 @@
     let applied = overlay_hot_fields(&old, &new);
     let listener = &applied.server.listeners[0];
     assert_eq!(applied.server.port, old.server.port);
-        assert_eq!(listener.synlimit_seconds, old.server.listeners[0].synlimit_seconds);
+    assert_eq!(
+        listener.synlimit_seconds,
+        old.server.listeners[0].synlimit_seconds
+    );
     assert_eq!(
         listener.synlimit_hitcount,
         old.server.listeners[0].synlimit_hitcount
     );
-        assert_eq!(listener.synlimit_burst, old.server.listeners[0].synlimit_burst);
+    assert_eq!(
+        listener.synlimit_burst,
+        old.server.listeners[0].synlimit_burst
+    );
     assert_eq!(
         listener.synlimit_hashlimit_size,
         old.server.listeners[0].synlimit_hashlimit_size
     );
     assert!(classify_config_changes(&old, &new).restart_required);
-    }
+}
 
-    #[test]
+#[test]
-    fn reload_applies_hot_change_on_first_observed_snapshot() {
+fn reload_applies_hot_change_on_first_observed_snapshot() {
     let initial_tag = "11111111111111111111111111111111";
     let final_tag = "22222222222222222222222222222222";
     let path = temp_config_path("telemt_hot_reload_stable");
@@ -189,10 +195,10 @@
     );
 
     let _ = std::fs::remove_file(path);
-    }
+}
 
-    #[test]
+#[test]
-    fn reload_keeps_hot_apply_when_non_hot_fields_change() {
+fn reload_keeps_hot_apply_when_non_hot_fields_change() {
     let initial_tag = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
     let final_tag = "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb";
     let path = temp_config_path("telemt_hot_reload_mixed");
@@ -214,10 +220,10 @@
     assert_eq!(applied.server.port, initial_cfg.server.port);
 
     let _ = std::fs::remove_file(path);
-    }
+}
 
-    #[test]
+#[test]
-    fn classify_sni_change_requires_restart() {
+fn classify_sni_change_requires_restart() {
     // censorship.* is not in overlay_hot_fields -> restart.
     let old = ProxyConfig::default();
     let mut new = ProxyConfig::default();
@@ -226,10 +232,10 @@
     let class = classify_config_changes(&old, &new);
     assert!(class.restart_required);
     assert!(class.changed.iter().any(|c| c == "censorship"));
-    }
+}
 
-    #[test]
+#[test]
-    fn classify_dns_overrides_change_is_hot() {
+fn classify_dns_overrides_change_is_hot() {
     // network.dns_overrides IS in overlay_hot_fields -> no restart.
     let old = ProxyConfig::default();
     let mut new = ProxyConfig::default();
@@ -238,10 +244,10 @@
     let class = classify_config_changes(&old, &new);
     assert!(!class.restart_required);
     assert!(class.changed.iter().any(|c| c == "network"));
-    }
+}
 
-    #[test]
+#[test]
-    fn classify_timeouts_change_requires_restart() {
+fn classify_timeouts_change_requires_restart() {
     // timeouts.* is NOT in overlay_hot_fields -> restart.
     let old = ProxyConfig::default();
     let mut new = ProxyConfig::default();
@@ -249,10 +255,10 @@
 
     let class = classify_config_changes(&old, &new);
     assert!(class.restart_required);
-    }
+}
 
-    #[test]
+#[test]
-    fn reload_recovers_after_parse_error_on_next_attempt() {
+fn reload_recovers_after_parse_error_on_next_attempt() {
     let initial_tag = "cccccccccccccccccccccccccccccccc";
     let final_tag = "dddddddddddddddddddddddddddddddd";
     let path = temp_config_path("telemt_hot_reload_parse_recovery");
@@ -281,4 +287,4 @@
     );
 
     let _ = std::fs::remove_file(path);
-    }
+}

src/config/hot_reload/watcher.rs

@@ -123,7 +123,6 @@ fn apply_watch_manifest<W1: Watcher, W2: Watcher>(
     }
 }
 
-
 /// Load config, validate, diff against current, and broadcast if changed.
 pub(super) fn reload_config(
     config_path: &PathBuf,
@@ -199,7 +198,6 @@ pub(super) fn reload_config(
     Some(next_manifest)
 }
 
-
 /// Spawn the hot-reload watcher task.
 ///
 /// Uses `notify` (inotify on Linux) to detect file changes instantly.

src/config/load.rs

@@ -23,7 +23,6 @@ mod strict_keys;
 // Precomputed user authentication data for handshake hot paths.
 mod runtime_auth;
 // Post-deserialization validation helpers.
-mod validation;
 mod decode;
 mod effective;
 mod pipeline;
@@ -31,6 +30,7 @@ mod validate_core;
 mod validate_me;
 mod validate_runtime;
 mod validate_server;
+mod validation;
 
 use self::includes::{hash_rendered_snapshot, normalize_config_path, preprocess_includes};
 use self::normalize::{
@@ -41,8 +41,8 @@ use self::normalize::{
 pub(crate) use self::runtime_auth::UserAuthSnapshot;
 use self::strict_keys::handle_unknown_config_keys;
 use self::validation::{
-    normalize_upstream_family_policy, validate_listener_runtime_profiles,
+    normalize_upstream_family_policy, validate_listener_runtime_profiles, validate_logging_config,
-    validate_logging_config, validate_network_cfg, validate_upstreams,
+    validate_network_cfg, validate_upstreams,
 };
 
 const MAX_ME_WRITER_CMD_CHANNEL_CAPACITY: usize = 16_384;

src/config/load/decode.rs

@@ -50,8 +50,7 @@ pub(super) fn decode_source_graph(graph: ConfigSourceGraph) -> Result<DecodedSou
         .unwrap_or(false);
     let legacy_top_level_beobachten = parsed_toml.get("beobachten").cloned();
     let legacy_top_level_beobachten_minutes = parsed_toml.get("beobachten_minutes").cloned();
-    let legacy_top_level_beobachten_flush_secs =
+    let legacy_top_level_beobachten_flush_secs = parsed_toml.get("beobachten_flush_secs").cloned();
-        parsed_toml.get("beobachten_flush_secs").cloned();
     let legacy_top_level_beobachten_file = parsed_toml.get("beobachten_file").cloned();
     let stun_servers_is_explicit = network_table
         .map(|table| table.contains_key("stun_servers"))
@@ -100,9 +99,7 @@ pub(super) fn decode_source_graph(graph: ConfigSourceGraph) -> Result<DecodedSou
         && let Some(value) = legacy_top_level_beobachten_flush_secs.as_ref()
     {
         let raw = value.as_integer().ok_or_else(|| {
-            ProxyError::Config(
+            ProxyError::Config("beobachten_flush_secs (top-level) must be an integer".to_string())
-                "beobachten_flush_secs (top-level) must be an integer".to_string(),
-            )
         })?;
         let parsed = u64::try_from(raw).map_err(|_| {
             ProxyError::Config(
@@ -112,9 +109,7 @@ pub(super) fn decode_source_graph(graph: ConfigSourceGraph) -> Result<DecodedSou
         config.general.beobachten_flush_secs = parsed;
         legacy_beobachten_applied = true;
     }
-    if !beobachten_file_is_explicit
+    if !beobachten_file_is_explicit && let Some(value) = legacy_top_level_beobachten_file.as_ref() {
-        && let Some(value) = legacy_top_level_beobachten_file.as_ref()
-    {
         let parsed = value.as_str().ok_or_else(|| {
             ProxyError::Config("beobachten_file (top-level) must be a string".to_string())
         })?;
@@ -126,8 +121,7 @@ pub(super) fn decode_source_graph(graph: ConfigSourceGraph) -> Result<DecodedSou
     }
 
     let legacy_nat_stun = config.general.middle_proxy_nat_stun.take();
-    let legacy_nat_stun_servers =
+    let legacy_nat_stun_servers = std::mem::take(&mut config.general.middle_proxy_nat_stun_servers);
-        std::mem::take(&mut config.general.middle_proxy_nat_stun_servers);
     let legacy_nat_stun_used = legacy_nat_stun.is_some() || !legacy_nat_stun_servers.is_empty();
     if stun_servers_is_explicit {
         let mut explicit_stun_servers = Vec::new();

src/config/load/effective.rs

@@ -45,12 +45,10 @@ pub(super) fn apply(config: &mut ProxyConfig) -> Result<()> {
     }
 
     let mut exclusive_mask = HashMap::with_capacity(config.censorship.exclusive_mask.len());
-    let mut exclusive_mask_targets =
+    let mut exclusive_mask_targets = HashMap::with_capacity(config.censorship.exclusive_mask.len());
-        HashMap::with_capacity(config.censorship.exclusive_mask.len());
     for (domain, target) in std::mem::take(&mut config.censorship.exclusive_mask) {
         let domain = normalize_domain_to_ascii(&domain, "censorship.exclusive_mask domain")?;
-        let target =
+        let target = normalize_exclusive_mask_target(&target, "censorship.exclusive_mask target")?;
-            normalize_exclusive_mask_target(&target, "censorship.exclusive_mask target")?;
         let Some((host, port)) = parse_exclusive_mask_target(&target) else {
             return Err(ProxyError::Config(format!(
                 "Invalid censorship.exclusive_mask target for '{}': '{}'. Expected host:port with port > 0",

src/config/load/validate_core.rs

@@ -207,8 +207,7 @@ pub(super) fn validate(config: &mut ProxyConfig) -> Result<()> {
         ));
     }
 
-    if config.timeouts.relay_client_idle_hard_secs < config.timeouts.relay_client_idle_soft_secs
+    if config.timeouts.relay_client_idle_hard_secs < config.timeouts.relay_client_idle_soft_secs {
-    {
         return Err(ProxyError::Config(
             "timeouts.relay_client_idle_hard_secs must be >= timeouts.relay_client_idle_soft_secs"
                 .to_string(),

src/config/load/validate_me.rs

@@ -168,8 +168,7 @@ pub(super) fn validate(config: &mut ProxyConfig) -> Result<()> {
     }
     if config.general.me_route_backpressure_base_timeout_ms > 5000 {
         return Err(ProxyError::Config(
-            "general.me_route_backpressure_base_timeout_ms must be within [1, 5000]"
+            "general.me_route_backpressure_base_timeout_ms must be within [1, 5000]".to_string(),
-                .to_string(),
         ));
     }
 
@@ -182,15 +181,13 @@ pub(super) fn validate(config: &mut ProxyConfig) -> Result<()> {
     }
     if config.general.me_route_backpressure_high_timeout_ms > 5000 {
         return Err(ProxyError::Config(
-            "general.me_route_backpressure_high_timeout_ms must be within [1, 5000]"
+            "general.me_route_backpressure_high_timeout_ms must be within [1, 5000]".to_string(),
-                .to_string(),
         ));
     }
 
     if !(1..=100).contains(&config.general.me_route_backpressure_high_watermark_pct) {
         return Err(ProxyError::Config(
-            "general.me_route_backpressure_high_watermark_pct must be within [1, 100]"
+            "general.me_route_backpressure_high_watermark_pct must be within [1, 100]".to_string(),
-                .to_string(),
         ));
     }
 

src/config/load/validate_runtime.rs

@@ -94,8 +94,7 @@ pub(super) fn validate(config: &mut ProxyConfig) -> Result<()> {
         ));
     }
 
-    if !(4096..=16 * 1024 * 1024)
+    if !(4096..=16 * 1024 * 1024).contains(&config.general.me_d2c_frame_buf_shrink_threshold_bytes)
-        .contains(&config.general.me_d2c_frame_buf_shrink_threshold_bytes)
     {
         return Err(ProxyError::Config(
             "general.me_d2c_frame_buf_shrink_threshold_bytes must be within [4096, 16777216]"
@@ -105,15 +104,13 @@ pub(super) fn validate(config: &mut ProxyConfig) -> Result<()> {
 
     if !(4096..=1024 * 1024).contains(&config.general.direct_relay_copy_buf_c2s_bytes) {
         return Err(ProxyError::Config(
-            "general.direct_relay_copy_buf_c2s_bytes must be within [4096, 1048576]"
+            "general.direct_relay_copy_buf_c2s_bytes must be within [4096, 1048576]".to_string(),
-                .to_string(),
         ));
     }
 
     if !(8192..=2 * 1024 * 1024).contains(&config.general.direct_relay_copy_buf_s2c_bytes) {
         return Err(ProxyError::Config(
-            "general.direct_relay_copy_buf_s2c_bytes must be within [8192, 2097152]"
+            "general.direct_relay_copy_buf_s2c_bytes must be within [8192, 2097152]".to_string(),
-                .to_string(),
         ));
     }
 
@@ -177,8 +174,7 @@ pub(super) fn validate(config: &mut ProxyConfig) -> Result<()> {
         || config.general.me_pool_drain_soft_evict_budget_per_core > 64
     {
         return Err(ProxyError::Config(
-            "general.me_pool_drain_soft_evict_budget_per_core must be within [1, 64]"
+            "general.me_pool_drain_soft_evict_budget_per_core must be within [1, 64]".to_string(),
-                .to_string(),
         ));
     }
 

src/config/load/validate_server.rs

@@ -1,8 +1,7 @@
 use super::*;
 
 pub(super) fn validate(config: &mut ProxyConfig) -> Result<()> {
-    if !(1..=MAX_API_REQUEST_BODY_LIMIT_BYTES)
+    if !(1..=MAX_API_REQUEST_BODY_LIMIT_BYTES).contains(&config.server.api.request_body_limit_bytes)
-        .contains(&config.server.api.request_body_limit_bytes)
     {
         return Err(ProxyError::Config(
             "server.api.request_body_limit_bytes must be within [1, 1048576]".to_string(),

src/config/mod.rs

@@ -5,6 +5,6 @@ pub mod hot_reload;
 mod load;
 mod types;
 
-pub(crate) use load::{ConfigSourceGraph, LoadedConfig};
 pub use load::ProxyConfig;
+pub(crate) use load::{ConfigSourceGraph, LoadedConfig};
 pub use types::*;

src/config/tests/load_basic_tests/api_tests.rs

@@ -22,7 +22,6 @@ fn api_minimal_runtime_cache_ttl_out_of_range_is_rejected() {
     let _ = std::fs::remove_file(path);
 }
 
-
 #[test]
 fn api_runtime_edge_cache_ttl_out_of_range_is_rejected() {
     let toml = r#"
@@ -88,4 +87,3 @@ fn api_runtime_edge_events_capacity_out_of_range_is_rejected() {
     assert!(err.contains("server.api.runtime_edge_events_capacity must be within [16, 4096]"));
     let _ = std::fs::remove_file(path);
 }
-

src/config/tests/load_basic_tests/conntrack_tests.rs

@@ -173,4 +173,3 @@ fn force_close_bumped_when_below_drain_ttl() {
     assert_eq!(cfg.general.me_reinit_drain_timeout_secs, 90);
     let _ = std::fs::remove_file(path);
 }
-

src/config/tests/load_basic_tests/defaults_access_tests.rs

@@ -476,4 +476,3 @@ fn impl_defaults_are_sourced_from_default_helpers() {
         default_user_max_tcp_conns_global_each()
     );
 }
-

src/config/tests/load_basic_tests/legacy_policy_tests.rs

@@ -422,4 +422,3 @@ fn update_every_zero_is_rejected() {
     assert!(err.contains("general.update_every must be > 0"));
     let _ = std::fs::remove_file(path);
 }
-

src/config/tests/load_basic_tests/me_route_tests.rs

@@ -334,4 +334,3 @@ fn me_pool_min_fresh_ratio_out_of_range_is_rejected() {
     assert!(err.contains("general.me_pool_min_fresh_ratio must be within [0.0, 1.0]"));
     let _ = std::fs::remove_file(path);
 }
-

src/config/tests/load_basic_tests/me_startup_tests.rs

@@ -302,4 +302,3 @@ fn rpc_proxy_req_every_zero_and_valid_range_are_accepted() {
     assert_eq!(cfg_valid.general.rpc_proxy_req_every, 40);
     let _ = std::fs::remove_file(path_valid);
 }
-

src/config/tests/load_basic_tests/synlimit_mss_tests.rs

@@ -117,7 +117,6 @@ fn synlimit_synfix_zero_values_are_rejected() {
     }
 }
 
-
 #[test]
 fn client_mss_presets_and_listener_override_are_resolved() {
     let toml = r#"
@@ -366,4 +365,3 @@ fn listener_client_mss_invalid_preset_is_rejected() {
     assert!(err.contains("must be \"\", extreme-low, tspu, 2in8"));
     let _ = std::fs::remove_file(path);
 }
-

src/config/tests/load_basic_tests/tls_fetch_tests.rs

@@ -183,4 +183,3 @@ fn valid_ad_tag_is_preserved_during_load() {
     );
     let _ = std::fs::remove_file(path);
 }
-

src/config/types.rs

@@ -28,14 +28,23 @@ pub use access::{AccessConfig, CidrRateLimitKey, RateLimitBps};
 #[allow(unused_imports)]
 pub(crate) use access::{CidrAutoTemplate, CidrAutoTemplateFamily};
 pub use api::{ApiConfig, ApiGrayAction};
-pub use censorship::{AntiCensorshipConfig, ExclusiveMaskTarget, TlsFetchConfig, TlsFetchProfile, UnknownSniAction};
+pub use censorship::{
+    AntiCensorshipConfig, ExclusiveMaskTarget, TlsFetchConfig, TlsFetchProfile, UnknownSniAction,
+};
 pub use general::GeneralConfig;
 pub use links::{LinksConfig, ShowLink};
-pub use logging::{LogLevel, LoggingConfig, LoggingDestination, LogRotation};
+pub use logging::{LogLevel, LogRotation, LoggingConfig, LoggingDestination};
 pub use network::{NetworkConfig, ProxyModes, UpstreamConfig, UpstreamType};
-pub use policies::{MeBindStaleMode, MeFloorMode, MeRouteNoWriterMode, MeSocksKdfPolicy, MeTelemetryLevel, MeWriterPickMode, RstOnCloseMode, TelemetryConfig, UserMaxUniqueIpsMode};
+pub use policies::{
+    MeBindStaleMode, MeFloorMode, MeRouteNoWriterMode, MeSocksKdfPolicy, MeTelemetryLevel,
+    MeWriterPickMode, RstOnCloseMode, TelemetryConfig, UserMaxUniqueIpsMode,
+};
 #[allow(unused_imports)]
-pub use server::{CLIENT_MSS_2IN8, CLIENT_MSS_EXTREME_LOW, CLIENT_MSS_MAX, CLIENT_MSS_MIN, CLIENT_MSS_TSPU, ConntrackBackend, ConntrackControlConfig, ConntrackMode, ConntrackPressureProfile, ListenerConfig, ServerConfig, SynLimitMode, TimeoutsConfig};
+pub use server::{
+    CLIENT_MSS_2IN8, CLIENT_MSS_EXTREME_LOW, CLIENT_MSS_MAX, CLIENT_MSS_MIN, CLIENT_MSS_TSPU,
+    ConntrackBackend, ConntrackControlConfig, ConntrackMode, ConntrackPressureProfile,
+    ListenerConfig, ServerConfig, SynLimitMode, TimeoutsConfig,
+};
 
 fn default_quota_state_path() -> PathBuf {
     PathBuf::from("telemt.limit.json")

src/config/types/links.rs

@@ -28,7 +28,6 @@ impl Default for LinksConfig {
     }
 }
 
-
 /// In TOML, this can be:
 /// - `show_link = "*"`          — show links for all users
 /// - `show_link = ["a", "b"]`   — show links for specific users

src/config/types/policies.rs

@@ -227,4 +227,3 @@ impl Default for TelemetryConfig {
         }
     }
 }
-

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::{
+use crate::startup::{COMPONENT_CONFIG_LOAD, COMPONENT_TRACING_INIT, StartupTracker};
-    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
+            task.await.map_err(|error_value| {
-                .map_err(|error_value| format!("listener {} task failed: {error_value}", self.spec.addr))?;
+                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(
+pub(super) fn prepare_listener(spec: ListenerBindSpec) -> std::io::Result<PreparedTcpListener> {
-    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::{
+use super::bind::{BoundListeners, BoundTcpListener, PreparedTcpListener, prepare_listener};
-    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(
+fn listener_port_or_legacy(listener: &crate::config::ListenerConfig, server: &ServerConfig) -> u16 {
-    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 =
+                let fake_peer = SocketAddr::from(([127, 0, 0, 1], (connection_id % 65535) as u16));
-                    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::{
+use crate::proxy::direct_buffer_budget::{DirectBufferBudget, resolve_direct_buffer_hard_limit};
-    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,8 +260,8 @@ impl ReloadControl {
             .active_generation
             .load(Ordering::Acquire)
             .saturating_add(1);
-        let status = self
+        let status =
-            .status_store
+            self.status_store
                 .reserve(target_generation, config_revision, request.clone())?;
         Ok(ReloadReservation {
             permit: Some(permit),

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(
+            .set_deferred_fields(command.reload_id, resolved.deferred_process_fields.clone())
-                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
+    let unsupported_identity_change =
-        && !listener_rebind_supported(old, desired);
+        !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()
+    if serde_json::to_value(&old.logging).ok() != serde_json::to_value(&desired.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::{
+use crate::proxy::direct_buffer_budget::{DirectBufferBudget, run_direct_buffer_budget_controller};
-    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_DC_CONNECTIVITY_PING, COMPONENT_ME_CONNECTIVITY_PING, COMPONENT_ME_POOL_CONSTRUCT,
-    COMPONENT_ME_POOL_CONSTRUCT, COMPONENT_ME_POOL_INIT_STAGE1, COMPONENT_ME_PROXY_CONFIG_V4,
+    COMPONENT_ME_POOL_INIT_STAGE1, COMPONENT_ME_PROXY_CONFIG_V4, COMPONENT_ME_PROXY_CONFIG_V6,
-    COMPONENT_ME_PROXY_CONFIG_V6, COMPONENT_ME_SECRET_FETCH, StartupMeStatus, StartupTracker,
+    COMPONENT_ME_SECRET_FETCH, StartupMeStatus, StartupTracker,
 };
 use crate::stats::beobachten::BeobachtenStore;
 use crate::stats::{ReplayChecker, Stats};

src/proxy/handshake.rs

@@ -69,13 +69,14 @@ pub(crate) use self::tls_handshake::handle_tls_handshake_with_shared_and_options
 #[cfg(test)]
 pub(crate) use self::auth_probe::{
     auth_probe_fail_streak_for_testing_in_shared, auth_probe_is_throttled_for_testing_in_shared,
-    auth_probe_record_failure_for_testing, auth_probe_saturation_is_throttled_at_for_testing_in_shared,
+    auth_probe_record_failure_for_testing,
+    auth_probe_saturation_is_throttled_at_for_testing_in_shared,
     auth_probe_saturation_is_throttled_for_testing_in_shared,
     auth_probe_saturation_state_for_testing_in_shared,
     auth_probe_saturation_state_lock_for_testing_in_shared, auth_probe_state_for_testing_in_shared,
-    clear_auth_probe_state_for_testing_in_shared, clear_unknown_sni_warn_state_for_testing_in_shared,
+    clear_auth_probe_state_for_testing_in_shared,
-    clear_warned_secrets_for_testing_in_shared, should_emit_unknown_sni_warn_for_testing_in_shared,
+    clear_unknown_sni_warn_state_for_testing_in_shared, clear_warned_secrets_for_testing_in_shared,
-    warned_secrets_for_testing_in_shared,
+    should_emit_unknown_sni_warn_for_testing_in_shared, warned_secrets_for_testing_in_shared,
 };
 
 const ACCESS_SECRET_BYTES: usize = 16;

src/proxy/handshake/auth_candidates.rs

@@ -44,7 +44,10 @@ pub(super) fn sticky_hint_get_by_ip(shared: &ProxySharedState, peer_ip: IpAddr)
         .map(|entry| *entry)
 }
 
-pub(super) fn sticky_hint_get_by_ip_prefix(shared: &ProxySharedState, peer_ip: IpAddr) -> Option<u32> {
+pub(super) fn sticky_hint_get_by_ip_prefix(
+    shared: &ProxySharedState,
+    peer_ip: IpAddr,
+) -> Option<u32> {
     shared
         .handshake
         .sticky_user_by_ip_prefix
@@ -104,7 +107,11 @@ pub(super) fn record_recent_user_success_in(shared: &ProxySharedState, user_id:
     ring[idx].store(user_id.saturating_add(1), Ordering::Relaxed);
 }
 
-pub(super) fn mark_candidate_if_new(tried_user_ids: &mut [u32], tried_len: &mut usize, user_id: u32) -> bool {
+pub(super) fn mark_candidate_if_new(
+    tried_user_ids: &mut [u32],
+    tried_len: &mut usize,
+    user_id: u32,
+) -> bool {
     if tried_user_ids[..*tried_len].contains(&user_id) {
         return false;
     }
@@ -222,7 +229,11 @@ pub(super) fn warn_invalid_secret_once_in(
     }
 }
 
-pub(super) fn decode_user_secret(shared: &ProxySharedState, name: &str, secret_hex: &str) -> Option<Vec<u8>> {
+pub(super) fn decode_user_secret(
+    shared: &ProxySharedState,
+    name: &str,
+    secret_hex: &str,
+) -> Option<Vec<u8>> {
     match hex::decode(secret_hex) {
         Ok(bytes) if bytes.len() == ACCESS_SECRET_BYTES => Some(bytes),
         Ok(bytes) => {
@@ -251,7 +262,11 @@ pub(super) fn decode_user_secret(shared: &ProxySharedState, name: &str, secret_h
 // over TCP (DD). Enforcing this separation prevents an attacker from using a
 // TLS-capable client to bypass the operator intent for the direct MTProto mode,
 // and vice versa.
-pub(super) fn mode_enabled_for_proto(config: &ProxyConfig, proto_tag: ProtoTag, is_tls: bool) -> bool {
+pub(super) fn mode_enabled_for_proto(
+    config: &ProxyConfig,
+    proto_tag: ProtoTag,
+    is_tls: bool,
+) -> bool {
     match proto_tag {
         ProtoTag::Secure => {
             if is_tls {
@@ -289,4 +304,3 @@ pub(super) fn decode_user_secrets_in(
 
     secrets
 }
-

src/proxy/handshake/auth_probe.rs

@@ -86,7 +86,11 @@ pub(super) fn auth_probe_scan_start_offset_in(
     auth_probe_eviction_offset_in(shared, peer_ip, now) % state_len
 }
 
-pub(super) fn auth_probe_is_throttled_in(shared: &ProxySharedState, peer_ip: IpAddr, now: Instant) -> bool {
+pub(super) fn auth_probe_is_throttled_in(
+    shared: &ProxySharedState,
+    peer_ip: IpAddr,
+    now: Instant,
+) -> bool {
     let peer_ip = normalize_auth_probe_ip(peer_ip);
     let state = &shared.handshake.auth_probe;
     let Some(entry) = state.get(&peer_ip) else {
@@ -135,7 +139,10 @@ pub(super) fn auth_probe_should_apply_preauth_throttle_in(
     auth_probe_saturation_grace_exhausted_in(shared, peer_ip, now)
 }
 
-pub(super) fn auth_probe_saturation_is_throttled_in(shared: &ProxySharedState, now: Instant) -> bool {
+pub(super) fn auth_probe_saturation_is_throttled_in(
+    shared: &ProxySharedState,
+    now: Instant,
+) -> bool {
     let mut guard = shared
         .handshake
         .auth_probe_saturation
@@ -198,7 +205,11 @@ pub(super) fn auth_probe_note_expensive_invalid_scan_in(
     auth_probe_note_saturation_in(shared, now);
 }
 
-pub(super) fn auth_probe_record_failure_in(shared: &ProxySharedState, peer_ip: IpAddr, now: Instant) {
+pub(super) fn auth_probe_record_failure_in(
+    shared: &ProxySharedState,
+    peer_ip: IpAddr,
+    now: Instant,
+) {
     let peer_ip = normalize_auth_probe_ip(peer_ip);
     let state = &shared.handshake.auth_probe;
     auth_probe_record_failure_with_state_in(shared, state, peer_ip, now);
@@ -504,5 +515,3 @@ pub(super) async fn maybe_apply_server_hello_delay(config: &ProxyConfig) {
         tokio::time::sleep(Duration::from_millis(delay_ms)).await;
     }
 }
-
-

src/proxy/handshake/mtproto.rs

@@ -417,4 +417,3 @@ where
     debug!(peer = %peer, "MTProto handshake: no matching user found");
     HandshakeResult::BadClient { reader, writer }
 }
-

src/proxy/handshake/nonce.rs

@@ -96,4 +96,3 @@ pub fn encrypt_tg_nonce(nonce: &[u8; HANDSHAKE_LEN]) -> Vec<u8> {
     let (encrypted, _, _) = encrypt_tg_nonce_with_ciphers(nonce);
     encrypted
 }
-

src/proxy/handshake/session.rs

@@ -32,4 +32,3 @@ impl Drop for HandshakeSuccess {
         self.enc_iv.zeroize();
     }
 }
-

src/proxy/handshake/tls_handshake.rs

@@ -237,7 +237,6 @@ where
         }
     }
 
-
     let Some(validation) = tls_validation::validate_tls_client(
         handshake,
         peer,
@@ -422,4 +421,3 @@ async fn write_tls_response<W: AsyncWrite + Unpin>(
     writer.write_all(response).await?;
     writer.flush().await
 }
-

src/synlimit_control/mod.rs

@@ -78,9 +78,7 @@ pub(crate) async fn clear_synlimit_rules_all_backends() -> Result<bool, String>
 
 async fn clear_synlimit_rules_for_namespace(namespace: &SynLimitNamespace) -> Result<bool, String> {
     if !has_firewall_privileges() {
-        return Err(
+        return Err("SYN limiter cleanup requires root or CAP_NET_ADMIN privileges".to_string());
-            "SYN limiter cleanup requires root or CAP_NET_ADMIN privileges".to_string(),
-        );
     }
 
     let mut errors = Vec::new();

src/synlimit_control/pf.rs

@@ -31,7 +31,12 @@ pub(super) async fn apply_synlimit_rules(
     }
 
     let script = pf_synlimit_script(targets);
-    run_command("pfctl", &["-a", namespace.pf_anchor.as_str(), "-f", "-"], Some(script)).await
+    run_command(
+        "pfctl",
+        &["-a", namespace.pf_anchor.as_str(), "-f", "-"],
+        Some(script),
+    )
+    .await
 }
 
 async fn has_pf_anchor_hook() -> Result<bool, String> {
@@ -98,7 +103,10 @@ mod tests {
     #[test]
     fn pf_script_uses_native_rate_limited_pass() {
         let mut targets = SynLimitTargets::default();
-        targets.pf_v4 = vec![test_rule(Some(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 7))), 443)];
+        targets.pf_v4 = vec![test_rule(
+            Some(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 7))),
+            443,
+        )];
         let script = pf_synlimit_script(&targets);
 
         assert!(script.contains(

src/synlimit_control/pf_runtime_tests.rs

@@ -29,10 +29,7 @@ fn targets(low_family: &str) -> SynLimitTargets {
         _ => panic!("TELEMT_PF_LOW_FAMILY must be v4 or v6"),
     };
     SynLimitTargets {
-        pf_v4: vec![rule(
+        pf_v4: vec![rule(IpAddr::V4(Ipv4Addr::new(198, 18, 1, 1)), v4_rate)],
-            IpAddr::V4(Ipv4Addr::new(198, 18, 1, 1)),
-            v4_rate,
-        )],
         pf_v6: vec![rule(
             IpAddr::V6("fd00:18:1::1".parse::<Ipv6Addr>().unwrap()),
             v6_rate,

src/transport/socket/fragmented_send_wire_tests.rs

@@ -133,8 +133,7 @@ async fn run_server(addr: SocketAddr, fragment_size: u16, fake_cert_len: usize)
     let replay_checker = ReplayChecker::new(128, Duration::from_secs(60));
     let rng = SecureRandom::new();
     let shared = ProxySharedState::new();
-    let (tls_reader, mut tls_writer, user) = match
+    let (tls_reader, mut tls_writer, user) = match handle_tls_handshake_with_shared_and_options(
-        handle_tls_handshake_with_shared_and_options(
         &client_hello,
         read_half,
         write_half,
@@ -152,7 +151,10 @@ async fn run_server(addr: SocketAddr, fragment_size: u16, fake_cert_len: usize)
         _ => panic!("wire-test FakeTLS authentication failed"),
     };
     assert_eq!(user, "wire");
-    tls_writer.write_all(&vec![0xA5; BULK_PAYLOAD_LEN]).await.unwrap();
+    tls_writer
+        .write_all(&vec![0xA5; BULK_PAYLOAD_LEN])
+        .await
+        .unwrap();
     tls_writer.shutdown().await.unwrap();
     drop(tls_reader);
     // SAFETY: the write half still owns the accepted socket while it is borrowed.

src/transport/socket/tests.rs

@@ -351,9 +351,7 @@ async fn test_chunked_send_has_no_fd_growth_after_success_and_cancellation_stres
         send_tcp_fragmented_fd(success_fd, &[0x5A], 92)
             .await
             .unwrap_or_else(|error| {
-                panic!(
+                panic!("success cycle {iteration} failed with MSS {success_mss_before}: {error}")
-                    "success cycle {iteration} failed with MSS {success_mss_before}: {error}"
-                )
             });
         let mut received = [0_u8; 1];
         success_client.read_exact(&mut received).await.unwrap();