refactor(client): remove Unpin requirement from request body

seanmonstar · seanmonstar · commit a07142da2d4b · 2019-12-11T14:18:56.000-08:00
diff --git a/src/client/conn.rs b/src/client/conn.rs
@@ -332,7 +332,6 @@ impl<T, B> Connection<T, B>
 where
     T: AsyncRead + AsyncWrite + Unpin + Send + 'static,
     B: Payload + Unpin + 'static,
-    B::Data: Unpin,
 {
     /// Return the inner IO object, and additional information.
     ///
@@ -384,7 +383,7 @@ where
 impl<T, B> Future for Connection<T, B>
 where
     T: AsyncRead + AsyncWrite + Unpin + Send + 'static,
-    B: Payload + Unpin + 'static,
+    B: Payload + 'static,
 {
     type Output = crate::Result<()>;
 
@@ -591,7 +590,7 @@ impl fmt::Debug for ResponseFuture {
 impl<T, B> Future for ProtoClient<T, B>
 where
     T: AsyncRead + AsyncWrite + Send + Unpin + 'static,
-    B: Payload + Unpin + 'static,
+    B: Payload + 'static,
 {
     type Output = crate::Result<proto::Dispatched>;
 
diff --git a/src/client/mod.rs b/src/client/mod.rs
@@ -152,7 +152,7 @@ where
     C: Connect + Clone + Send + Sync + 'static,
     C::Transport: Unpin + Send + 'static,
     C::Future: Unpin + Send + 'static,
-    B: Payload + Unpin + Send + 'static,
+    B: Payload + Send + 'static,
     B::Data: Send,
 {
     /// Send a `GET` request to the supplied `Uri`.
@@ -550,7 +550,7 @@ where
     C: Connect + Clone + Send + Sync + 'static,
     C::Transport: Unpin + Send + 'static,
     C::Future: Unpin + Send + 'static,
-    B: Payload + Unpin + Send + 'static,
+    B: Payload + Send + 'static,
     B::Data: Send,
 {
     type Response = Response<Body>;
diff --git a/src/proto/h2/client.rs b/src/proto/h2/client.rs
@@ -91,7 +91,7 @@ where
 
 impl<B> Future for ClientTask<B>
 where
-    B: Payload + Unpin + 'static,
+    B: Payload + 'static,
 {
     type Output = crate::Result<Dispatched>;
 
@@ -133,7 +133,7 @@ where
                     };
 
                     if !eos {
-                        let mut pipe = PipeToSendStream::new(body, body_tx).map(|res| {
+                        let mut pipe = Box::pin(PipeToSendStream::new(body, body_tx)).map(|res| {
                             if let Err(e) = res {
                                 debug!("client request body error: {}", e);
                             }

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ where`
`91`	`91`
`92`	`92`	`impl<B> Future for ClientTask<B>`
`93`	`93`	`where`
`94`		`- B: Payload + Unpin + 'static,`
	`94`	`+ B: Payload + 'static,`
`95`	`95`	`{`
`96`	`96`	`type Output = crate::Result<Dispatched>;`
`97`	`97`
`@@ -133,7 +133,7 @@ where`
`133`	`133`	`};`
`134`	`134`
`135`	`135`	`if !eos {`
`136`		`- let mut pipe = PipeToSendStream::new(body, body_tx).map(\|res\| {`
	`136`	`+ let mut pipe = Box::pin(PipeToSendStream::new(body, body_tx)).map(\|res\| {`
`137`	`137`	`if let Err(e) = res {`
`138`	`138`	`debug!("client request body error: {}", e);`
`139`	`139`	`}`