From dfe027a5f3e660416b72a7b5442b3c7a04bdfb17 Mon Sep 17 00:00:00 2001 From: archipelago Date: Thu, 6 Aug 2026 10:49:15 -0400 Subject: [PATCH] style: cargo fmt (rnode_settings) Co-Authored-By: Claude Fable 5 --- core/archipelago/src/mesh/rnode_settings.rs | 51 ++++++++++++++++----- 1 file changed, 39 insertions(+), 12 deletions(-) diff --git a/core/archipelago/src/mesh/rnode_settings.rs b/core/archipelago/src/mesh/rnode_settings.rs index be72be55..89dc6f5e 100644 --- a/core/archipelago/src/mesh/rnode_settings.rs +++ b/core/archipelago/src/mesh/rnode_settings.rs @@ -117,7 +117,10 @@ impl RNodeRfSettings { bail!("coding rate {} is outside 5–8", self.coding_rate); } if self.txpower > 22 { - bail!("tx power {} dBm is above the 22 dBm RNode maximum", self.txpower); + bail!( + "tx power {} dBm is above the 22 dBm RNode maximum", + self.txpower + ); } for (label, v) in [ ("airtime_limit_short", self.airtime_limit_short), @@ -133,9 +136,9 @@ impl RNodeRfSettings { // Same shape the flasher accepts: an absolute device node. Keeps // shell-metacharacter garbage out of the sidecar's argv. if !port.starts_with("/dev/") - || port - .chars() - .any(|c| !(c.is_ascii_alphanumeric() || c == '/' || c == '_' || c == '-' || c == '.')) + || port.chars().any(|c| { + !(c.is_ascii_alphanumeric() || c == '/' || c == '_' || c == '-' || c == '.') + }) { bail!("port must be an absolute /dev device path"); } @@ -345,14 +348,38 @@ mod tests { fn out_of_range_values_are_rejected() { let base = RNodeRfSettings::default(); for bad in [ - RNodeRfSettings { frequency: 100, ..base.clone() }, - RNodeRfSettings { bandwidth: 123_456, ..base.clone() }, - RNodeRfSettings { spreading_factor: 4, ..base.clone() }, - RNodeRfSettings { coding_rate: 9, ..base.clone() }, - RNodeRfSettings { txpower: 23, ..base.clone() }, - RNodeRfSettings { airtime_limit_short: Some(180.0), ..base.clone() }, - RNodeRfSettings { port: Some("ttyACM0".into()), ..base.clone() }, - RNodeRfSettings { port: Some("/dev/tty; rm -rf /".into()), ..base.clone() }, + RNodeRfSettings { + frequency: 100, + ..base.clone() + }, + RNodeRfSettings { + bandwidth: 123_456, + ..base.clone() + }, + RNodeRfSettings { + spreading_factor: 4, + ..base.clone() + }, + RNodeRfSettings { + coding_rate: 9, + ..base.clone() + }, + RNodeRfSettings { + txpower: 23, + ..base.clone() + }, + RNodeRfSettings { + airtime_limit_short: Some(180.0), + ..base.clone() + }, + RNodeRfSettings { + port: Some("ttyACM0".into()), + ..base.clone() + }, + RNodeRfSettings { + port: Some("/dev/tty; rm -rf /".into()), + ..base.clone() + }, ] { assert!(bad.validate().is_err(), "{bad:?} should fail validation"); }