Style.

Author: FelixMcFelix

bin/opteadm/src/bin/opteadm.rs

@@ -283,7 +283,7 @@ enum Command {
         /// The OPTE port to read...
         #[arg(short)]
         port: String,
-    }
+    },
 }
 
 #[derive(Debug, Parser)]
@@ -870,7 +870,7 @@ fn main() -> anyhow::Result<()> {
 
         // XXX TEMP
         Command::DumpFlowStats { port } => {
-            let DumpFlowStatsResp{ data } =  hdl.dump_flowstats(&port)?;
+            let DumpFlowStatsResp { data } = hdl.dump_flowstats(&port)?;
             println!("{data}");
         }
     }

lib/opte-ioctl/src/lib.rs

@@ -371,7 +371,10 @@ impl OpteHdl {
     }
 
     /// TEMP METHOD
-    pub fn dump_flowstats(&self, port_name: &str) -> Result<DumpFlowStatsResp, Error> {
+    pub fn dump_flowstats(
+        &self,
+        port_name: &str,
+    ) -> Result<DumpFlowStatsResp, Error> {
         let cmd = OpteCmd::DumpFlowStats;
         run_cmd_ioctl(
             self.device.as_raw_fd(),

lib/oxide-vpc/src/api/stat.rs

@@ -30,4 +30,4 @@ pub static NAT_VALID_IGW_V4: Uuid =
 pub static NAT_VALID_IGW_V6: Uuid =
     Uuid::from_fields(0x01de_f00d, 0x7777, 0x0003, &3u64.to_be_bytes());
 pub static NAT_NONE: Uuid =
-    Uuid::from_fields(0x01de_f00d, 0x7777, 0x0003, &255u64.to_be_bytes());
+    Uuid::from_fields(0x01de_f00d, 0x7777, 0x0003, &255u64.to_be_bytes());

lib/oxide-vpc/src/engine/gateway/mod.rs

@@ -42,6 +42,7 @@
 
 use crate::api::DhcpCfg;
 use crate::api::MacAddr;
+use crate::api::stat::*;
 use crate::cfg::Ipv4Cfg;
 use crate::cfg::Ipv6Cfg;
 use crate::cfg::VpcCfg;
@@ -77,7 +78,6 @@ use opte::engine::rule::MetaAction;
 use opte::engine::rule::ModMetaResult;
 use opte::engine::rule::Rule;
 use opte::engine::rule::StaticAction;
-use crate::api::stat::*;
 
 pub mod arp;
 pub mod dhcp;

lib/oxide-vpc/src/engine/nat.rs

@@ -10,6 +10,7 @@ use super::router::RouterTargetClass;
 use super::router::RouterTargetInternal;
 use crate::api::ExternalIpCfg;
 use crate::api::SetExternalIpsReq;
+use crate::api::stat::*;
 use crate::cfg::IpCfg;
 use crate::cfg::Ipv4Cfg;
 use crate::cfg::Ipv6Cfg;
@@ -47,7 +48,6 @@ use opte::engine::rule::Rule;
 use opte::engine::snat::ConcreteIpAddr;
 use opte::engine::snat::SNat;
 use uuid::Uuid;
-use crate::api::stat::*;
 
 pub const NAT_LAYER_NAME: &str = "nat";
 const FLOATING_ONE_TO_ONE_NAT_PRIORITY: u16 = 5;
@@ -291,8 +291,11 @@ fn setup_ipv4_nat(
         let snat = Arc::new(snat);
 
         for igw_id in igw_matches {
-            let mut rule =
-                Rule::new_with_id(SNAT_PRIORITY, Action::Stateful(snat.clone()), Some(NAT_SNAT_V4));
+            let mut rule = Rule::new_with_id(
+                SNAT_PRIORITY,
+                Action::Stateful(snat.clone()),
+                Some(NAT_SNAT_V4),
+            );
 
             rule.add_predicate(Predicate::InnerEtherType(vec![
                 EtherTypeMatch::Exact(ETHER_TYPE_IPV4),
@@ -440,8 +443,11 @@ fn setup_ipv6_nat(
         let snat = Arc::new(snat);
 
         for igw_id in igw_matches {
-            let mut rule =
-                Rule::new_with_id(SNAT_PRIORITY, Action::Stateful(snat.clone()), Some(NAT_SNAT_V6));
+            let mut rule = Rule::new_with_id(
+                SNAT_PRIORITY,
+                Action::Stateful(snat.clone()),
+                Some(NAT_SNAT_V6),
+            );
 
             rule.add_predicate(Predicate::InnerEtherType(vec![
                 EtherTypeMatch::Exact(ETHER_TYPE_IPV6),

lib/oxide-vpc/src/engine/router.rs

@@ -13,6 +13,7 @@ use super::firewall as fw;
 use crate::api::DelRouterEntryResp;
 use crate::api::RouterClass;
 use crate::api::RouterTarget;
+use crate::api::stat::*;
 use crate::cfg::VpcCfg;
 use alloc::string::String;
 use alloc::string::ToString;
@@ -48,7 +49,6 @@ use opte::engine::rule::MetaAction;
 use opte::engine::rule::ModMetaResult;
 use opte::engine::rule::Rule;
 use uuid::Uuid;
-use crate::api::stat::*;
 
 pub const ROUTER_LAYER_NAME: &str = "router";
 

xde/src/xde.rs

@@ -694,11 +694,16 @@ unsafe extern "C" fn xde_ioc_opte_cmd(karg: *mut c_void, mode: c_int) -> c_int {
 }
 
 #[unsafe(no_mangle)]
-fn flow_stats_hdlr(env: &mut IoctlEnvelope) -> Result<oxide_vpc::api::DumpFlowStatsResp, OpteError> {
+fn flow_stats_hdlr(
+    env: &mut IoctlEnvelope,
+) -> Result<oxide_vpc::api::DumpFlowStatsResp, OpteError> {
     let req: oxide_vpc::api::DumpUftReq = env.copy_in_req()?;
     let devs = xde_devs().read();
     match devs.get_by_name(&req.port_name) {
-        Some(dev) => dev.port.dump_flow_stats().map(|data| oxide_vpc::api::DumpFlowStatsResp {data}),
+        Some(dev) => dev
+            .port
+            .dump_flow_stats()
+            .map(|data| oxide_vpc::api::DumpFlowStatsResp { data }),
         None => Err(OpteError::PortNotFound(req.port_name)),
     }
 }