1 files changed, 16 insertions, 18 deletions
diff --git a/src/stream/try_stream/try_for_each.rs b/src/stream/try_stream/try_for_each.rs
index 2c71107..5fc91df 100644
--- a/src/stream/try_stream/try_for_each.rs
+++ b/src/stream/try_stream/try_for_each.rs
@@ -3,18 +3,19 @@ use core::pin::Pin;
 use futures_core::future::{Future, TryFuture};
 use futures_core::stream::TryStream;
 use futures_core::task::{Context, Poll};
-use pin_utils::{unsafe_pinned, unsafe_unpinned};
+use pin_project::{pin_project, project};
 
 /// Future for the [`try_for_each`](super::TryStreamExt::try_for_each) method.
+#[pin_project]
 #[must_use = "futures do nothing unless you `.await` or poll them"]
 pub struct TryForEach<St, Fut, F> {
+    #[pin]
     stream: St,
     f: F,
+    #[pin]
     future: Option<Fut>,
 }
 
-impl<St: Unpin, Fut: Unpin, F> Unpin for TryForEach<St, Fut, F> {}
-
 impl<St, Fut, F> fmt::Debug for TryForEach<St, Fut, F>
 where
     St: fmt::Debug,
@@ -33,10 +34,6 @@ where St: TryStream,
       F: FnMut(St::Ok) -> Fut,
       Fut: TryFuture<Ok = (), Error = St::Error>,
 {
-    unsafe_pinned!(stream: St);
-    unsafe_unpinned!(f: F);
-    unsafe_pinned!(future: Option<Fut>);
-
     pub(super) fn new(stream: St, f: F) -> TryForEach<St, Fut, F> {
         TryForEach {
             stream,
@@ -53,20 +50,21 @@ impl<St, Fut, F> Future for TryForEach<St, Fut, F>
 {
     type Output = Result<(), St::Error>;
 
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+    #[project]
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        #[project]
+        let TryForEach { mut stream, f, mut future } = self.project();
         loop {
-            if let Some(future) = self.as_mut().future().as_pin_mut() {
-                ready!(future.try_poll(cx))?;
-            }
-            self.as_mut().future().set(None);
-
-            match ready!(self.as_mut().stream().try_poll_next(cx)?) {
-                Some(e) => {
-                    let future = (self.as_mut().f())(e);
-                    self.as_mut().future().set(Some(future));
+            if let Some(fut) = future.as_mut().as_pin_mut() {
+                ready!(fut.try_poll(cx))?;
+                future.set(None);
+            } else {
+                match ready!(stream.as_mut().try_poll_next(cx)?) {
+                    Some(e) => future.set(Some(f(e))),
+                    None => break,
                 }
-                None => return Poll::Ready(Ok(())),
             }
         }
+        Poll::Ready(Ok(()))
     }
 }