From 7bcdc3b4ca460aec2b98fb2dca6165788c562b05 Mon Sep 17 00:00:00 2001
From: Igor Tolmachev <me@igorek.dev>
Date: Sat, 20 Jul 2024 16:52:39 +0900
Subject: Partial aes implementation and others improvements

---
 src/archive.rs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/archive.rs')

diff --git a/src/archive.rs b/src/archive.rs
index d49689d..d03f143 100644
--- a/src/archive.rs
+++ b/src/archive.rs
@@ -1,7 +1,6 @@
 use crate::driver::{ArchiveRead, ArchiveWrite, Driver};
-use crate::ArchiveResult;
 use std::fs::File;
-use std::io::{Read, Write};
+use std::io::{Error as IoError, Read, Write};
 use std::path::Path;
 
 pub struct Archive<D: Driver> {
@@ -12,16 +11,17 @@ impl<D: ArchiveRead> Archive<D>
 where
     D::Io: std::io::Read,
 {
-    pub fn read(io: D::Io) -> ArchiveResult<Self, D::Error> {
+    pub fn read(io: D::Io) -> Result<Self, D::Error> {
         Ok(Self {
             driver: D::read(io)?,
         })
     }
 
     #[inline]
-    pub fn read_from_file(path: impl AsRef<Path>) -> ArchiveResult<Self, D::Error>
+    pub fn read_from_file(path: impl AsRef<Path>) -> Result<Self, D::Error>
     where
         D: ArchiveRead<Io = File>,
+        D::Error: From<IoError>,
     {
         Self::read(File::open(path)?)
     }
@@ -35,23 +35,23 @@ where
         self.files().len()
     }
 
-    pub fn get_file_index(&self, name: &str) -> ArchiveResult<usize, D::Error> {
+    pub fn get_file_index(&self, name: &str) -> Result<usize, D::Error> {
         self.driver.get_file_index(name)
     }
 
-    pub fn get_file_info_by_index(&self, index: usize) -> ArchiveResult<&D::FileInfo, D::Error> {
+    pub fn get_file_info_by_index(&self, index: usize) -> Result<&D::FileInfo, D::Error> {
         self.driver.get_file_info(index)
     }
 
     #[inline]
-    pub fn get_file_info_by_name(&self, name: &str) -> ArchiveResult<&D::FileInfo, D::Error> {
+    pub fn get_file_info_by_name(&self, name: &str) -> Result<&D::FileInfo, D::Error> {
         self.get_file_info_by_index(self.get_file_index(name)?)
     }
 
     pub fn get_file_reader_by_index<'d>(
         &'d mut self,
         index: usize,
-    ) -> ArchiveResult<D::FileReader<'d>, D::Error> {
+    ) -> Result<D::FileReader<'d>, D::Error> {
         self.driver.get_file_reader(index)
     }
 
@@ -59,7 +59,7 @@ where
     pub fn get_file_reader_by_name<'d>(
         &'d mut self,
         name: &str,
-    ) -> ArchiveResult<D::FileReader<'d>, D::Error> {
+    ) -> Result<D::FileReader<'d>, D::Error> {
         self.get_file_reader_by_index(self.get_file_index(name)?)
     }
 }
-- 
cgit v1.2.3