Implement Debug for public types rust-lang#83

src/bufreader.rs

@@ -13,6 +13,7 @@ use std::io;
 use std::io::prelude::*;
 use std::mem;
 
+#[derive(Debug)]
 pub struct BufReader<R> {
     inner: R,
     buf: Box<[u8]>,

src/crc.rs

@@ -7,12 +7,14 @@ use libc;
 use ffi;
 
 /// The CRC calculated by a CrcReader.
+#[derive(Debug)]
 pub struct Crc {
     crc: libc::c_ulong,
     amt: u32,
 }
 
 /// A wrapper around a `std::io::Read` that calculates the CRC.
+#[derive(Debug)]
 pub struct CrcReader<R> {
     inner: R,
     crc: Crc,

src/deflate.rs

@@ -17,6 +17,7 @@ use {Compress, Decompress};
 ///
 /// This structure implements a `Write` interface and takes a stream of
 /// uncompressed data, writing the compressed data to the wrapped writer.
+#[derive(Debug)]
 pub struct EncoderWriter<W: Write> {
     inner: zio::Writer<W, Compress>,
 }
@@ -25,6 +26,7 @@ pub struct EncoderWriter<W: Write> {
 ///
 /// This structure implements a `Read` interface and will read uncompressed
 /// data from an underlying stream and emit a stream of compressed data.
+#[derive(Debug)]
 pub struct EncoderReader<R: Read> {
     inner: EncoderReaderBuf<BufReader<R>>,
 }
@@ -33,6 +35,7 @@ pub struct EncoderReader<R: Read> {
 ///
 /// This structure implements a `BufRead` interface and will read uncompressed
 /// data from an underlying stream and emit a stream of compressed data.
+#[derive(Debug)]
 pub struct EncoderReaderBuf<R: BufRead> {
     obj: R,
     data: Compress,
@@ -42,6 +45,7 @@ pub struct EncoderReaderBuf<R: BufRead> {
 ///
 /// This structure implements a `Read` interface and takes a stream of
 /// compressed data as input, providing the decompressed data when read from.
+#[derive(Debug)]
 pub struct DecoderReader<R: Read> {
     inner: DecoderReaderBuf<BufReader<R>>,
 }
@@ -50,6 +54,7 @@ pub struct DecoderReader<R: Read> {
 ///
 /// This structure implements a `BufRead` interface and takes a stream of
 /// compressed data as input, providing the decompressed data when read from.
+#[derive(Debug)]
 pub struct DecoderReaderBuf<R: BufRead> {
     obj: R,
     data: Decompress,
@@ -59,6 +64,7 @@ pub struct DecoderReaderBuf<R: BufRead> {
 ///
 /// This structure implements a `Write` and will emit a stream of decompressed
 /// data when fed a stream of compressed data.
+#[derive(Debug)]
 pub struct DecoderWriter<W: Write> {
     inner: zio::Writer<W, Decompress>,
 }

src/ffi.rs

@@ -65,6 +65,7 @@ mod imp {
                          mem::size_of::<mz_stream>() as c_int)
     }
 
+    #[derive(Debug)]
     pub struct StreamWrapper{
         inner: Box<mz_stream>,
     }
@@ -105,6 +106,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

@@ -29,6 +29,7 @@ static FCOMMENT: u8 = 1 << 4;
 ///
 /// This structure exposes a `Write` interface that will emit compressed data
 /// to the underlying writer `W`.
+#[derive(Debug)]
 pub struct EncoderWriter<W: Write> {
     inner: zio::Writer<W, Compress>,
     crc: Crc,
@@ -41,6 +42,7 @@ pub struct EncoderWriter<W: Write> {
 /// This structure exposes a `Read` interface that will read uncompressed data
 /// from the underlying reader and expose the compressed version as a `Read`
 /// interface.
+#[derive(Debug)]
 pub struct EncoderReader<R: Read> {
     inner: EncoderReaderBuf<BufReader<R>>,
 }
@@ -50,6 +52,7 @@ pub struct EncoderReader<R: Read> {
 /// This structure exposes a `Read` interface that will read uncompressed data
 /// from the underlying reader and expose the compressed version as a `Read`
 /// interface.
+#[derive(Debug)]
 pub struct EncoderReaderBuf<R: BufRead> {
     inner: deflate::EncoderReaderBuf<CrcReader<R>>,
     header: Vec<u8>,
@@ -60,6 +63,7 @@ pub struct EncoderReaderBuf<R: BufRead> {
 /// 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>,
@@ -71,6 +75,7 @@ pub struct Builder {
 ///
 /// This structure exposes a `Read` interface that will consume compressed
 /// data from the underlying reader and emit uncompressed data.
+#[derive(Debug)]
 pub struct DecoderReader<R: Read> {
     inner: DecoderReaderBuf<BufReader<R>>,
 }
@@ -86,6 +91,7 @@ pub struct DecoderReader<R: Read> {
 ///
 /// This structure exposes a `Read` interface that will consume all gzip members
 /// from the underlying reader and emit uncompressed data.
+#[derive(Debug)]
 pub struct MultiDecoderReader<R: Read> {
     inner: MultiDecoderReaderBuf<BufReader<R>>,
 }
@@ -94,6 +100,7 @@ pub struct MultiDecoderReader<R: Read> {
 ///
 /// This structure exposes a `Read` interface that will consume compressed
 /// data from the underlying reader and emit uncompressed data.
+#[derive(Debug)]
 pub struct DecoderReaderBuf<R: BufRead> {
     inner: CrcReader<deflate::DecoderReaderBuf<R>>,
     header: Header,
@@ -111,6 +118,7 @@ pub struct DecoderReaderBuf<R: BufRead> {
 ///
 /// This structure exposes a `Read` interface that will consume all gzip members
 /// from the underlying reader and emit uncompressed data.
+#[derive(Debug)]
 pub struct MultiDecoderReaderBuf<R: BufRead> {
     inner: CrcReader<deflate::DecoderReaderBuf<R>>,
     header: Header,
@@ -121,7 +129,7 @@ pub struct MultiDecoderReaderBuf<R: BufRead> {
 ///
 /// 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

@@ -18,6 +18,7 @@ use ffi;
 ///
 /// It is recommended to use the I/O stream adaptors over this type as they're
 /// easier to use.
+#[derive(Debug)]
 pub struct Compress {
     inner: Stream<DirCompress>,
 }
@@ -31,10 +32,12 @@ pub struct Compress {
 ///
 /// It is recommended to use the I/O stream adaptors over this type as they're
 /// easier to use.
+#[derive(Debug)]
 pub struct Decompress {
     inner: Stream<DirDecompress>,
 }
 
+#[derive(Debug)]
 struct Stream<D: Direction> {
     stream_wrapper: ffi::StreamWrapper,
     total_in: u64,
@@ -49,12 +52,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
@@ -113,7 +118,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

@@ -17,6 +17,7 @@ use {Compress, Decompress};
 ///
 /// This structure implements a `Write` interface and takes a stream of
 /// uncompressed data, writing the compressed data to the wrapped writer.
+#[derive(Debug)]
 pub struct EncoderWriter<W: Write> {
     inner: zio::Writer<W, Compress>,
 }
@@ -25,6 +26,7 @@ pub struct EncoderWriter<W: Write> {
 ///
 /// This structure implements a `Read` interface and will read uncompressed
 /// data from an underlying stream and emit a stream of compressed data.
+#[derive(Debug)]
 pub struct EncoderReader<R> {
     inner: EncoderReaderBuf<BufReader<R>>,
 }
@@ -33,6 +35,7 @@ pub struct EncoderReader<R> {
 ///
 /// This structure implements a `BufRead` interface and will read uncompressed
 /// data from an underlying stream and emit a stream of compressed data.
+#[derive(Debug)]
 pub struct EncoderReaderBuf<R> {
     obj: R,
     data: Compress,
@@ -42,6 +45,7 @@ pub struct EncoderReaderBuf<R> {
 ///
 /// This structure implements a `Read` interface and takes a stream of
 /// compressed data as input, providing the decompressed data when read from.
+#[derive(Debug)]
 pub struct DecoderReader<R> {
     inner: DecoderReaderBuf<BufReader<R>>,
 }
@@ -50,6 +54,7 @@ pub struct DecoderReader<R> {
 ///
 /// This structure implements a `BufRead` interface and takes a stream of
 /// compressed data as input, providing the decompressed data when read from.
+#[derive(Debug)]
 pub struct DecoderReaderBuf<R> {
     obj: R,
     data: Decompress,
@@ -59,6 +64,7 @@ pub struct DecoderReaderBuf<R> {
 ///
 /// This structure implements a `Write` and will emit a stream of decompressed
 /// data when fed a stream of compressed data.
+#[derive(Debug)]
 pub struct DecoderWriter<W: Write> {
     inner: zio::Writer<W, Decompress>,
 }