💀 SolidEntries trait make deprecated

ChanTsune · Nov 18, 2023 · 206e691 · 206e691
1 parent a89ce0a
commit 206e691
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/lib/src/archive/entry.rs b/lib/src/archive/entry.rs
@@ -38,6 +38,7 @@ pub trait Entry: SealedIntoChunks {
 }
 
 /// Solid mode entries block.
+#[deprecated(since = "0.4.0")]
 pub trait SolidEntries: SealedIntoChunks {
     fn bytes_len(&self) -> usize;
     fn into_bytes(self) -> Vec<u8>;
@@ -54,13 +55,15 @@ impl SealedIntoChunks for EntryContainer {
 
 impl Entry for EntryContainer {
     fn bytes_len(&self) -> usize {
+        #[allow(deprecated)]
         match self {
             Self::Regular(r) => r.bytes_len(),
             Self::Solid(s) => s.bytes_len(),
         }
     }
 
     fn into_bytes(self) -> Vec<u8> {
+        #[allow(deprecated)]
         match self {
             Self::Regular(r) => r.into_bytes(),
             Self::Solid(s) => s.into_bytes(),
@@ -184,6 +187,7 @@ impl SealedIntoChunks for SolidReadEntry {
     }
 }
 
+#[allow(deprecated)]
 impl SolidEntries for SolidReadEntry {
     fn bytes_len(&self) -> usize {
         self.clone().into_bytes().len()
@@ -543,6 +547,7 @@ impl SealedIntoChunks for ChunkSolidEntries {
     }
 }
 
+#[allow(deprecated)]
 impl SolidEntries for ChunkSolidEntries {
     fn bytes_len(&self) -> usize {
         self.0.iter().map(|chunk| chunk.bytes_len()).sum()

diff --git a/lib/src/archive/entry/builder.rs b/lib/src/archive/entry/builder.rs
@@ -1,12 +1,15 @@
+#[allow(deprecated)]
+use crate::archive::SolidEntries;
 use crate::{
     archive::entry::{
         writer_and_hash, Entry, EntryContainer, EntryHeader, EntryName, EntryReference, Metadata,
-        Permission, RegularEntry, SolidEntries, SolidHeader, SolidReadEntry, WriteOption,
+        Permission, RegularEntry, SolidHeader, SolidReadEntry, WriteOption,
     },
     cipher::CipherWriter,
     compress::CompressionWriter,
     io::TryIntoInner,
 };
+
 use std::{
     io::{self, Write},
     time::Duration,
@@ -303,6 +306,7 @@ impl SolidEntriesBuilder {
     /// }
     /// ```
     #[deprecated(since = "0.3.3", note = "Use `SolidEntryBuilder::build` instead.")]
+    #[allow(deprecated)]
     #[inline]
     pub fn build(self) -> io::Result<impl SolidEntries> {
         self.0.build_as_entry()

diff --git a/lib/src/archive/write.rs b/lib/src/archive/write.rs
@@ -1,5 +1,7 @@
+#[allow(deprecated)]
+use crate::archive::SolidEntries;
 use crate::{
-    archive::{Archive, ArchiveHeader, Entry, EntryPart, SolidEntries, PNA_HEADER},
+    archive::{Archive, ArchiveHeader, Entry, EntryPart, PNA_HEADER},
     chunk::{ChunkType, ChunkWriter},
 };
 use std::io::{self, Write};
@@ -85,6 +87,7 @@ impl<W: Write> Archive<W> {
     /// }
     /// ```
     #[deprecated(since = "0.3.3", note = "Use `Archive::add_entry` instead.")]
+    #[allow(deprecated)]
     pub fn add_solid_entries(&mut self, entries: impl SolidEntries) -> io::Result<usize> {
         let bytes = entries.into_bytes();
         self.inner.write_all(&bytes)?;