From 2a6bd46661076ccea5ba327fcd1efb95ca386fa7 Mon Sep 17 00:00:00 2001 From: Chewing_Bever Date: Fri, 14 Jul 2023 13:24:50 +0200 Subject: [PATCH] refactor(libarchive): rename ArchiveFile to FileReader --- libarchive/src/read/builder.rs | 6 +++--- libarchive/src/read/file.rs | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libarchive/src/read/builder.rs b/libarchive/src/read/builder.rs index 0e809dd..e827130 100644 --- a/libarchive/src/read/builder.rs +++ b/libarchive/src/read/builder.rs @@ -1,4 +1,4 @@ -use super::file::ArchiveFile; +use super::file::FileReader; use crate::archive::{Handle, ReadCompression, ReadFilter, ReadFormat}; use crate::error::{ArchiveError, Result}; use crate::read::Archive; @@ -119,9 +119,9 @@ impl Builder { } /// Open a file with this builder, consuming it and returning a `FileReader` - pub fn open_file>(self, file: T) -> Result { + pub fn open_file>(self, file: T) -> Result { self.check_consumed()?; - ArchiveFile::open(self, file) + FileReader::open(self, file) } /// Open a stream with this builder, consuming it and returning a `StreamReader` diff --git a/libarchive/src/read/file.rs b/libarchive/src/read/file.rs index a02f0e9..4581dad 100644 --- a/libarchive/src/read/file.rs +++ b/libarchive/src/read/file.rs @@ -7,12 +7,12 @@ use std::path::Path; const BLOCK_SIZE: usize = 10240; -pub struct ArchiveFile { +pub struct FileReader { handle: *mut ffi::Struct_archive, // entry: ReaderEntry, } -impl Handle for ArchiveFile { +impl Handle for FileReader { unsafe fn handle(&self) -> *const ffi::Struct_archive { self.handle as *const _ } @@ -22,7 +22,7 @@ impl Handle for ArchiveFile { } } -impl Drop for ArchiveFile { +impl Drop for FileReader { fn drop(&mut self) { unsafe { ffi::archive_read_free(self.handle_mut()); @@ -30,7 +30,7 @@ impl Drop for ArchiveFile { } } -impl Archive for ArchiveFile { +impl Archive for FileReader { fn new(handle: *mut ffi::Struct_archive) -> Self { Self { handle } }