From: Yann Dirson <yann.dirson@vates.fr>
Date: Wed, 10 Jan 2024 16:56:47 +0000 (+0100)
Subject: Apply suggestions from clippy for code simplification
X-Git-Tag: 0.4.0~9^2~3
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=3a67ad545a77ec2a657b7e0c0bad99e9e1f10342;p=xen-guest-agent.git

Apply suggestions from clippy for code simplification

Signed-off-by: Yann Dirson <yann.dirson@vates.fr>
---

diff --git a/src/collector_net_netlink.rs b/src/collector_net_netlink.rs
index 4b1eda9..51ee497 100644
--- a/src/collector_net_netlink.rs
+++ b/src/collector_net_netlink.rs
@@ -172,15 +172,12 @@ impl NetworkSource {
                                 .into());
 
         // handle renaming
-        match iface_name {
-            Some(iface_name) => {
-                let iface_renamed = iface.borrow().name != iface_name;
-                if iface_renamed {
-                    log::trace!("name change: {iface:?} now named '{iface_name}'");
-                    iface.borrow_mut().name = iface_name;
-                }
-            },
-            None => {},
+        if let Some(iface_name) = iface_name {
+            let iface_renamed = iface.borrow().name != iface_name;
+            if iface_renamed {
+                log::trace!("name change: {iface:?} now named '{iface_name}'");
+                iface.borrow_mut().name = iface_name;
+            }
         };
 
         Ok((iface.clone(), mac_address))
diff --git a/src/main.rs b/src/main.rs
index 775231b..4ff675f 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -21,7 +21,7 @@ mod vif_detect;
 
 use clap::Parser;
 
-use crate::datastructs::{KernelInfo, NetInterfaceCache};
+use crate::datastructs::KernelInfo;
 use crate::publisher::Publisher;
 use crate::collector_net::NetworkSource;
 use crate::collector_memory::MemorySource;
@@ -66,7 +66,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
     let mut timer_stream = tokio::time::interval(Duration::from_secs(MEM_PERIOD_SECONDS));
 
     // network events
-    let network_cache = Box::leak(Box::new(NetInterfaceCache::new()));
+    let network_cache = Box::leak(Box::default());
     let mut collector_net = NetworkSource::new(network_cache)?;
     for event in collector_net.collect_current().await? {
         if REPORT_INTERNAL_NICS || ! event.iface.borrow().toolstack_iface.is_none() {
diff --git a/src/vif_detect_linux.rs b/src/vif_detect_linux.rs
index d909a40..7e0e6e9 100644
--- a/src/vif_detect_linux.rs
+++ b/src/vif_detect_linux.rs
@@ -25,17 +25,20 @@ pub fn get_toolstack_interface(iface_name: &str) -> ToolstackNetInterface {
                         return ToolstackNetInterface::None;
                     }
                     let vif_id = nodename[PREFIX.len()..].parse().unwrap();
-                    return ToolstackNetInterface::Vif(vif_id);
+
+                    ToolstackNetInterface::Vif(vif_id)
                 },
                 Err(e) => {
                     log::error!("reading {device_path}/nodename: {e}");
-                    return ToolstackNetInterface::None;
+
+                    ToolstackNetInterface::None
                 },
             }
         },
         Err(e) => {
             log::debug!("reading {device_path}/devtype: {e}");
-            return ToolstackNetInterface::None;
+
+            ToolstackNetInterface::None
         },
     }
 }
diff --git a/src/xenstore_schema_std.rs b/src/xenstore_schema_std.rs
index 585d4a9..a4c2249 100644
--- a/src/xenstore_schema_std.rs
+++ b/src/xenstore_schema_std.rs
@@ -112,10 +112,10 @@ impl XenstoreSchema for Schema {
         let xs_iface_prefix = format!("attr/vif/{iface_id}");
         match &event.op {
             NetEventOp::AddIface => {
-                xs_publish(&self.xs, &format!("{xs_iface_prefix}"), "")?;
+                xs_publish(&self.xs, &xs_iface_prefix, "")?;
             },
             NetEventOp::RmIface => {
-                xs_unpublish(&self.xs, &format!("{xs_iface_prefix}"))?;
+                xs_unpublish(&self.xs, &xs_iface_prefix)?;
             },
             NetEventOp::AddIp(address) => {
                 let key_suffix = self.munged_address(address, &event.iface.borrow())?;