From: Yann Dirson Date: Wed, 10 Jan 2024 17:11:53 +0000 (+0100) Subject: Apply a few select formatting fixes from fmt X-Git-Tag: 0.4.0~9^2 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=e9272cb919f8875bbd5c508df3a6c729eb0159ef;p=xen-guest-agent.git Apply a few select formatting fixes from fmt Most of the rest mostly hampers readability. Signed-off-by: Yann Dirson --- diff --git a/src/collector_memory.rs b/src/collector_memory.rs index 0330fce..3800dde 100644 --- a/src/collector_memory.rs +++ b/src/collector_memory.rs @@ -1,7 +1,6 @@ use std::io; -pub struct MemorySource { -} +pub struct MemorySource {} impl MemorySource { pub fn new() -> io::Result { diff --git a/src/collector_memory_linux.rs b/src/collector_memory_linux.rs index ce57499..0a850be 100644 --- a/src/collector_memory_linux.rs +++ b/src/collector_memory_linux.rs @@ -17,7 +17,7 @@ impl MemorySource { pub fn get_available_kb(&mut self) -> io::Result { self.get_num_field("MemAvailable:") } - + fn get_num_field(&mut self, tag: &str) -> io::Result { self.meminfo.rewind()?; let mut rawdata = String::new(); diff --git a/src/collector_net.rs b/src/collector_net.rs index a998dc2..cd35e18 100644 --- a/src/collector_net.rs +++ b/src/collector_net.rs @@ -3,8 +3,7 @@ use futures::stream::Stream; use std::error::Error; use std::io; -pub struct NetworkSource { -} +pub struct NetworkSource {} impl NetworkSource { pub fn new(_cache: &'static mut NetInterfaceCache) -> io::Result { @@ -12,7 +11,7 @@ impl NetworkSource { } pub async fn collect_current(&mut self) -> Result, Box> { - Ok(vec!()) + Ok(vec![]) } pub fn stream(&mut self) -> impl Stream> + '_ { diff --git a/src/collector_net_netlink.rs b/src/collector_net_netlink.rs index 51ee497..9659391 100644 --- a/src/collector_net_netlink.rs +++ b/src/collector_net_netlink.rs @@ -1,28 +1,18 @@ -use async_stream::try_stream; use crate::datastructs::{NetEvent, NetEventOp, NetInterface, NetInterfaceCache}; +use async_stream::try_stream; use futures::channel::mpsc::UnboundedReceiver; use futures::stream::{Stream, StreamExt}; use netlink_packet_core::{ - NetlinkHeader, - NetlinkMessage, - NetlinkPayload, - NLM_F_DUMP, - NLM_F_REQUEST, + NetlinkHeader, NetlinkMessage, NetlinkPayload, NLM_F_DUMP, NLM_F_REQUEST, }; use netlink_packet_route::{ - address::AddressMessage, address, - link::LinkMessage, link, - RouteNetlinkMessage, + address, address::AddressMessage, link, link::LinkMessage, RouteNetlinkMessage, }; use netlink_proto::{ self, new_connection, sys::{protocols::NETLINK_ROUTE, AsyncSocket, SocketAddr}, }; -use rtnetlink::constants::{ - RTMGRP_IPV4_IFADDR, - RTMGRP_IPV6_IFADDR, - RTMGRP_LINK, - }; +use rtnetlink::constants::{RTMGRP_IPV4_IFADDR, RTMGRP_IPV6_IFADDR, RTMGRP_LINK}; use std::cell::RefCell; use std::collections::hash_map; use std::error::Error; diff --git a/src/collector_net_pnet.rs b/src/collector_net_pnet.rs index 5bc826b..a503cab 100644 --- a/src/collector_net_pnet.rs +++ b/src/collector_net_pnet.rs @@ -1,10 +1,10 @@ -use async_stream::try_stream; use crate::datastructs::{NetEvent, NetEventOp, NetInterface, NetInterfaceCache}; +use async_stream::try_stream; use futures::stream::Stream; use ipnetwork::IpNetwork; use pnet_base::MacAddr; use std::cell::RefCell; -use std::collections::{HashMap, HashSet, hash_map}; +use std::collections::{hash_map, HashMap, HashSet}; use std::error::Error; use std::io; use std::rc::Rc; @@ -57,7 +57,6 @@ impl NetworkSource { } } - fn get_ifconfig_data(&mut self) -> io::Result> { let network_interfaces = pnet_datalink::interfaces(); @@ -80,7 +79,7 @@ impl NetworkSource { // diff addresses_cache and current_addresses view // events to be returned - let mut events = vec!(); + let mut events = vec![]; // pseudo-const to get a valid reference for unwrap_or let empty_address_set: HashSet
= HashSet::new(); @@ -102,7 +101,7 @@ impl NetworkSource { let iface_adresses = &iface_info.addresses; for disappearing in cached_info.addresses.difference(iface_adresses) { log::trace!("disappearing {}: {:?}", iface.borrow().name, disappearing); - events.push(NetEvent{ + events.push(NetEvent { iface: iface.clone(), op: match disappearing { Address::IP(ip) => NetEventOp::RmIp(ip.ip()), diff --git a/src/datastructs.rs b/src/datastructs.rs index 2b8a96d..67e759f 100644 --- a/src/datastructs.rs +++ b/src/datastructs.rs @@ -36,7 +36,7 @@ pub struct NetInterface { impl NetInterface { pub fn new(index: u32, name: Option) -> NetInterface { let name = match name { - Some(string) => { string }, + Some(string) => string, None => { log::error!("new interface with index {index} has no name"); String::from("") // this is not valid, but user will now be aware diff --git a/src/main.rs b/src/main.rs index 4ff675f..476d9b4 100644 --- a/src/main.rs +++ b/src/main.rs @@ -3,9 +3,9 @@ mod datastructs; #[cfg_attr(feature = "xenstore", path = "publisher_xenstore.rs")] mod publisher; #[cfg(feature = "xenstore")] -mod xenstore_schema_std; -#[cfg(feature = "xenstore")] mod xenstore_schema_rfc; +#[cfg(feature = "xenstore")] +mod xenstore_schema_std; #[cfg_attr(feature = "net_netlink", path = "collector_net_netlink.rs")] #[cfg_attr(feature = "net_pnet", path = "collector_net_pnet.rs")] @@ -21,12 +21,12 @@ mod vif_detect; use clap::Parser; +use crate::collector_memory::MemorySource; +use crate::collector_net::NetworkSource; use crate::datastructs::KernelInfo; use crate::publisher::Publisher; -use crate::collector_net::NetworkSource; -use crate::collector_memory::MemorySource; -use futures::{FutureExt, pin_mut, select, TryStreamExt}; +use futures::{pin_mut, select, FutureExt, TryStreamExt}; use std::error::Error; use std::io; use std::str::FromStr; diff --git a/src/publisher.rs b/src/publisher.rs index 247e9fc..2ebc2d9 100644 --- a/src/publisher.rs +++ b/src/publisher.rs @@ -4,8 +4,7 @@ use os_info; use std::error::Error; use std::io; -pub struct Publisher { -} +pub struct Publisher {} impl Publisher { pub fn new() -> Result> { @@ -19,7 +18,7 @@ impl Publisher { if let Some(mem_total_kb) = mem_total_kb { println!("Total memory: {mem_total_kb} KB"); } - if let Some(KernelInfo{release}) = kernel_info { + if let Some(KernelInfo { release }) = kernel_info { println!("Kernel version: {}", release); } Ok(()) diff --git a/src/vif_detect_freebsd.rs b/src/vif_detect_freebsd.rs index f1c90c9..d3eb09e 100644 --- a/src/vif_detect_freebsd.rs +++ b/src/vif_detect_freebsd.rs @@ -4,7 +4,7 @@ use crate::datastructs::ToolstackNetInterface; pub fn get_toolstack_interface(iface_name: &str) -> ToolstackNetInterface { const PREFIX: &str = "xn"; - if ! iface_name.starts_with(PREFIX) { + if !iface_name.starts_with(PREFIX) { log::debug!("ignoring interface {iface_name} as not starting with '{PREFIX}'"); return ToolstackNetInterface::None; } diff --git a/src/vif_detect_linux.rs b/src/vif_detect_linux.rs index 7e0e6e9..e1b9d71 100644 --- a/src/vif_detect_linux.rs +++ b/src/vif_detect_linux.rs @@ -20,7 +20,7 @@ pub fn get_toolstack_interface(iface_name: &str) -> ToolstackNetInterface { Ok(nodename) => { let nodename = nodename.trim(); const PREFIX: &str = "device/vif/"; - if ! nodename.starts_with(PREFIX) { + if !nodename.starts_with(PREFIX) { log::debug!("ignoring interface {nodename} as not under {PREFIX}"); return ToolstackNetInterface::None; } diff --git a/src/xenstore_schema_rfc.rs b/src/xenstore_schema_rfc.rs index 8c80245..a250949 100644 --- a/src/xenstore_schema_rfc.rs +++ b/src/xenstore_schema_rfc.rs @@ -1,5 +1,5 @@ use crate::datastructs::{KernelInfo, NetEvent, NetEventOp}; -use crate::publisher::{XenstoreSchema, xs_publish, xs_unpublish}; +use crate::publisher::{xs_publish, xs_unpublish, XenstoreSchema}; use std::io; use std::net::IpAddr; use xenstore_rs::Xs; diff --git a/src/xenstore_schema_std.rs b/src/xenstore_schema_std.rs index a4c2249..9598d3b 100644 --- a/src/xenstore_schema_std.rs +++ b/src/xenstore_schema_std.rs @@ -1,5 +1,5 @@ use crate::datastructs::{KernelInfo, NetEvent, NetEventOp, NetInterface, ToolstackNetInterface}; -use crate::publisher::{XenstoreSchema, xs_publish, xs_unpublish}; +use crate::publisher::{xs_publish, xs_unpublish, XenstoreSchema}; use std::collections::HashMap; use std::io; use std::net::IpAddr; @@ -76,7 +76,7 @@ impl XenstoreSchema for Schema { xs_publish(&self.xs, "data/meminfo_total", &mem_total_kb.to_string())?; } - if ! self.forbidden_control_feature_balloon { + if !self.forbidden_control_feature_balloon { // we may want to be more clever some day, e.g. by // checking if the guest indeed has ballooning, and if the // balloon driver has reached the requested initial