Improve body trait/lifetime API

Now that rust-lang/rust#16453 has landed, the body API can be improved
to not require hard casting to trait objects

Author: carllerche

src/http/body.rs

@@ -2,7 +2,7 @@ use std::io::{BufReader,IoResult,Reader};
 
 pub enum Body<'a> {
     FixedBody(BufReader<'a>, uint),
-    ChunkedBody(&'a mut Reader + Send)
+    ChunkedBody(&'a mut Reader+'a)
 }
 
 impl<'a> Body<'a> {
@@ -43,8 +43,7 @@ impl<'a> ToBody<'a> for &'a String {
     }
 }
 
-// TODO: https://github.com/rust-lang/rust/issues/14901
-impl<'a> ToBody<'a> for &'a mut Reader + Send {
+impl<'a, R: 'a+Reader> ToBody<'a> for &'a mut R {
     fn to_body(self) -> Body<'a> {
         ChunkedBody(self)
     }

src/test/post.rs

@@ -71,7 +71,7 @@ pub fn test_post_binary_with_reader() {
 
     let mut body = MemReader::new(Vec::from_slice(b"Foo Bar Baz"));
     let res = http::handle()
-        .post(server::url("/"), &mut body as &mut Reader)
+        .post(server::url("/"), &mut body)
         .exec().unwrap();
 
     srv.assert();
@@ -97,7 +97,7 @@ pub fn test_post_binary_with_reader_and_content_length() {
 
     let mut body = MemReader::new(Vec::from_slice(b"Foo Bar Baz"));
     let res = http::handle()
-        .post(server::url("/"), &mut body as &mut Reader)
+        .post(server::url("/"), &mut body)
         .content_length(11)
         .exec().unwrap();
 

src/test/server.rs

@@ -116,7 +116,7 @@ impl OpSequence {
                                 to_debug_str(b.as_slice()), to_debug_str(act.as_slice())));
                     }
                 }
-                &Wait(ms) => { timer::sleep(Duration::milliseconds(ms as i32)) }
+                &Wait(ms) => { timer::sleep(Duration::milliseconds(ms as i64)) }
                 &Shutdown => return Err("Shutdown must be sent on its own".to_string())
             }
         }