remove unnecessary unwraps

If we check that a value.is_ok() than we shouldn't also call
unwrap() on it as it is inefficient. The preferred way in this case
is to actually use match of if let.

Signed-off-by: Andreea Florescu <[email protected]>

Author: andreeaflorescu

api_server/src/http_service.rs

@@ -611,20 +611,21 @@ impl hyper::server::Service for ApiServerHttpService {
                                     // logged at its point of origin and not log it again.
                                     let response = result.generate_response();
                                     let status_code = response.status();
-                                    if result.is_ok() {
-                                        info!(
-                                            "The {} was executed successfully. Status code: {}.",
-                                            description, status_code
-                                        );
-                                    } else {
-                                        // It is safe to `unwrap_err` because result was checked
-                                        // against not being ok.
-                                        error!(
-                                            "Received Error on {}. Status code: {}. Message: {}",
-                                            description,
-                                            status_code,
-                                            result.unwrap_err()
-                                        );
+                                    match result {
+                                        Ok(_) => {
+                                            info!(
+                                                "The {} was executed successfully. Status code: {}.",
+                                                description, status_code
+                                            );
+                                        }
+                                        Err(e) => {
+                                            error!(
+                                                "Received Error on {}. Status code: {}. Message: {}",
+                                                description,
+                                                status_code,
+                                                e
+                                            );
+                                        }
                                     }
                                     response
                                 })

dumbo/src/tcp/handler.rs

@@ -534,11 +534,10 @@ mod tests {
         let mut count: usize = 0;
         loop {
             let (o, _) = write_next(h, buf.as_mut())?;
-            if o.is_some() {
+            if let Some(packet) = o {
                 count += 1;
-                let p = o.unwrap();
-                assert_eq!(p.source_address(), h.local_addr);
-                assert_eq!(p.destination_address(), remote_addr);
+                assert_eq!(packet.source_address(), h.local_addr);
+                assert_eq!(packet.destination_address(), remote_addr);
             } else {
                 break;
             }

vmm/src/lib.rs

@@ -2036,10 +2036,9 @@ mod tests {
         fn default_kernel_config(&mut self, cust_kernel_path: Option<PathBuf>) {
             let kernel_temp_file =
                 NamedTempFile::new().expect("Failed to create temporary kernel file.");
-            let kernel_path = if cust_kernel_path.is_some() {
-                cust_kernel_path.unwrap()
-            } else {
-                kernel_temp_file.path().to_path_buf()
+            let kernel_path = match cust_kernel_path {
+                Some(kernel_path) => kernel_path,
+                None => kernel_temp_file.path().to_path_buf(),
             };
             let kernel_file = File::open(kernel_path).expect("Cannot open kernel file");
             let mut cmdline = kernel_cmdline::Cmdline::new(arch::CMDLINE_MAX_SIZE);