Finish update to rust master

Author: alexcrichton

Cargo.toml

@@ -2,7 +2,7 @@
 
 name = "flate2"
 authors = ["Alex Crichton <[email protected]>"]
-version = "0.1.1"
+version = "0.1.2"
 license = "MIT/Apache-2.0"
 readme = "README.md"
 keywords = ["gzip", "flate", "zlib", "encoding"]

src/lib.rs

@@ -25,7 +25,7 @@
 //! already existing stream to chain construction.
 
 #![deny(missing_docs)]
-#![feature(unsafe_destructor)]
+#![feature(unsafe_destructor, associated_types)]
 
 extern crate libc;
 extern crate "miniz-sys" as ffi;
@@ -79,7 +79,7 @@ pub enum CompressionLevel {
 }
 
 /// A helper trait to create encoder/decoders with method syntax.
-pub trait FlateReader: Reader {
+pub trait FlateReader: Reader + Sized {
     /// Consume this reader to create a compression stream at the specified
     /// compression level.
     fn gz_encode(self, lvl: CompressionLevel) -> reader::GzEncoder<Self> {
@@ -115,7 +115,7 @@ pub trait FlateReader: Reader {
 }
 
 /// A helper trait to create encoder/decoders with method syntax.
-pub trait FlateWriter: Writer {
+pub trait FlateWriter: Writer + Sized {
     /// Consume this writer to create a compression stream at the specified
     /// compression level.
     fn gz_encode(self, lvl: CompressionLevel) -> writer::GzEncoder<Self> {

src/raw.rs

@@ -274,6 +274,7 @@ impl Stream {
 }
 
 impl Deref for Stream {
+    type Target = ffi::mz_stream;
     fn deref<'a>(&'a self) -> &'a ffi::mz_stream {
         let Stream(ref inner, _) = *self; inner
     }