From 536b40c2d2f59d446466bf167479821f9d593531 Mon Sep 17 00:00:00 2001
From: Kyle Simpson <kyle@oxide.computer>
Date: Wed, 29 May 2024 23:57:23 +0100
Subject: [PATCH] Minor fmt + lint tweaks.

---
 illumos-utils/src/opte/port_manager.rs                 | 2 +-
 nexus/db-model/src/network_interface.rs                | 4 +++-
 nexus/db-queries/src/db/datastore/network_interface.rs | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/illumos-utils/src/opte/port_manager.rs b/illumos-utils/src/opte/port_manager.rs
index ec02104715..a054f93de1 100644
--- 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
index 8561d8f2c2..658361c7b0 100644
--- 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
index ddf340749c..a83fe2dcb5 100644
--- 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(),
+            ),
         }
     }
 }