DevComp/zip-rs-wasm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

use the fully qualified decoder name

Browse source
This commit is contained in:
Mackenzie Clark 2018-11-09 16:20:40 -08:00
parent 9e849ef089
commit 6528ea63d2
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/read.rs
View file

@ -15,7 +15,7 @@ use cp437::FromCp437;
use msdos_time::{TmMsDosExt, MsDosDateTime}; use msdos_time::{TmMsDosExt, MsDosDateTime};
#[cfg(feature = "deflate")] #[cfg(feature = "deflate")]
use libflate::deflate::Decoder; use libflate;
#[cfg(feature = "bzip2")] #[cfg(feature = "bzip2")]
use bzip2::read::BzDecoder; use bzip2::read::BzDecoder;
@ -79,7 +79,7 @@ enum ZipFileReader<'a> {
NoReader, NoReader,
Stored(Crc32Reader<io::Take<&'a mut Read>>), Stored(Crc32Reader<io::Take<&'a mut Read>>),
#[cfg(feature = "deflate")] #[cfg(feature = "deflate")]
Deflated(Crc32Reader<Decoder<io::Take<&'a mut Read>>>), Deflated(Crc32Reader<libflate::deflate::Decoder<io::Take<&'a mut Read>>>),
#[cfg(feature = "bzip2")] #[cfg(feature = "bzip2")]
Bzip2(Crc32Reader<BzDecoder<io::Take<&'a mut Read>>>), Bzip2(Crc32Reader<BzDecoder<io::Take<&'a mut Read>>>),
} }
@ -112,7 +112,7 @@ fn make_reader<'a>(
#[cfg(feature = "deflate")] #[cfg(feature = "deflate")]
CompressionMethod::Deflated => CompressionMethod::Deflated =>
{ {
let deflate_reader = Decoder::new(reader); let deflate_reader = libflate::deflate::Decoder::new(reader);
Ok(ZipFileReader::Deflated(Crc32Reader::new( Ok(ZipFileReader::Deflated(Crc32Reader::new(
deflate_reader, deflate_reader,
crc32))) crc32)))