From 80887ce8596929f5fb091542872fbef1493681fd Mon Sep 17 00:00:00 2001 From: Stan Grams Date: Mon, 30 Mar 2026 21:25:14 +0200 Subject: [PATCH] [style](trx-rs): cargo fmt Co-Authored-By: Claude Opus 4.6 Signed-off-by: Stan Grams --- src/trx-client/src/config.rs | 6 ++++- .../trx-frontend-http/src/api/sse.rs | 6 +---- .../src/background_decode.rs | 4 +-- src/trx-protocol/src/decoders.rs | 25 ++++++------------- 4 files changed, 14 insertions(+), 27 deletions(-) diff --git a/src/trx-client/src/config.rs b/src/trx-client/src/config.rs index a3662ac..d241728 100644 --- a/src/trx-client/src/config.rs +++ b/src/trx-client/src/config.rs @@ -1190,7 +1190,11 @@ url = "remote.example.com:4530" for region in &["iaru_r1", "iaru_r2", "iaru_r3"] { let mut config = ClientConfig::default(); config.frontends.http.bandplan_region = region.to_string(); - assert!(config.validate().is_ok(), "region {} should be valid", region); + assert!( + config.validate().is_ok(), + "region {} should be valid", + region + ); } } diff --git a/src/trx-client/trx-frontend/trx-frontend-http/src/api/sse.rs b/src/trx-client/trx-frontend/trx-frontend-http/src/api/sse.rs index bf9f01e..2bfcb9e 100644 --- a/src/trx-client/trx-frontend/trx-frontend-http/src/api/sse.rs +++ b/src/trx-client/trx-frontend/trx-frontend-http/src/api/sse.rs @@ -135,11 +135,7 @@ fn sync_scheduler_vchannels( } fn bookmark_decoder_kinds(bookmark: &crate::server::bookmarks::Bookmark) -> Vec { - trx_protocol::decoders::resolve_bookmark_decoders( - &bookmark.decoders, - &bookmark.mode, - true, - ) + trx_protocol::decoders::resolve_bookmark_decoders(&bookmark.decoders, &bookmark.mode, true) } // ============================================================================ diff --git a/src/trx-client/trx-frontend/trx-frontend-http/src/background_decode.rs b/src/trx-client/trx-frontend/trx-frontend-http/src/background_decode.rs index c8f4f37..fa0e961 100644 --- a/src/trx-client/trx-frontend/trx-frontend-http/src/background_decode.rs +++ b/src/trx-client/trx-frontend/trx-frontend-http/src/background_decode.rs @@ -232,9 +232,7 @@ impl BackgroundDecodeManager { bookmark_name: bookmark.map(|item| item.name.clone()), freq_hz: bookmark.map(|item| item.freq_hz), mode: bookmark.map(|item| item.mode.clone()), - decoder_kinds: bookmark - .map(bookmark_decoder_kinds) - .unwrap_or_default(), + decoder_kinds: bookmark.map(bookmark_decoder_kinds).unwrap_or_default(), state: "inactive".to_string(), channel_kind: None, } diff --git a/src/trx-protocol/src/decoders.rs b/src/trx-protocol/src/decoders.rs index 6eb7b33..6b3cffa 100644 --- a/src/trx-protocol/src/decoders.rs +++ b/src/trx-protocol/src/decoders.rs @@ -149,9 +149,9 @@ pub fn resolve_bookmark_decoders( .iter() .map(|s| s.trim().to_ascii_lowercase()) .filter(|s| { - DECODER_REGISTRY.iter().any(|d| { - d.id == s.as_str() && (!background_only || d.background_decode) - }) + DECODER_REGISTRY + .iter() + .any(|d| d.id == s.as_str() && (!background_only || d.background_decode)) }) .fold(Vec::new(), |mut acc, s| { if !acc.contains(&s) { @@ -187,21 +187,14 @@ mod tests { #[test] fn explicit_decoders_filtered() { - let result = resolve_bookmark_decoders( - &["ft8".into(), "bogus".into(), "ft4".into()], - "USB", - false, - ); + let result = + resolve_bookmark_decoders(&["ft8".into(), "bogus".into(), "ft4".into()], "USB", false); assert_eq!(result, vec!["ft8", "ft4"]); } #[test] fn explicit_decoders_deduped() { - let result = resolve_bookmark_decoders( - &["ft8".into(), "FT8".into()], - "USB", - false, - ); + let result = resolve_bookmark_decoders(&["ft8".into(), "FT8".into()], "USB", false); assert_eq!(result, vec!["ft8"]); } @@ -225,11 +218,7 @@ mod tests { #[test] fn background_only_filters_lrpt() { - let result = resolve_bookmark_decoders( - &["lrpt".into(), "ft8".into()], - "DIG", - true, - ); + let result = resolve_bookmark_decoders(&["lrpt".into(), "ft8".into()], "DIG", true); assert_eq!(result, vec!["ft8"]); }