Merge pull request #73 from s-panferov/fix/abstract-is-reserved

(fix) abstract is now a reserved word.

src/client/request.rs

@@ -57,7 +57,7 @@ impl Request<Fresh> {
         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));
 

src/client/response.rs

@@ -25,7 +25,7 @@ impl Response {
 
     /// Creates a new response from a server.
     pub fn new(stream: Box<NetworkStream + Send>) -> HttpResult<Response> {
-        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));
 

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<NetworkStream + Send> {
+    fn dynamic(self) -> Box<NetworkStream + Send> {
         box self as Box<NetworkStream + Send>
     }
 
     #[doc(hidden)]
     #[inline]
     // Hack to work around lack of Clone impl for Box<Clone>
-    fn clone_box(&self) -> Box<NetworkStream + Send> { self.clone().abstract() }
+    fn clone_box(&self) -> Box<NetworkStream + Send> { self.clone().dynamic() }
 }
 
 impl Clone for Box<NetworkStream + Send> {

src/server/request.rs

@@ -38,7 +38,7 @@ impl Request {
     pub fn new<S: NetworkStream>(mut stream: S) -> HttpResult<Request> {
         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));
 

src/server/response.rs

@@ -55,7 +55,7 @@ impl Response<Fresh> {
             status: status::Ok,
             version: version::Http11,
             headers: header::Headers::new(),
-            body: ThroughWriter(BufferedWriter::new(stream.abstract()))
+            body: ThroughWriter(BufferedWriter::new(stream.dynamic()))
         }
     }