diff --git a/src/client/request.rs b/src/client/request.rs index dc48aeb4..00e3f0be 100644 --- a/src/client/request.rs +++ b/src/client/request.rs @@ -57,7 +57,7 @@ impl Request { debug!("port={}", port); let stream: S = try_io!(NetworkStream::connect(host.as_slice(), port, url.scheme.as_slice())); - let stream = ThroughWriter(BufferedWriter::new(stream.abstract())); + let stream = ThroughWriter(BufferedWriter::new(stream.dynamic())); let mut headers = Headers::new(); headers.set(Host(host)); diff --git a/src/client/response.rs b/src/client/response.rs index 7124cf6c..adc2f631 100644 --- a/src/client/response.rs +++ b/src/client/response.rs @@ -25,7 +25,7 @@ impl Response { /// Creates a new response from a server. pub fn new(stream: Box) -> HttpResult { - let mut stream = BufferedReader::new(stream.abstract()); + let mut stream = BufferedReader::new(stream.dynamic()); let (version, status) = try!(read_status_line(&mut stream)); let headers = try!(header::Headers::from_raw(&mut stream)); diff --git a/src/net.rs b/src/net.rs index d436005a..6473e586 100644 --- a/src/net.rs +++ b/src/net.rs @@ -42,14 +42,14 @@ pub trait NetworkStream: Stream + Clone + Send { /// Turn this into an appropriately typed trait object. #[inline] - fn abstract(self) -> Box { + fn dynamic(self) -> Box { box self as Box } #[doc(hidden)] #[inline] // Hack to work around lack of Clone impl for Box - fn clone_box(&self) -> Box { self.clone().abstract() } + fn clone_box(&self) -> Box { self.clone().dynamic() } } impl Clone for Box { diff --git a/src/server/request.rs b/src/server/request.rs index 4506bf13..36d8d527 100644 --- a/src/server/request.rs +++ b/src/server/request.rs @@ -38,7 +38,7 @@ impl Request { pub fn new(mut stream: S) -> HttpResult { let remote_addr = try_io!(stream.peer_name()); debug!("remote addr = {}", remote_addr); - let mut stream = BufferedReader::new(stream.abstract()); + let mut stream = BufferedReader::new(stream.dynamic()); let (method, uri, version) = try!(read_request_line(&mut stream)); let headers = try!(Headers::from_raw(&mut stream)); diff --git a/src/server/response.rs b/src/server/response.rs index 040d1796..a6eba9dc 100644 --- a/src/server/response.rs +++ b/src/server/response.rs @@ -55,7 +55,7 @@ impl Response { status: status::Ok, version: version::Http11, headers: header::Headers::new(), - body: ThroughWriter(BufferedWriter::new(stream.abstract())) + body: ThroughWriter(BufferedWriter::new(stream.dynamic())) } }