From 851c942c1032292cdef065610b157fdf67c0ad4d Mon Sep 17 00:00:00 2001 From: Sn0wo2 <152751263+Sn0wo2@users.noreply.github.com> Date: Sun, 26 Jul 2026 07:07:37 +0000 Subject: [PATCH] fix: auto-fix formatting issues --- crates/prism/src/outbound/mod.rs | 3 +-- src/config/loader.rs | 8 ++++++-- src/config/mod.rs | 22 +++++++++++----------- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/crates/prism/src/outbound/mod.rs b/crates/prism/src/outbound/mod.rs index d1ab222..194e595 100644 --- a/crates/prism/src/outbound/mod.rs +++ b/crates/prism/src/outbound/mod.rs @@ -23,8 +23,7 @@ pub async fn connect_addr( let started = Instant::now(); trace!(target_addr = %target_addr, "[CONNECT/OUTBOUND] starting upstream connection"); - let connect_timeout = - Duration::from_millis(config.network.socket.upstream_connect_timeout_ms); + let connect_timeout = Duration::from_millis(config.network.socket.upstream_connect_timeout_ms); match timeout(connect_timeout, try_connect(target_addr, config)).await { Ok(result) => result, Err(_) => { diff --git a/src/config/loader.rs b/src/config/loader.rs index 0d7143d..5be4b02 100644 --- a/src/config/loader.rs +++ b/src/config/loader.rs @@ -31,9 +31,13 @@ impl ConfigLoader { } fn load_from_str_inner(content: &str, path: &Path) -> Result { - eprintln!("DEBUG: load_from_str_inner called with content:\n{}", content); + eprintln!( + "DEBUG: load_from_str_inner called with content:\n{}", + content + ); // Parse as generic TOML table first to avoid serde(flatten) issues - let table: toml::Table = content.parse() + let table: toml::Table = content + .parse() .with_context(|| format!("failed to parse TOML config {}", path.display()))?; eprintln!("DEBUG: parsed table: {:?}", table); diff --git a/src/config/mod.rs b/src/config/mod.rs index 150eea1..8921be0 100644 --- a/src/config/mod.rs +++ b/src/config/mod.rs @@ -73,7 +73,7 @@ impl Serialize for NecronPrismConfig { { use serde::ser::SerializeMap; let mut map = serializer.serialize_map(None)?; - + // Serialize prism fields at top level (flatten) if let Ok(value) = toml::Value::try_from(&self.prism) { if let toml::Value::Table(table) = value { @@ -82,10 +82,10 @@ impl Serialize for NecronPrismConfig { } } } - + // Serialize api as a nested table map.serialize_entry("api", &self.api)?; - + map.end() } } @@ -96,23 +96,23 @@ impl<'de> Deserialize<'de> for NecronPrismConfig { D: serde::Deserializer<'de>, { use serde::de::MapAccess; - + struct NecronPrismConfigVisitor; - + impl<'de> serde::de::Visitor<'de> for NecronPrismConfigVisitor { type Value = NecronPrismConfig; - + fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result { formatter.write_str("a TOML table") } - + fn visit_map(self, mut map: M) -> std::result::Result where M: MapAccess<'de>, { let mut api: Option = None; let mut prism_fields = toml::map::Map::new(); - + while let Some(key) = map.next_key::()? { if key == "api" { api = Some(map.next_value()?); @@ -121,19 +121,19 @@ impl<'de> Deserialize<'de> for NecronPrismConfig { prism_fields.insert(key, value); } } - + // Use toml::Value as a serde deserializer directly let prism_value = toml::Value::Table(prism_fields); let prism = Config::deserialize(prism_value.into_deserializer()) .map_err(serde::de::Error::custom)?; - + Ok(NecronPrismConfig { prism, api: api.unwrap_or_default(), }) } } - + deserializer.deserialize_map(NecronPrismConfigVisitor) } }