refactor(http/retry): use Poll<T> mapping methods

Signed-off-by: katelyn martin <[email protected]>
linkerd · Jan 31, 2025 · 6df5d85 · 6df5d85
1 parent 4e791fe
commit 6df5d85
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/linkerd/http/retry/src/replay.rs b/linkerd/http/retry/src/replay.rs
@@ -288,13 +288,16 @@ where
         if let Some(rest) = state.rest.as_mut() {
             // If the inner body has previously ended, don't poll it again.
             if !rest.is_end_stream() {
-                let res = futures::ready!(Pin::new(rest).poll_trailers(cx)).map(|tlrs| {
-                    if state.trailers.is_none() {
-                        state.trailers.clone_from(&tlrs);
-                    }
-                    tlrs
-                });
-                return Poll::Ready(res.map_err(Into::into));
+                return Pin::new(rest)
+                    .poll_trailers(cx)
+                    .map_ok(|tlrs| {
+                        // Record a copy of the inner body's trailers in the shared state.
+                        if state.trailers.is_none() {
+                            state.trailers.clone_from(&tlrs);
+                        }
+                        tlrs
+                    })
+                    .map_err(Into::into);
             }
         }