broker parsing: just unwrap_or

src/bin/dual-iir.rs

@@ -200,7 +200,7 @@ const APP: () = {
             stabilizer.cycle_counter,
             env!("CARGO_BIN_NAME"),
             stabilizer.net.mac_address,
-            net::parse_or_default_broker(option_env!("BROKER")),
+            net::parse_ipv4(option_env!("BROKER").unwrap_or("10.34.16.10")),
         );
 
         let generator = network

src/bin/lockin.rs

@@ -241,7 +241,7 @@ const APP: () = {
             stabilizer.cycle_counter,
             env!("CARGO_BIN_NAME"),
             stabilizer.net.mac_address,
-            net::parse_or_default_broker(option_env!("BROKER")),
+            net::parse_ipv4(option_env!("BROKER").unwrap_or("10.34.16.10")),
         );
 
         let generator = network.configure_streaming(

src/net/mod.rs

@@ -209,29 +209,17 @@ pub fn get_device_prefix(
     prefix
 }
 
-/// Determine the broker IP address
+/// Parse a string containing an IPv4 address.
-///
+/// This is a convenience wrapper around the `no_std_net` parser.
-/// # Note
-/// If the broker IP is unspecified or unparseable, the default IP is returned.
 ///
 /// # Args
-/// * `input` - The optionally-specified command-line broker IP address as a string.
+/// * `input` - The IP address as a string.
 ///
 /// # Returns
-/// The broker IP address.
+/// The IP address.
-pub fn parse_or_default_broker(input: Option<&str>) -> IpAddr {
+///
-    input.and_then(|data| {
+/// # Panic
-             data.parse::<minimq::embedded_nal::IpAddr>().map_or_else(
+/// This panics if parsing fails.
-                 |err| {
+pub fn parse_ipv4(input: &str) -> IpAddr {
-                     log::error!(
+    input.parse::<minimq::embedded_nal::IpAddr>().unwrap()
-                         "{:?}: Failed to parse broker IP ({:?}) - Falling back to default",
-                         err,
-                         data
-                     );
-                     None
-                 },
-                 Some,
-             )
-         })
-         .unwrap_or_else(|| DEFAULT_MQTT_BROKER.into())
 }