Minor fmt + lint tweaks.

oxidecomputer · May 29, 2024 · 536b40c · 536b40c
1 parent 4c40916
commit 536b40c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/illumos-utils/src/opte/port_manager.rs b/illumos-utils/src/opte/port_manager.rs
@@ -447,7 +447,7 @@ impl PortManager {
         if let Some(blocks) = &nic.transit_ips {
             for block in blocks {
                 #[cfg(target_os = "illumos")]
-                hdl.allow_cidr(&port_name, super::net_to_cidr(*block));
+                hdl.allow_cidr(&port_name, super::net_to_cidr(*block))?;
 
                 debug!(
                     self.inner.log,

diff --git a/nexus/db-model/src/network_interface.rs b/nexus/db-model/src/network_interface.rs
@@ -104,7 +104,9 @@ impl NetworkInterface {
             vni: external::Vni::try_from(0).unwrap(),
             primary: self.primary,
             slot: *self.slot,
-            transit_ips: Some(self.transit_ips.into_iter().map(Into::into).collect()),
+            transit_ips: Some(
+                self.transit_ips.into_iter().map(Into::into).collect(),
+            ),
         }
     }
 }

diff --git a/nexus/db-queries/src/db/datastore/network_interface.rs b/nexus/db-queries/src/db/datastore/network_interface.rs
@@ -94,7 +94,9 @@ impl From<NicInfo> for omicron_common::api::internal::shared::NetworkInterface {
             vni: nic.vni.0,
             primary: nic.primary,
             slot: u8::try_from(nic.slot).unwrap(),
-            transit_ips: Some(nic.transit_ips.iter().map(|v| (*v).into()).collect()),
+            transit_ips: Some(
+                nic.transit_ips.iter().map(|v| (*v).into()).collect(),
+            ),
         }
     }
 }