Update for upstream Stream changes.

With the landing of rust-lang/rust#8984, we can finally use Stream
meaningfully...

Author: chris-morgan

src/libhttp/buffer.rs

@@ -32,7 +32,7 @@ struct BufferedStream<T> {
     writing_chunked_body: bool,
 }
 
-impl<T: Reader + Writer /*Stream*/> BufferedStream<T> {
+impl<T: Stream> BufferedStream<T> {
     pub fn new(stream: T, call_wrapped_flush: bool) -> BufferedStream<T> {
         BufferedStream {
             wrapped: stream,

src/libhttp/client/response.rs

@@ -1,4 +1,4 @@
-use std::rt::io::{Reader, Writer};
+use std::rt::io::{Reader, Stream};
 use std::rt::io::extensions::ReaderUtil;
 use std::rt::io::{io_error, OtherIoError, IoError};
 use client::request::RequestWriter;
@@ -36,7 +36,7 @@ fn bad_response_err() -> IoError {
     }
 }
 
-impl<S: Reader + Writer> ResponseReader<S> {
+impl<S: Stream> ResponseReader<S> {
     pub fn construct(mut stream: BufferedStream<S>, request: ~RequestWriter<S>)
             -> Result<ResponseReader<S>, ~RequestWriter<S>> {
         // TODO: raise condition at the points where Err is returned
@@ -143,7 +143,7 @@ impl<S: Reader + Writer> ResponseReader<S> {
     }
 }
 
-impl<S: Reader + Writer> Reader for ResponseReader<S> {
+impl<S: Stream> Reader for ResponseReader<S> {
     fn read(&mut self, buf: &mut [u8]) -> Option<uint> {
         self.stream.read(buf)
     }

src/libhttp/server/request.rs

@@ -1,7 +1,7 @@
 use extra::url::Url;
 use method::{Method, Options};
 use status;
-use std::rt::io::{Reader, Writer};
+use std::rt::io::Stream;
 use std::rt::io::net::ip::SocketAddr;
 use rfc2616::{CR, LF, SP};
 use headers;
@@ -29,7 +29,7 @@ pub struct RequestBuffer<'self, S> {
     line_bytes: ~[u8],
 }
 
-impl<'self, S: Reader + Writer> RequestBuffer<'self, S> {
+impl<'self, S: Stream> RequestBuffer<'self, S> {
     pub fn new<'a>(stream: &'a mut BufferedStream<S>) -> RequestBuffer<'a, S> {
         RequestBuffer {
             stream: stream,