🚚 Rename ReadEntryContainer to EntryContainer

ChanTsune · Nov 13, 2023 · 84e73c6 · 84e73c6
1 parent 2301f01
commit 84e73c6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/lib/src/archive/entry.rs b/lib/src/archive/entry.rs
@@ -83,18 +83,18 @@ impl<R: Read> Read for EntryReader<R> {
 }
 
 #[derive(Clone, Eq, PartialEq, Ord, PartialOrd, Hash, Debug)]
-pub(crate) enum ReadEntryContainer {
+pub(crate) enum EntryContainer {
     Solid(SolidReadEntry),
-    NonSolid(ReadEntry),
+    Regular(ReadEntry),
 }
 
-impl TryFrom<ChunkEntry> for ReadEntryContainer {
+impl TryFrom<ChunkEntry> for EntryContainer {
     type Error = io::Error;
     fn try_from(entry: ChunkEntry) -> Result<Self, Self::Error> {
         if let Some(first_chunk) = entry.0.first() {
             match first_chunk.ty {
                 ChunkType::SHED => Ok(Self::Solid(SolidReadEntry::try_from(entry)?)),
-                ChunkType::FHED => Ok(Self::NonSolid(ReadEntry::try_from(entry)?)),
+                ChunkType::FHED => Ok(Self::Regular(ReadEntry::try_from(entry)?)),
                 _ => Err(io::Error::new(io::ErrorKind::InvalidData, "Invalid entry")),
             }
         } else {

diff --git a/lib/src/archive/read.rs b/lib/src/archive/read.rs
@@ -1,5 +1,5 @@
 use crate::{
-    archive::{Archive, ArchiveHeader, ChunkEntry, ReadEntry, ReadEntryContainer, PNA_HEADER},
+    archive::{Archive, ArchiveHeader, ChunkEntry, EntryContainer, ReadEntry, PNA_HEADER},
     chunk::{Chunk, ChunkReader, ChunkType, RawChunk},
 };
 use std::{
@@ -103,8 +103,8 @@ impl<R: Read> Archive<R> {
         loop {
             let entry = self.read_entry()?;
             return match entry {
-                Some(ReadEntryContainer::NonSolid(entry)) => Ok(Some(entry)),
-                Some(ReadEntryContainer::Solid(_)) => continue,
+                Some(EntryContainer::Regular(entry)) => Ok(Some(entry)),
+                Some(EntryContainer::Solid(_)) => continue,
                 None => Ok(None),
             };
         }
@@ -119,7 +119,7 @@ impl<R: Read> Archive<R> {
     /// # Errors
     ///
     /// Returns an error if an I/O error occurs while reading from the archive.
-    pub(crate) fn read_entry(&mut self) -> io::Result<Option<ReadEntryContainer>> {
+    pub(crate) fn read_entry(&mut self) -> io::Result<Option<EntryContainer>> {
         let entry = self.next_raw_item()?;
         match entry {
             Some(entry) => Ok(Some(entry.try_into()?)),
@@ -223,8 +223,8 @@ impl<'r, R: Read> Iterator for Entries<'r, R> {
         }
         let entry = self.reader.read_entry();
         match entry {
-            Ok(Some(ReadEntryContainer::NonSolid(entry))) => Some(Ok(entry)),
-            Ok(Some(ReadEntryContainer::Solid(entry))) => match &self.password {
+            Ok(Some(EntryContainer::Regular(entry))) => Some(Ok(entry)),
+            Ok(Some(EntryContainer::Solid(entry))) => match &self.password {
                 Some(password) => {
                     let entries = entry.entries(password.as_deref());
                     match entries {