🐎 Avoid unnecessary heap allocation

ChanTsune · Sep 28, 2023 · 2d5ca27 · 2d5ca27
1 parent a1dc687
commit 2d5ca27
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 24 deletions.
diff --git a/lib/src/archive/entry.rs b/lib/src/archive/entry.rs
@@ -387,26 +387,17 @@ fn decrypt_reader<R: Read>(
         Encryption::No => DecryptReader::No(reader),
         encryption @ Encryption::Aes | encryption @ Encryption::Camellia => {
             let s = phsf.ok_or_else(|| {
-                io::Error::new(
-                    io::ErrorKind::InvalidData,
-                    String::from("Item is encrypted, but `PHSF` chunk not found"),
-                )
+                io::Error::new(io::ErrorKind::InvalidData, "`PHSF` chunk not found")
             })?;
             let phsf = verify_password(
                 s,
                 password.ok_or_else(|| {
-                    io::Error::new(
-                        io::ErrorKind::InvalidInput,
-                        String::from("Item is encrypted, but password was not provided"),
-                    )
+                    io::Error::new(io::ErrorKind::InvalidInput, "Password was not provided")
                 })?,
             )?;
-            let hash = phsf.hash.ok_or_else(|| {
-                io::Error::new(
-                    io::ErrorKind::Unsupported,
-                    String::from("Failed to get hash"),
-                )
-            })?;
+            let hash = phsf
+                .hash
+                .ok_or_else(|| io::Error::new(io::ErrorKind::Unsupported, "Failed to get hash"))?;
             match (encryption, cipher_mode) {
                 (Encryption::Aes, CipherMode::CBC) => {
                     DecryptReader::CbcAes(DecryptCbcAes256Reader::new(reader, hash.as_bytes())?)

diff --git a/lib/src/archive/entry/write.rs b/lib/src/archive/entry/write.rs
@@ -34,12 +34,10 @@ fn hash<'s, 'p: 's>(
             ))
         }
     }?;
-    let hash = password_hash.hash.take().ok_or_else(|| {
-        io::Error::new(
-            io::ErrorKind::Unsupported,
-            String::from("Failed to get hash"),
-        )
-    })?;
+    let hash = password_hash
+        .hash
+        .take()
+        .ok_or_else(|| io::Error::new(io::ErrorKind::Unsupported, "Failed to get hash"))?;
     Ok((hash, password_hash.to_string()))
 }
 

diff --git a/lib/src/chunk/read.rs b/lib/src/chunk/read.rs
@@ -32,10 +32,7 @@ impl<R: Read> ChunkReader<R> {
         let crc = u32::from_be_bytes(crc);
 
         if crc != crc_hasher.finalize() {
-            return Err(io::Error::new(
-                io::ErrorKind::InvalidData,
-                String::from("crc check failed. broken chunk"),
-            ));
+            return Err(io::Error::new(io::ErrorKind::InvalidData, "Broken chunk"));
         }
         Ok(RawChunk {
             length,