Remove almost all old_io code

Cargo.toml

@@ -11,5 +11,8 @@ Library to support the reading and writing of zip files.
 
 [dependencies]
 flate2 = "*"
-bzip2 = "*"
 time = "*"
+
+[dependencies.bzip2]
+git = "https://github.com/mvdnes/bzip2-rs"
+branch = "new_io"

src/ioconverter.rs

@@ -1,60 +0,0 @@
-use std::io;
-use std::io::prelude::*;
-use std::old_io;
-
-pub struct IoConverter<T> {
-    inner: T,
-}
-
-impl<T> IoConverter<T> {
-    pub fn new(inner: T) -> IoConverter<T> {
-        IoConverter { inner: inner, }
-    }
-    pub fn into_inner(self) -> T {
-        self.inner
-    }
-}
-
-impl<W: Write> Writer for IoConverter<W> {
-    fn write_all(&mut self, buf: &[u8]) -> old_io::IoResult<()> {
-        match self.inner.write_all(buf) {
-            Ok(()) => Ok(()),
-            Err(..) => Err(old_io::standard_error(old_io::OtherIoError)),
-        }
-    }
-}
-
-impl<W: Writer> Write for IoConverter<W> {
-    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        match self.inner.write_all(buf) {
-            Ok(()) => Ok(buf.len()),
-            Err(..) => Err(io::Error::new(io::ErrorKind::Other, "Some writing error", None)),
-        }
-    }
-    fn flush(&mut self) -> io::Result<()> {
-        match self.inner.flush() {
-            Ok(()) => Ok(()),
-            Err(..) => Err(io::Error::new(io::ErrorKind::Other, "Some flushing error", None)),
-        }
-    }
-}
-
-impl<R: Reader> Read for IoConverter<R> {
-    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        match self.inner.read(buf) {
-            Ok(v) => Ok(v),
-            Err(ref e) if e.kind == old_io::EndOfFile => Ok(0),
-            Err(..) => Err(io::Error::new(io::ErrorKind::Other, "Some reading error", None)),
-        }
-    }
-}
-
-impl<R: Read> Reader for IoConverter<R> {
-    fn read(&mut self, buf: &mut [u8]) -> old_io::IoResult<usize> {
-        match self.inner.read(buf) {
-            Ok(0) if buf.len() > 0 => Err(old_io::standard_error(old_io::EndOfFile)),
-            Ok(v) => Ok(v),
-            Err(..) => Err(old_io::standard_error(old_io::OtherIoError)),
-        }
-    }
-}

src/lib.rs

@@ -25,4 +25,3 @@ pub mod compression;
 mod writer;
 mod cp437;
 pub mod result;
-mod ioconverter;

src/reader.rs

@@ -10,7 +10,6 @@ use std::cell::{RefCell, BorrowState};
 use std::collections::HashMap;
 use flate2::FlateReadExt;
 use bzip2::reader::BzDecompressor;
-use ioconverter::IoConverter;
 
 /// Wrapper for reading the contents of a ZIP file.
 ///
@@ -130,7 +129,7 @@ impl<T: Read+io::Seek> ZipReader<T>
             },
             CompressionMethod::Bzip2 =>
             {
-                let bzip2_reader = IoConverter::new(BzDecompressor::new(IoConverter::new(limit_reader)));
+                let bzip2_reader = BzDecompressor::new(limit_reader);
                 Box::new(
                     Crc32Reader::new(
                         bzip2_reader,

src/result.rs

@@ -1,6 +1,5 @@
 //! Error types that can be emitted from this library
 
-use std::old_io::IoError;
 use std::io;
 use std::error;
 use std::fmt;
@@ -12,9 +11,6 @@ pub type ZipResult<T> = Result<T, ZipError>;
 #[derive(Debug)]
 pub enum ZipError
 {
-    /// An Error caused by old I/O
-    OldIo(IoError),
-
     /// An Error caused by I/O
     Io(io::Error),
 
@@ -37,9 +33,6 @@ impl ZipError
 
         match *self
         {
-            ZipError::OldIo(ref io_err) => {
-                ("OldIo Error: ".to_string() + io_err.description()).into_cow()
-            },
             ZipError::Io(ref io_err) => {
                 ("Io Error: ".to_string() + io_err.description()).into_cow()
             },
@@ -53,14 +46,6 @@ impl ZipError
     }
 }
 
-impl error::FromError<IoError> for ZipError
-{
-    fn from_error(err: IoError) -> ZipError
-    {
-        ZipError::OldIo(err)
-    }
-}
-
 impl error::FromError<io::Error> for ZipError
 {
     fn from_error(err: io::Error) -> ZipError
@@ -83,7 +68,6 @@ impl error::Error for ZipError
     {
         match *self
         {
-            ZipError::OldIo(ref io_err) => io_err.description(),
             ZipError::Io(ref io_err) => io_err.description(),
             ZipError::InvalidZipFile(..) => "Invalid Zip File",
             ZipError::UnsupportedZipFile(..) => "Unsupported Zip File",
@@ -95,7 +79,6 @@ impl error::Error for ZipError
     {
         match *self
         {
-            ZipError::OldIo(ref io_err) => Some(io_err as &error::Error),
             ZipError::Io(ref io_err) => Some(io_err as &error::Error),
             _ => None,
         }

src/writer.rs

@@ -14,14 +14,13 @@ use flate2::FlateWriteExt;
 use flate2::write::DeflateEncoder;
 use bzip2;
 use bzip2::writer::BzCompressor;
-use ioconverter::IoConverter;
 
 enum GenericZipWriter<W>
 {
     Closed,
     Storer(W),
     Deflater(DeflateEncoder<W>),
-    Bzip2(IoConverter<BzCompressor<IoConverter<W>>>),
+    Bzip2(BzCompressor<W>),
 }
 
 /// Generator for ZIP files.
@@ -236,7 +235,7 @@ impl<W: Write+io::Seek> GenericZipWriter<W>
         {
             GenericZipWriter::Storer(w) => w,
             GenericZipWriter::Deflater(w) => try!(w.finish()),
-            GenericZipWriter::Bzip2(w) => match w.into_inner().into_inner() { Ok(r) => r.into_inner(), Err((_, err)) => try!(Err(err)) },
+            GenericZipWriter::Bzip2(w) => match w.into_inner() { Ok(r) => r, Err((_, err)) => try!(Err(err)) },
             GenericZipWriter::Closed => try!(Err(io::Error::new(io::ErrorKind::BrokenPipe, "ZipWriter was already closed", None))),
         };
 
@@ -244,7 +243,7 @@ impl<W: Write+io::Seek> GenericZipWriter<W>
         {
             CompressionMethod::Stored => GenericZipWriter::Storer(bare),
             CompressionMethod::Deflated => GenericZipWriter::Deflater(bare.deflate_encode(flate2::Compression::Default)),
-            CompressionMethod::Bzip2 => GenericZipWriter::Bzip2(IoConverter::new(BzCompressor::new(IoConverter::new(bare), bzip2::CompressionLevel::Default))),
+            CompressionMethod::Bzip2 => GenericZipWriter::Bzip2(BzCompressor::new(bare, bzip2::CompressionLevel::Default)),
             _ => return Err(ZipError::UnsupportedZipFile("Unsupported compression")),
         };