Update with master

Author: alexcrichton

src/lib.rs

@@ -145,7 +145,7 @@ mod tests {
     impl conduit::Request for RequestSentinel {
         fn http_version(&self) -> semver::Version { unimplemented!() }
         fn conduit_version(&self) -> semver::Version { unimplemented!() }
-        fn method(&self) -> Method { self.method }
+        fn method(&self) -> Method { self.method.clone() }
         fn scheme(&self) -> Scheme { unimplemented!() }
         fn host<'a>(&'a self) -> Host<'a> { unimplemented!() }
         fn virtual_root<'a>(&'a self) -> Option<&'a str> { unimplemented!() }
@@ -170,9 +170,9 @@ mod tests {
         let mut res = router.call(&mut req).ok().expect("No response");
 
         assert_eq!(res.status, (200, "OK"));
-        let mut s = String::new();
-        res.body.read_to_string(&mut s).unwrap();
-        assert_eq!(s, "1, Get".to_string());
+        let mut s = Vec::new();
+        res.body.write_body(&mut s).unwrap();
+        assert_eq!(s, b"1, Get");
     }
 
     #[test]
@@ -182,9 +182,9 @@ mod tests {
         let mut res = router.call(&mut req).ok().expect("No response");
 
         assert_eq!(res.status, (200, "OK"));
-        let mut s = String::new();
-        res.body.read_to_string(&mut s).unwrap();
-        assert_eq!(s, "10, Post".to_string());
+        let mut s = Vec::new();
+        res.body.write_body(&mut s).unwrap();
+        assert_eq!(s, b"10, Post");
     }
 
     #[test]