Merge branch 'master' of /~https://github.com/kper/flate2-rs

src/bufreader.rs

@@ -20,6 +20,15 @@ pub struct BufReader<R> {
     cap: usize,
 }
 
+impl<R> ::std::fmt::Debug for BufReader<R> where R: ::std::fmt::Debug {
+    fn fmt(&self, fmt: &mut ::std::fmt::Formatter) -> Result<(), ::std::fmt::Error>{
+        fmt.debug_struct("BufReader")
+            .field("reader", &self.inner)
+            .field("buffer", &format_args!("{}/{}", self.cap - self.pos, self.buf.len()))
+            .finish()
+    }
+}
+
 impl<R: Read> BufReader<R> {
     pub fn new(inner: R) -> BufReader<R> {
         BufReader::with_buf(vec![0; 32 * 1024], inner)

src/crc.rs

@@ -9,6 +9,7 @@ use ffi;
 /// The CRC calculated by a [`CrcReader`].
 ///
 /// [`CrcReader`]: struct.CrcReader.html
+#[derive(Debug)]
 pub struct Crc {
     crc: libc::c_ulong,
     amt: u32,
@@ -17,6 +18,7 @@ pub struct Crc {
 /// A wrapper around a [`Read`] that calculates the CRC.
 ///
 /// [`Read`]: https://doc.rust-lang.org/std/io/trait.Read.html
+#[derive(Debug)]
 pub struct CrcReader<R> {
     inner: R,
     crc: Crc,

src/deflate.rs

@@ -19,6 +19,7 @@ use {Compress, Decompress};
 /// uncompressed data, writing the compressed data to the wrapped writer.
 ///
 /// [`Write`]: https://doc.rust-lang.org/std/io/trait.Write.html
+#[derive(Debug)]
 pub struct EncoderWriter<W: Write> {
     inner: zio::Writer<W, Compress>,
 }
@@ -29,6 +30,7 @@ pub struct EncoderWriter<W: Write> {
 /// data from an underlying stream and emit a stream of compressed data.
 ///
 /// [`Read`]: https://doc.rust-lang.org/std/io/trait.Read.html
+#[derive(Debug)]
 pub struct EncoderReader<R> {
     inner: EncoderReaderBuf<BufReader<R>>,
 }
@@ -39,6 +41,7 @@ pub struct EncoderReader<R> {
 /// data from an underlying stream and emit a stream of compressed data.
 ///
 /// [`BufRead`]: https://doc.rust-lang.org/std/io/trait.BufRead.html
+#[derive(Debug)]
 pub struct EncoderReaderBuf<R> {
     obj: R,
     data: Compress,
@@ -50,6 +53,7 @@ pub struct EncoderReaderBuf<R> {
 /// compressed data as input, providing the decompressed data when read from.
 ///
 /// [`Read`]: https://doc.rust-lang.org/std/io/trait.Read.html
+#[derive(Debug)]
 pub struct DecoderReader<R> {
     inner: DecoderReaderBuf<BufReader<R>>,
 }
@@ -60,6 +64,7 @@ pub struct DecoderReader<R> {
 /// compressed data as input, providing the decompressed data when read from.
 ///
 /// [`BufRead`]: https://doc.rust-lang.org/std/io/trait.BufRead.html
+#[derive(Debug)]
 pub struct DecoderReaderBuf<R> {
     obj: R,
     data: Decompress,
@@ -71,6 +76,7 @@ pub struct DecoderReaderBuf<R> {
 /// data when fed a stream of compressed data.
 ///
 /// [`Write`]: https://doc.rust-lang.org/std/io/trait.Read.html
+#[derive(Debug)]
 pub struct DecoderWriter<W: Write> {
     inner: zio::Writer<W, Decompress>,
 }

src/ffi.rs

@@ -69,6 +69,12 @@ mod imp {
         inner: Box<mz_stream>,
     }
 
+    impl ::std::fmt::Debug for StreamWrapper{
+        fn fmt(&self, f: &mut ::std::fmt::Formatter) -> Result<(), ::std::fmt::Error>{
+            write!(f, "StreamWrapper")
+        }
+    }
+
     impl Default for StreamWrapper {
         fn default() -> StreamWrapper {
             StreamWrapper {
@@ -105,6 +111,12 @@ mod imp {
         inner: mz_stream,
     }
 
+    impl ::std::fmt::Debug for StreamWrapper{
+        fn fmt(&self, f: &mut ::std::fmt::Formatter) -> Result<(), ::std::fmt::Error>{
+            write!(f, "StreamWrapper")
+        }
+    }
+
     impl Default for StreamWrapper {
         fn default() -> StreamWrapper {
             StreamWrapper {

src/gz.rs

@@ -32,6 +32,7 @@ static FCOMMENT: u8 = 1 << 4;
 /// to the underlying writer `W`.
 ///
 /// [`Write`]: https://doc.rust-lang.org/std/io/trait.Write.html
+#[derive(Debug)]
 pub struct EncoderWriter<W: Write> {
     inner: zio::Writer<W, Compress>,
     crc: Crc,
@@ -46,6 +47,7 @@ pub struct EncoderWriter<W: Write> {
 /// interface.
 ///
 /// [`Read`]: https://doc.rust-lang.org/std/io/trait.Read.html
+#[derive(Debug)]
 pub struct EncoderReader<R> {
     inner: EncoderReaderBuf<BufReader<R>>,
 }
@@ -57,6 +59,7 @@ pub struct EncoderReader<R> {
 /// interface.
 ///
 /// [`Read`]: https://doc.rust-lang.org/std/io/trait.Read.html
+#[derive(Debug)]
 pub struct EncoderReaderBuf<R> {
     inner: deflate::EncoderReaderBuf<CrcReader<R>>,
     header: Vec<u8>,
@@ -67,6 +70,7 @@ pub struct EncoderReaderBuf<R> {
 /// A builder structure to create a new gzip Encoder.
 ///
 /// This structure controls header configuration options such as the filename.
+#[derive(Debug)]
 pub struct Builder {
     extra: Option<Vec<u8>>,
     filename: Option<CString>,
@@ -80,6 +84,7 @@ pub struct Builder {
 /// data from the underlying reader and emit uncompressed data.
 ///
 /// [`Read`]: https://doc.rust-lang.org/std/io/trait.Read.html
+#[derive(Debug)]
 pub struct DecoderReader<R> {
     inner: DecoderReaderBuf<BufReader<R>>,
 }
@@ -97,6 +102,7 @@ pub struct DecoderReader<R> {
 /// from the underlying reader and emit uncompressed data.
 ///
 /// [`Read`]: https://doc.rust-lang.org/std/io/trait.Read.html
+#[derive(Debug)]
 pub struct MultiDecoderReader<R> {
     inner: MultiDecoderReaderBuf<BufReader<R>>,
 }
@@ -107,6 +113,7 @@ pub struct MultiDecoderReader<R> {
 /// data from the underlying reader and emit uncompressed data.
 ///
 /// [`Read`]: https://doc.rust-lang.org/std/io/trait.Read.html
+#[derive(Debug)]
 pub struct DecoderReaderBuf<R> {
     inner: CrcReader<deflate::DecoderReaderBuf<R>>,
     header: Header,
@@ -126,6 +133,7 @@ pub struct DecoderReaderBuf<R> {
 /// from the underlying reader and emit uncompressed data.
 ///
 /// [`Read`]: https://doc.rust-lang.org/std/io/trait.Read.html
+#[derive(Debug)]
 pub struct MultiDecoderReaderBuf<R> {
     inner: CrcReader<deflate::DecoderReaderBuf<R>>,
     header: Header,
@@ -136,7 +144,7 @@ pub struct MultiDecoderReaderBuf<R> {
 ///
 /// The header can contain metadata about the file that was compressed, if
 /// present.
-#[derive(PartialEq)]
+#[derive(PartialEq, Debug)]
 pub struct Header {
     extra: Option<Vec<u8>>,
     filename: Option<Vec<u8>>,

src/mem.rs

@@ -21,6 +21,7 @@ use ffi;
 ///
 /// [`Read`]: https://doc.rust-lang.org/std/io/trait.Read.html
 /// [`Write`]: https://doc.rust-lang.org/std/io/trait.Write.html
+#[derive(Debug)]
 pub struct Compress {
     inner: Stream<DirCompress>,
 }
@@ -37,10 +38,12 @@ pub struct Compress {
 ///
 /// [`Read`]: https://doc.rust-lang.org/std/io/trait.Read.html
 /// [`Write`]: https://doc.rust-lang.org/std/io/trait.Write.html
+#[derive(Debug)]
 pub struct Decompress {
     inner: Stream<DirDecompress>,
 }
 
+#[derive(Debug)]
 struct Stream<D: Direction> {
     stream_wrapper: ffi::StreamWrapper,
     total_in: u64,
@@ -55,12 +58,14 @@ trait Direction {
     unsafe fn destroy(stream: *mut ffi::mz_stream) -> c_int;
 }
 
+#[derive(Debug)]
 enum DirCompress {}
+#[derive(Debug)]
 enum DirDecompress {}
 
 /// Values which indicate the form of flushing to be used when compressing or
 /// decompressing in-memory data.
-#[derive(Copy, Clone, PartialEq, Eq)]
+#[derive(Copy, Clone, PartialEq, Eq, Debug)]
 pub enum Flush {
     /// A typical parameter for passing to compression/decompression functions,
     /// this indicates that the underlying stream to decide how much data to
@@ -119,7 +124,7 @@ pub struct DataError(());
 
 /// Possible status results of compressing some data or successfully
 /// decompressing a block of data.
-#[derive(Copy, Clone, PartialEq, Eq)]
+#[derive(Copy, Clone, PartialEq, Eq, Debug)]
 pub enum Status {
     /// Indicates success.
     ///

src/zio.rs

@@ -4,6 +4,7 @@ use std::mem;
 
 use {Decompress, Compress, Status, Flush, DataError};
 
+#[derive(Debug)]
 pub struct Writer<W: Write, D: Ops> {
     obj: Option<W>,
     pub data: D,

src/zlib.rs

@@ -19,6 +19,7 @@ use {Compress, Decompress};
 /// uncompressed data, writing the compressed data to the wrapped writer.
 ///
 /// [`Write`]: https://doc.rust-lang.org/std/io/trait.Write.html
+#[derive(Debug)]
 pub struct EncoderWriter<W: Write> {
     inner: zio::Writer<W, Compress>,
 }
@@ -29,6 +30,7 @@ pub struct EncoderWriter<W: Write> {
 /// data from an underlying stream and emit a stream of compressed data.
 ///
 /// [`Read`]: https://doc.rust-lang.org/std/io/trait.Read.html
+#[derive(Debug)]
 pub struct EncoderReader<R> {
     inner: EncoderReaderBuf<BufReader<R>>,
 }
@@ -39,6 +41,7 @@ pub struct EncoderReader<R> {
 /// data from an underlying stream and emit a stream of compressed data.
 ///
 /// [`BufRead`]: https://doc.rust-lang.org/std/io/trait.BufRead.html
+#[derive(Debug)]
 pub struct EncoderReaderBuf<R> {
     obj: R,
     data: Compress,
@@ -50,6 +53,7 @@ pub struct EncoderReaderBuf<R> {
 /// compressed data as input, providing the decompressed data when read from.
 ///
 /// [`Read`]: https://doc.rust-lang.org/std/io/trait.Read.html
+#[derive(Debug)]
 pub struct DecoderReader<R> {
     inner: DecoderReaderBuf<BufReader<R>>,
 }
@@ -60,6 +64,7 @@ pub struct DecoderReader<R> {
 /// compressed data as input, providing the decompressed data when read from.
 ///
 /// [`BufRead`]: https://doc.rust-lang.org/std/io/trait.BufRead.html
+#[derive(Debug)]
 pub struct DecoderReaderBuf<R> {
     obj: R,
     data: Decompress,
@@ -71,6 +76,7 @@ pub struct DecoderReaderBuf<R> {
 /// data when fed a stream of compressed data.
 ///
 /// [`Write`]: https://doc.rust-lang.org/std/io/trait.Write.html
+#[derive(Debug)]
 pub struct DecoderWriter<W: Write> {
     inner: zio::Writer<W, Decompress>,
 }