Merge branch 'main' into feature/entries

ChanTsune · Jan 10, 2024 · 9d5c034 · 9d5c034
2 parents 865f24f + 20fd97e
commit 9d5c034
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 41 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -13,7 +13,7 @@ keywords = ["pna", "archive", "cli", "crypto", "data"]
 ansi_term = "0.12.1"
 bytesize = "1.3.0"
 chrono = "0.4.31"
-clap = { version = "4.4.11", features = ["derive"] }
+clap = { version = "4.4.13", features = ["derive"] }
 clap_complete = { version =  "4.4.6", optional = true }
 glob = "0.3.1"
 indicatif = { version = "0.17.7", features = ["improved_unicode"] }

diff --git a/lib/Cargo.toml b/lib/Cargo.toml
@@ -20,7 +20,7 @@ crc32fast = "1.2.2"
 crypto-common = { version = "0.1.6", features = ["std"] }
 ctr = { version = "0.9.2", features = ["std"] }
 flate2 = "1.0.28"
-liblzma = { version = "0.2.1", features = ["static"] }
+liblzma = { version = "0.2.2", features = ["static"] }
 password-hash = "0.5.0"
 pbkdf2 = { version = "0.12.2", features = ["simple", "parallel"] }
 rand = "0.8.5"

diff --git a/lib/src/archive/read.rs b/lib/src/archive/read.rs
@@ -212,10 +212,11 @@ pub(crate) struct EntriesIterator<'r, R: Read> {
 }
 
 impl<'r, R: Read> EntriesIterator<'r, R> {
-    fn new_with_password(reader: &'r mut Archive<R>, password: Option<String>) -> Self {
+    #[inline]
+    fn new_with_password<S: Into<String>>(reader: &'r mut Archive<R>, password: Option<S>) -> Self {
         Self {
             reader,
-            password: Some(password),
+            password: Some(password.map(Into::into)),
             buf: Default::default(),
         }
     }