More body woes

src/body.rs

@@ -1,21 +1,24 @@
 // TODO(martin): Is a better name SendBody to  mirror RecvBody? Or even invert
 // BodySend, BodyRecv to get alphabetical sorting.
 
+use std::fs::File;
 use std::io::Read;
 
 pub struct Body<'a> {
     inner: BodyInner<'a>,
+    ended: bool,
 }
 
 impl<'a> Body<'a> {
     pub fn empty() -> Body<'static> {
         Body {
             inner: BodyInner::ByteSlice(&[]),
+            ended: false,
         }
     }
 }
 
-pub trait IntoBody {
+pub trait AsBody {
     fn as_body(&self) -> Body;
 }
 
@@ -24,16 +27,36 @@ pub(crate) enum BodyInner<'a> {
     Reader(&'a mut dyn Read),
 }
 
-impl IntoBody for &[u8] {
+macro_rules! impl_into_body {
+    ($t:ty) => {
+        impl AsBody for $t {
+            fn as_body(&self) -> Body {
+                BodyInner::ByteSlice(self.as_ref()).into()
+            }
+        }
+    };
+}
+
+impl AsBody for &mut File {
     fn as_body(&self) -> Body {
-        BodyInner::ByteSlice(self).into()
+        unreachable!()
     }
 }
 
+impl_into_body!(&[u8]);
+impl_into_body!(&str);
+impl_into_body!(String);
+impl_into_body!(Vec<u8>);
+impl_into_body!(&String);
+impl_into_body!(&Vec<u8>);
+
 pub struct RecvBody;
 
 impl<'a> From<BodyInner<'a>> for Body<'a> {
     fn from(inner: BodyInner<'a>) -> Self {
-        Body { inner }
+        Body {
+            inner,
+            ended: false,
+        }
     }
 }

src/lib.rs

@@ -5,7 +5,7 @@
 use std::convert::TryFrom;
 use std::sync::atomic::{AtomicBool, Ordering};
 
-use body::{IntoBody, RecvBody};
+use body::{AsBody, RecvBody};
 /// Re-exported http-crate.
 pub use http;
 
@@ -26,7 +26,7 @@ pub use agent::{Agent, AgentConfig};
 pub use body::Body;
 pub use error::Error;
 
-pub fn run(request: &Request<impl IntoBody>) -> Result<Response<RecvBody>, Error> {
+pub fn run(request: &Request<impl AsBody>) -> Result<Response<RecvBody>, Error> {
     let mut agent = Agent::new_default();
     let body = request.body().as_body();
     agent.run(request, body)

src/request.rs

@@ -2,7 +2,7 @@ use std::convert::TryFrom;
 
 use http::{HeaderName, HeaderValue, Method, Request, Response, Uri};
 
-use crate::body::{IntoBody, RecvBody};
+use crate::body::{AsBody, RecvBody};
 use crate::{Agent, Body, Error};
 
 #[derive(Debug)]