src: cleanup for new cargo versions

Format and clean code according to new specs

Signed-off-by: Aditya R <arajan@redhat.com>

Author: flouthoc

src/commands/teardown.rs

@@ -48,7 +48,7 @@ impl Teardown {
 
         if Path::new(&aardvark_bin).exists() {
             // stop dns server first before netavark clears the interface
-            let path = Path::new(&config_dir).join("aardvark-dns".to_string());
+            let path = Path::new(&config_dir).join("aardvark-dns");
             if let Ok(path_string) = path.into_os_string().into_string() {
                 let mut aardvark_interface = Aardvark::new(path_string, rootless, aardvark_bin);
                 if let Err(er) =

src/dns/aardvark.rs

@@ -45,21 +45,18 @@ impl Aardvark {
 
     // On success retuns aardvark server's pid or returns -1;
     fn get_aardvark_pid(&mut self) -> i32 {
-        let pid: i32;
-        let path = Path::new(&self.config).join("aardvark.pid".to_string());
-        match fs::read_to_string(&path) {
-            Ok(content) => {
-                pid = match content.parse::<i32>() {
-                    Ok(val) => val,
-                    Err(_) => {
-                        return -1;
-                    }
+        let path = Path::new(&self.config).join("aardvark.pid");
+        let pid: i32 = match fs::read_to_string(&path) {
+            Ok(content) => match content.parse::<i32>() {
+                Ok(val) => val,
+                Err(_) => {
+                    return -1;
                 }
-            }
+            },
             Err(_) => {
                 return -1;
             }
-        }
+        };
 
         pid
     }
@@ -161,14 +158,13 @@ impl Aardvark {
     }
 
     pub fn commit_entry(&mut self, entry: AardvarkEntry) -> Result<()> {
-        let data: String;
+        let mut data: String;
         let path = Path::new(&self.config).join(entry.network_name);
         let file_exists = path.exists();
         let mut file = OpenOptions::new().append(true).create(true).open(&path)?;
         // check if this is the first container in this network
         if !file_exists {
             // write first line as gateway ip
-            let data: String;
             if !entry.network_gateway_v4.is_empty() && !entry.network_gateway_v6.is_empty() {
                 data = format!(
                     "{},{}\n",

src/network/core.rs

@@ -535,7 +535,7 @@ impl Core {
                         &container_macvlan_clone,
                         netns_ipaddr_clone,
                         gw_ipaddr,
-                        &"".to_string(), // do we want static mac support for macvlan ? probably later.
+                        "", // do we want static mac support for macvlan ? probably later.
                     ) {
                         return Err(err);
                     }

src/network/core_utils.rs

@@ -145,12 +145,9 @@ impl CoreUtils {
 
         tokio::spawn(connection);
 
-        let master_index: u32;
-
         let mut links = handle.link().get().match_name(ifname.to_string()).execute();
-        match links.try_next().await {
-            Ok(Some(msg)) => master_index = msg.header.index,
-
+        let master_index: u32 = match links.try_next().await {
+            Ok(Some(msg)) => msg.header.index,
             Ok(None) => {
                 return Err(std::io::Error::new(
                     std::io::ErrorKind::Other,
@@ -166,7 +163,7 @@ impl CoreUtils {
                     format!("Unable to resolve bridge interface {}: {}", ifname, err),
                 ));
             }
-        }
+        };
 
         let mut links = handle
             .link()