clippy: collapse nested ifs

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

src/api2/tape/drive.rs

@@ -1051,11 +1051,9 @@ pub fn catalog_media(
 
             let _lock = MediaPool::lock(status_path, &pool)?;
 
-            if MediaCatalog::exists(status_path, &media_id.label.uuid) {
-                if !force {
+            if MediaCatalog::exists(status_path, &media_id.label.uuid) && !force {
                 bail!("media catalog exists (please use --force to overwrite)");
             }
-            }
 
             restore_media(&worker, &mut drive, &media_id, None, verbose)?;
 

src/api2/tape/restore.rs

@@ -359,16 +359,12 @@ fn restore_chunk_archive<'a>(
                                 worker.log(format!("Insert chunk: {}", proxmox::tools::digest_to_hex(&digest)));
                             }
                             datastore.insert_chunk(&blob, &digest)?;
-                        } else {
-                            if verbose {
+                        } else if verbose {
                             worker.log(format!("Found existing chunk: {}", proxmox::tools::digest_to_hex(&digest)));
                         }
-                        }
-                    } else {
-                        if verbose {
+                    } else if verbose {
                         worker.log(format!("Found chunk: {}", proxmox::tools::digest_to_hex(&digest)));
                     }
-                    }
                     chunks.push(digest);
                 }
                 None => break,

src/bin/proxmox-tape.rs

@@ -601,8 +601,7 @@ fn debug_scan(param: Value) -> Result<(), Error> {
                     Ok(header) => {
                         if header.magic != PROXMOX_BACKUP_CONTENT_HEADER_MAGIC_1_0 {
                             println!("got MediaContentHeader with wrong magic: {:?}", header.magic);
-                        } else {
-                            if let Some(name) = PROXMOX_BACKUP_CONTENT_NAME.get(&header.content_magic) {
+                        } else if let Some(name) = PROXMOX_BACKUP_CONTENT_NAME.get(&header.content_magic) {
                             println!("got content header: {}", name);
                             println!("  uuid:  {}", header.content_uuid());
                             println!("  ctime: {}", strftime_local("%c", header.ctime)?);
@@ -612,7 +611,6 @@ fn debug_scan(param: Value) -> Result<(), Error> {
                             println!("got unknown content header: {:?}", header.content_magic);
                         }
                     }
-                    }
                     Err(err) => {
                         println!("unable to read content header - {}", err);
                     }

src/bin/sg-tape-cmd.rs

@@ -274,14 +274,12 @@ fn main() -> Result<(), Error> {
         bail!("this program needs to be run with setuid root");
     }
 
-    if !running_uid.is_root() {
-        if running_uid != backup_uid || running_gid != backup_gid {
+    if !running_uid.is_root() && (running_uid != backup_uid || running_gid != backup_gid) {
         bail!(
             "Not running as backup user or group (got uid {} gid {})",
             running_uid, running_gid,
         );
     }
-    }
 
     let cmd_def = CliCommandMap::new()
         .insert(

src/tape/changer/mod.rs

@@ -187,14 +187,12 @@ pub trait MediaChange {
                 if let ElementStatus::Empty = element_status {
                     to = Some(i as u64 + 1);
                 }
-            } else {
-                if let ElementStatus::VolumeTag(ref tag) = element_status {
+            } else if let ElementStatus::VolumeTag(ref tag) = element_status {
                 if tag == label_text {
                     from = Some(i as u64 + 1);
                 }
             }
         }
-        }
 
         if unload_from_drive {
             match to {

src/tape/drive/linux_tape.rs

@@ -97,8 +97,7 @@ impl LinuxTapeDrive {
 
             if drive_status.blocksize == 0 {
                 // device is variable block size - OK
-            } else {
-                if drive_status.blocksize != PROXMOX_TAPE_BLOCK_SIZE as u32 {
+            } else if drive_status.blocksize != PROXMOX_TAPE_BLOCK_SIZE as u32 {
                 eprintln!("device is in fixed block size mode with wrong size ({} bytes)", drive_status.blocksize);
                 eprintln!("trying to set variable block size mode...");
                 if handle.set_block_size(0).is_err() {
@@ -107,7 +106,6 @@ impl LinuxTapeDrive {
             } else {
                 // device is in fixed block size mode with correct block size
             }
-            }
 
             // Only root can set driver options, so we cannot
             // handle.set_default_options()?;

src/tape/drive/mod.rs

@@ -378,8 +378,7 @@ pub fn request_and_load_media(
                                         media_id.label.uuid.to_string(),
                                     ));
                                     return Ok((Box::new(handle), media_id));
-                                } else {
-                                    if Some(media_id.label.uuid.clone()) != last_media_uuid {
+                                } else if Some(media_id.label.uuid.clone()) != last_media_uuid {
                                     worker.log(format!(
                                         "wrong media label {} ({})",
                                         media_id.label.label_text,
@@ -388,7 +387,6 @@ pub fn request_and_load_media(
                                     last_media_uuid = Some(media_id.label.uuid);
                                 }
                             }
-                            }
                             Ok((None, _)) => {
                                 if last_media_uuid.is_some() {
                                     worker.log("found empty media without label (please label all tapes first)".to_string());

src/tape/helpers/blocked_reader.rs

@@ -81,11 +81,9 @@ impl <R: Read> BlockedReader<R> {
 
         if size > buffer.payload.len() {
             proxmox::io_bail!("detected tape block with wrong payload size ({} > {}", size, buffer.payload.len());
-        } else if size == 0 {
-            if !found_end_marker{
+        } else if size == 0 && !found_end_marker {
             proxmox::io_bail!("detected tape block with zero payload size");
         }
-        }
 
 
         Ok((size, found_end_marker))

src/tape/inventory.rs

@@ -675,8 +675,7 @@ impl Inventory {
         for (uuid, entry) in self.map.iter_mut() {
             if let Some(changer_name) = online_map.lookup_changer(uuid) {
                 entry.location = Some(MediaLocation::Online(changer_name.to_string()));
-            } else {
-                if let Some(MediaLocation::Online(ref changer_name)) = entry.location {
+            } else if let Some(MediaLocation::Online(ref changer_name)) = entry.location {
                 match online_map.online_map(changer_name) {
                     None => {
                         // no such changer device
@@ -692,7 +691,6 @@ impl Inventory {
                 }
             }
         }
-        }
 
         self.update_helpers();
         self.replace_file()?;

src/tape/pool_writer.rs

@@ -159,12 +159,10 @@ impl PoolWriter {
                 }
             }
 
-        } else {
-            if let Some(mut status) = status {
+        } else if let Some(mut status) = status {
             worker.log("standalone drive - ejecting media instead of export");
             status.drive.eject_media()?;
         }
-        }
 
         Ok(())
     }