sjg/trx-rs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[style](trx-rs): cargo fmt

Browse Source 
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Signed-off-by: Stan Grams <sjg@haxx.space>
This commit is contained in:
Stan Grams
2026-03-30 21:25:14 +02:00
parent 92ec851dd0
commit 80887ce859
4 changed files with 14 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/trx-client/src/config.rs
+5 -1
View File
@@ -1190,7 +1190,11 @@ url = "remote.example.com:4530"
for region in &["iaru_r1", "iaru_r2", "iaru_r3"] { for region in &["iaru_r1", "iaru_r2", "iaru_r3"] {
let mut config = ClientConfig::default(); let mut config = ClientConfig::default();
config.frontends.http.bandplan_region = region.to_string(); 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
);
} }
} }
src/trx-client/trx-frontend/trx-frontend-http/src/api/sse.rs
+1 -5
View File
@@ -135,11 +135,7 @@ fn sync_scheduler_vchannels(
} }
fn bookmark_decoder_kinds(bookmark: &crate::server::bookmarks::Bookmark) -> Vec<String> { fn bookmark_decoder_kinds(bookmark: &crate::server::bookmarks::Bookmark) -> Vec<String> {
trx_protocol::decoders::resolve_bookmark_decoders( trx_protocol::decoders::resolve_bookmark_decoders(&bookmark.decoders, &bookmark.mode, true)
&bookmark.decoders,
&bookmark.mode,
true,
)
} }
// ============================================================================ // ============================================================================
src/trx-client/trx-frontend/trx-frontend-http/src/background_decode.rs
+1 -3
View File
@@ -232,9 +232,7 @@ impl BackgroundDecodeManager {
bookmark_name: bookmark.map(|item| item.name.clone()), bookmark_name: bookmark.map(|item| item.name.clone()),
freq_hz: bookmark.map(|item| item.freq_hz), freq_hz: bookmark.map(|item| item.freq_hz),
mode: bookmark.map(|item| item.mode.clone()), mode: bookmark.map(|item| item.mode.clone()),
decoder_kinds: bookmark decoder_kinds: bookmark.map(bookmark_decoder_kinds).unwrap_or_default(),
.map(bookmark_decoder_kinds)
.unwrap_or_default(),
state: "inactive".to_string(), state: "inactive".to_string(),
channel_kind: None, channel_kind: None,
} }
src/trx-protocol/src/decoders.rs
+7 -18
View File
@@ -149,9 +149,9 @@ pub fn resolve_bookmark_decoders(
.iter() .iter()
.map(|s| s.trim().to_ascii_lowercase()) .map(|s| s.trim().to_ascii_lowercase())
.filter(|s| { .filter(|s| {
DECODER_REGISTRY.iter().any(|d| { DECODER_REGISTRY
d.id == s.as_str() && (!background_only || d.background_decode) .iter()
}) .any(|d| d.id == s.as_str() && (!background_only || d.background_decode))
}) })
.fold(Vec::new(), |mut acc, s| { .fold(Vec::new(), |mut acc, s| {
if !acc.contains(&s) { if !acc.contains(&s) {
@@ -187,21 +187,14 @@ mod tests {
#[test] #[test]
fn explicit_decoders_filtered() { fn explicit_decoders_filtered() {
let result = resolve_bookmark_decoders( let result =
&["ft8".into(), "bogus".into(), "ft4".into()], resolve_bookmark_decoders(&["ft8".into(), "bogus".into(), "ft4".into()], "USB", false);
"USB",
false,
);
assert_eq!(result, vec!["ft8", "ft4"]); assert_eq!(result, vec!["ft8", "ft4"]);
} }
#[test] #[test]
fn explicit_decoders_deduped() { fn explicit_decoders_deduped() {
let result = resolve_bookmark_decoders( let result = resolve_bookmark_decoders(&["ft8".into(), "FT8".into()], "USB", false);
&["ft8".into(), "FT8".into()],
"USB",
false,
);
assert_eq!(result, vec!["ft8"]); assert_eq!(result, vec!["ft8"]);
} }
@@ -225,11 +218,7 @@ mod tests {
#[test] #[test]
fn background_only_filters_lrpt() { fn background_only_filters_lrpt() {
let result = resolve_bookmark_decoders( let result = resolve_bookmark_decoders(&["lrpt".into(), "ft8".into()], "DIG", true);
&["lrpt".into(), "ft8".into()],
"DIG",
true,
);
assert_eq!(result, vec!["ft8"]); assert_eq!(result, vec!["ft8"]);
} }