From fd11f2892e83928d0f00191dbc155c7d259eb83d Mon Sep 17 00:00:00 2001 From: Danny McClanahan <1305167+cosmicexplorer@users.noreply.github.com> Date: Tue, 16 Jul 2024 19:07:17 -0400 Subject: [PATCH] remove now-dead code --- src/aes.rs | 7 ------- src/crc32.rs | 5 ----- src/read/lzma.rs | 7 +------ src/read/xz.rs | 6 ------ src/zipcrypto.rs | 8 -------- 5 files changed, 1 insertion(+), 32 deletions(-) diff --git a/src/aes.rs b/src/aes.rs index c86a8e3a2..1773f068f 100644 --- a/src/aes.rs +++ b/src/aes.rs @@ -216,13 +216,6 @@ impl Read for AesReaderValid { } } -impl AesReaderValid { - /// Consumes this decoder, returning the underlying reader. - pub fn into_inner(self) -> R { - self.reader - } -} - pub struct AesWriter { writer: W, cipher: Cipher, diff --git a/src/crc32.rs b/src/crc32.rs index 9ad7e4b2f..a62349eb6 100644 --- a/src/crc32.rs +++ b/src/crc32.rs @@ -31,11 +31,6 @@ impl Crc32Reader { Err("Invalid checksum") } } - - #[allow(dead_code)] - pub fn into_inner(self) -> R { - self.inner - } } impl Read for Crc32Reader { diff --git a/src/read/lzma.rs b/src/read/lzma.rs index 04b6edd8e..d2b5449d6 100644 --- a/src/read/lzma.rs +++ b/src/read/lzma.rs @@ -1,6 +1,6 @@ use lzma_rs::decompress::{Options, Stream, UnpackedSize}; use std::collections::VecDeque; -use std::io::{copy, Error, Read, Result, Write}; +use std::io::{Read, Result, Write}; const COMPRESSED_BYTES_TO_BUFFER: usize = 4096; @@ -23,11 +23,6 @@ impl LzmaDecoder { stream: Stream::new_with_options(&OPTIONS, VecDeque::new()), } } - - pub fn finish(mut self) -> Result> { - copy(&mut self.compressed_reader, &mut self.stream)?; - self.stream.finish().map_err(Error::from) - } } impl Read for LzmaDecoder { diff --git a/src/read/xz.rs b/src/read/xz.rs index 478ae1024..339169243 100644 --- a/src/read/xz.rs +++ b/src/read/xz.rs @@ -262,9 +262,3 @@ impl Read for XzDecoder { Ok(written) } } - -impl XzDecoder { - pub fn into_inner(self) -> R { - self.compressed_reader.into_inner() - } -} diff --git a/src/zipcrypto.rs b/src/zipcrypto.rs index 42d0e58b6..64c4cc31d 100644 --- a/src/zipcrypto.rs +++ b/src/zipcrypto.rs @@ -202,14 +202,6 @@ impl std::io::Read for ZipCryptoReaderValid { } } -impl ZipCryptoReaderValid { - /// Consumes this decoder, returning the underlying reader. - #[allow(dead_code)] - pub fn into_inner(self) -> R { - self.reader.file - } -} - static CRCTABLE: [u32; 256] = [ 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91,