Merge pull request rust-lang#152 from stepancheg/take-err

Stream::take should count errors too

Author: alexcrichton

src/stream/take.rs

@@ -30,7 +30,7 @@ impl<S> Stream for Take<S>
             Ok(Async::Ready(None))
         } else {
             match self.stream.poll() {
-                e @ Ok(Async::Ready(Some(_))) => {
+                e @ Ok(Async::Ready(Some(_))) | e @ Err(_) => {
                     self.remaining -= 1;
                     e
                 }