avoid some clippy warnings

src/backup/catalog_blob.rs

@@ -174,11 +174,10 @@ impl <R: Read + BufRead> CatalogBlobReader<R> {
             let etype = match self.next_byte() {
                 Ok(v) => v,
                 Err(err) => {
-                    if err.kind() == std::io::ErrorKind::UnexpectedEof {
-                        if self.dir_stack.len() == 0 {
-                            break;
-                        }
+                    if err.kind() == std::io::ErrorKind::UnexpectedEof && self.dir_stack.len() == 0 {
+                        break;
                     }
+
                     return Err(err.into());
                 }
             };

src/backup/chunk_store.rs

@@ -60,7 +60,7 @@ fn digest_to_prefix(digest: &[u8]) -> PathBuf {
 
     let mut buf = Vec::<u8>::with_capacity(2+1+2+1);
 
-    const HEX_CHARS: &'static [u8; 16] = b"0123456789abcdef";
+    const HEX_CHARS: &[u8; 16] = b"0123456789abcdef";
 
     buf.push(HEX_CHARS[(digest[0] as usize) >> 4]);
     buf.push(HEX_CHARS[(digest[0] as usize) &0xf]);

src/backup/data_blob.rs

@@ -173,11 +173,11 @@ impl DataBlob {
 
         if magic == &UNCOMPRESSED_BLOB_MAGIC_1_0 {
             let data_start = std::mem::size_of::<DataBlobHeader>();
-            return Ok(self.raw_data[data_start..].to_vec());
+            Ok(self.raw_data[data_start..].to_vec())
         } else if magic == &COMPRESSED_BLOB_MAGIC_1_0 {
             let data_start = std::mem::size_of::<DataBlobHeader>();
             let data = zstd::block::decompress(&self.raw_data[data_start..], MAX_BLOB_SIZE)?;
-            return Ok(data);
+            Ok(data)
         } else if magic == &ENCR_COMPR_BLOB_MAGIC_1_0 || magic == &ENCRYPTED_BLOB_MAGIC_1_0 {
             let header_len = std::mem::size_of::<EncryptedDataBlobHeader>();
             let head = unsafe {
@@ -190,7 +190,7 @@ impl DataBlob {
                 } else {
                     config.decode_uncompressed_chunk(&self.raw_data[header_len..], &head.iv, &head.tag)?
                 };
-                return Ok(data);
+                Ok(data)
             } else {
                 bail!("unable to decrypt blob - missing CryptConfig");
             }
@@ -212,9 +212,9 @@ impl DataBlob {
 
             if magic == &AUTH_COMPR_BLOB_MAGIC_1_0 {
                 let data = zstd::block::decompress(&self.raw_data[data_start..], 16*1024*1024)?;
-                return Ok(data);
+                Ok(data)
             } else {
-                return Ok(self.raw_data[data_start..].to_vec());
+                Ok(self.raw_data[data_start..].to_vec())
             }
         } else {
             bail!("Invalid blob magic number.");
@@ -260,7 +260,7 @@ impl DataBlob {
         let mut blob = DataBlob { raw_data };
         blob.set_crc(blob.compute_crc());
 
-        return Ok(blob);
+        Ok(blob)
     }
 
     /// Load blob from ``reader``

src/backup/data_blob_writer.rs

@@ -114,7 +114,7 @@ impl <W: Write + Seek> DataBlobWriter<W> {
                     writer.write_le_value(head)?;
                 }
 
-                return Ok(writer)
+                Ok(writer)
             }
             BlobWriterState::Compressed { compr } => {
                 let csum_writer = compr.finish()?;
@@ -127,7 +127,7 @@ impl <W: Write + Seek> DataBlobWriter<W> {
                     writer.write_le_value(head)?;
                 }
 
-                return Ok(writer)
+                Ok(writer)
             }
             BlobWriterState::Signed { csum_writer } => {
                 let (mut writer, crc, tag) = csum_writer.finish()?;
@@ -142,7 +142,7 @@ impl <W: Write + Seek> DataBlobWriter<W> {
                     writer.write_le_value(head)?;
                 }
 
-                return Ok(writer)
+                Ok(writer)
             }
             BlobWriterState::SignedCompressed { compr } => {
                 let csum_writer = compr.finish()?;
@@ -158,7 +158,7 @@ impl <W: Write + Seek> DataBlobWriter<W> {
                     writer.write_le_value(head)?;
                 }
 
-                return Ok(writer)
+                Ok(writer)
             }
             BlobWriterState::Encrypted { crypt_writer } => {
                 let (csum_writer, iv, tag) = crypt_writer.finish()?;
@@ -172,7 +172,7 @@ impl <W: Write + Seek> DataBlobWriter<W> {
                 unsafe {
                     writer.write_le_value(head)?;
                 }
-                return Ok(writer)
+                Ok(writer)
             }
             BlobWriterState::EncryptedCompressed { compr } => {
                 let crypt_writer = compr.finish()?;
@@ -187,7 +187,7 @@ impl <W: Write + Seek> DataBlobWriter<W> {
                 unsafe {
                     writer.write_le_value(head)?;
                 }
-                return Ok(writer)
+                Ok(writer)
             }
         }
     }

src/backup/dynamic_index.rs

@@ -227,9 +227,9 @@ impl DynamicIndexReader {
         let middle_end = self.chunk_end(middle_idx);
 
         if offset < middle_end {
-            return self.binary_search(start_idx, start, middle_idx, middle_end, offset);
+            self.binary_search(start_idx, start, middle_idx, middle_end, offset)
         } else {
-            return self.binary_search(middle_idx + 1, middle_end, end_idx, end, offset);
+            self.binary_search(middle_idx + 1, middle_end, end_idx, end, offset)
         }
     }
 }
@@ -366,7 +366,7 @@ impl <S: ReadChunk> std::io::Read for  BufferedDynamicReader<S> {
 
         self.read_offset += n as u64;
 
-        return Ok(n);
+        Ok(n)
     }
 }
 
@@ -601,11 +601,11 @@ impl DynamicChunkWriter {
                          (compressed_size*100)/(chunk_size as u64), is_duplicate, proxmox::tools::digest_to_hex(&digest));
                 self.index.add_chunk(self.chunk_offset as u64, &digest)?;
                 self.chunk_buffer.truncate(0);
-                return Ok(());
+                Ok(())
             }
             Err(err) => {
                 self.chunk_buffer.truncate(0);
-                return Err(err);
+                Err(err)
             }
         }
     }

src/backup/fixed_index.rs

@@ -539,7 +539,7 @@ impl <S: ReadChunk> std::io::Read for  BufferedFixedReader<S> {
 
         self.read_offset += n as u64;
 
-        return Ok(n);
+        Ok(n)
     }
 }
 

src/backup/index.rs

@@ -84,9 +84,9 @@ impl std::io::Read for DigestListEncoder {
                     break;
                 }
             }
-            return Ok(written);
+            Ok(written)
         } else {
-            return Ok(0);
+            Ok(0)
         }
     }
 }