Fix clippy and fmt errors for Rust 1.85

Co-authored-by: sjoerdsimons <[email protected]>

Author: Copilot

bmap-parser/src/bmap.rs

@@ -96,7 +96,7 @@ impl Bmap {
     }
 
     /// Iterator over the block map
-    pub fn block_map(&self) -> impl ExactSizeIterator + Iterator<Item = &BlockRange> {
+    pub fn block_map(&self) -> impl ExactSizeIterator<Item = &BlockRange> {
         self.blockmap.iter()
     }
 

bmap-parser/src/bmap/xml.rs

@@ -51,11 +51,20 @@ struct Bmap {
     block_size: u64,
     #[serde(rename = "BlocksCount", deserialize_with = "deserialize_trimmed_u64")]
     blocks_count: u64,
-    #[serde(rename = "MappedBlocksCount", deserialize_with = "deserialize_trimmed_u64")]
+    #[serde(
+        rename = "MappedBlocksCount",
+        deserialize_with = "deserialize_trimmed_u64"
+    )]
     mapped_blocks_count: u64,
-    #[serde(rename = "ChecksumType", deserialize_with = "deserialize_trimmed_string")]
+    #[serde(
+        rename = "ChecksumType",
+        deserialize_with = "deserialize_trimmed_string"
+    )]
     checksum_type: String,
-    #[serde(rename = "BmapFileChecksum", deserialize_with = "deserialize_trimmed_string")]
+    #[serde(
+        rename = "BmapFileChecksum",
+        deserialize_with = "deserialize_trimmed_string"
+    )]
     bmap_file_checksum: String,
     #[serde(rename = "BlockMap")]
     block_map: BlockMap,
@@ -101,7 +110,7 @@ fn str_to_digest(s: String, digest: &mut [u8]) -> Result<(), XmlError> {
             Some(v) => v,
             None => return Err(XmlError::InvalidChecksum(s)),
         };
-        digest[i] = hi << 4 | lo;
+        digest[i] = (hi << 4) | lo;
     }
 
     Ok(())

bmap-parser/src/lib.rs

@@ -85,7 +85,7 @@ where
             left -= r;
         }
         let digest = hasher.finalize_reset();
-        if range.checksum().as_slice() != digest.as_slice() {
+        if range.checksum().as_slice() != &digest[..] {
             return Err(CopyError::ChecksumError);
         }
 
@@ -139,7 +139,7 @@ where
             left -= r;
         }
         let digest = hasher.finalize_reset();
-        if range.checksum().as_slice() != digest.as_slice() {
+        if range.checksum().as_slice() != &digest[..] {
             return Err(CopyError::ChecksumError);
         }
 

bmap-parser/tests/parse.rs

@@ -18,7 +18,7 @@ fn parse() {
         assert_eq!((block + 1) * 4096, range.length());
 
         let digest = Sha256::digest(format!("{}", block).as_bytes());
-        assert_eq!(digest.as_slice(), range.checksum().as_slice());
+        assert_eq!(&digest[..], range.checksum().as_slice());
 
         block = if block == 0 { 8 } else { block * 4 };
     }

bmap-rs/src/main.rs

@@ -206,6 +206,7 @@ fn copy_local_input(source: PathBuf, destination: PathBuf) -> Result<()> {
     let output = std::fs::OpenOptions::new()
         .write(true)
         .create(true)
+        .truncate(true)
         .open(destination)?;
 
     setup_output(&output, &bmap, output.metadata()?)?;
@@ -231,6 +232,7 @@ async fn copy_remote_input(source: Url, destination: PathBuf) -> Result<()> {
     let mut output = tokio::fs::OpenOptions::new()
         .write(true)
         .create(true)
+        .truncate(true)
         .open(destination)
         .await?;
 
@@ -263,6 +265,7 @@ fn copy_local_input_nobmap(source: PathBuf, destination: PathBuf) -> Result<()>
     let output = std::fs::OpenOptions::new()
         .write(true)
         .create(true)
+        .truncate(true)
         .open(destination)?;
 
     let mut input = setup_local_input(&source)?;
@@ -281,6 +284,7 @@ async fn copy_remote_input_nobmap(source: Url, destination: PathBuf) -> Result<(
     let mut output = tokio::fs::OpenOptions::new()
         .write(true)
         .create(true)
+        .truncate(true)
         .open(destination)
         .await?;