impl Unpin for AndThen and OrElse

taiki-e · cramertj · commit 4c3acb04926b · 2019-04-24T11:48:59.000-07:00
diff --git a/futures-util/src/try_stream/and_then.rs b/futures-util/src/try_stream/and_then.rs
@@ -14,6 +14,8 @@ pub struct AndThen<St, Fut, F> {
     f: F,
 }
 
+impl<St: Unpin, Fut: Unpin, F> Unpin for AndThen<St, Fut, F> {}
+
 impl<St, Fut, F> AndThen<St, Fut, F>
     where St: TryStream,
           F: FnMut(St::Ok) -> Fut,
diff --git a/futures-util/src/try_stream/or_else.rs b/futures-util/src/try_stream/or_else.rs
@@ -14,6 +14,8 @@ pub struct OrElse<St, Fut, F> {
     f: F,
 }
 
+impl<St: Unpin, Fut: Unpin, F> Unpin for OrElse<St, Fut, F> {}
+
 impl<St, Fut, F> OrElse<St, Fut, F>
     where St: TryStream,
           F: FnMut(St::Error) -> Fut,

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@ pub struct AndThen<St, Fut, F> {`
`14`	`14`	`f: F,`
`15`	`15`	`}`
`16`	`16`
	`17`	`+impl<St: Unpin, Fut: Unpin, F> Unpin for AndThen<St, Fut, F> {}`
	`18`	`+`
`17`	`19`	`impl<St, Fut, F> AndThen<St, Fut, F>`
`18`	`20`	`where St: TryStream,`
`19`	`21`	`F: FnMut(St::Ok) -> Fut,`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@ pub struct OrElse<St, Fut, F> {`
`14`	`14`	`f: F,`
`15`	`15`	`}`
`16`	`16`
	`17`	`+impl<St: Unpin, Fut: Unpin, F> Unpin for OrElse<St, Fut, F> {}`
	`18`	`+`
`17`	`19`	`impl<St, Fut, F> OrElse<St, Fut, F>`
`18`	`20`	`where St: TryStream,`
`19`	`21`	`F: FnMut(St::Error) -> Fut,`