💥 Change SolidEntryBuilder::add_entry argument type impl Entry to…

… `RegularEntry`
ChanTsune · Nov 18, 2023 · 05a7a9a · 05a7a9a
1 parent 5b797cf
commit 05a7a9a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/cli/src/command/commons.rs b/cli/src/command/commons.rs
@@ -1,5 +1,7 @@
 use crate::cli::{CipherAlgorithmArgs, CompressionAlgorithmArgs};
-use libpna::{Entry, EntryBuilder, EntryName, EntryPart, EntryReference, Permission, WriteOption};
+use libpna::{
+    EntryBuilder, EntryName, EntryPart, EntryReference, Permission, RegularEntry, WriteOption,
+};
 #[cfg(unix)]
 use nix::unistd::{Group, User};
 use std::fs::metadata;
@@ -49,7 +51,7 @@ pub(crate) fn create_entry(
     option: WriteOption,
     keep_timestamp: bool,
     keep_permission: bool,
-) -> io::Result<impl Entry> {
+) -> io::Result<RegularEntry> {
     if path.is_symlink() {
         let source = fs::read_link(path)?;
         let entry = EntryBuilder::new_symbolic_link(

diff --git a/lib/src/archive/entry/builder.rs b/lib/src/archive/entry/builder.rs
@@ -285,7 +285,7 @@ impl SolidEntriesBuilder {
     /// ```
     #[deprecated(since = "0.3.3", note = "Use `SolidEntryBuilder::add_entry` instead.")]
     pub fn add_entry(&mut self, entry: impl Entry) -> io::Result<()> {
-        self.0.add_entry(entry)
+        self.0.data.write_all(&entry.into_bytes())
     }
 
     /// Builds the solid archive as a [SolidEntries].
@@ -361,7 +361,7 @@ impl SolidEntryBuilder {
     /// #     Ok(())
     /// # }
     /// ```
-    pub fn add_entry(&mut self, entry: impl Entry) -> io::Result<()> {
+    pub fn add_entry(&mut self, entry: RegularEntry) -> io::Result<()> {
         self.data.write_all(&entry.into_bytes())
     }