diff --git a/tower/src/util/call_all/common.rs b/tower/src/util/call_all/common.rs index 09c458a9b..dbb36d2cb 100644 --- a/tower/src/util/call_all/common.rs +++ b/tower/src/util/call_all/common.rs @@ -66,11 +66,10 @@ where impl Stream for CallAll where Svc: Service, - Svc::Error: Into, S: Stream, Q: Drive, { - type Item = Result; + type Item = Result; fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll> { let mut this = self.project(); @@ -78,7 +77,7 @@ where loop { // First, see if we have any responses to yield if let Poll::Ready(r) = this.queue.poll(cx) { - if let Some(rsp) = r.transpose().map_err(Into::into)? { + if let Some(rsp) = r.transpose()? { return Poll::Ready(Some(Ok(rsp))); } } @@ -97,7 +96,7 @@ where .service .as_mut() .expect("Using CallAll after extracing inner Service"); - ready!(svc.poll_ready(cx)).map_err(Into::into)?; + ready!(svc.poll_ready(cx))?; // If it is, gather the next request (if there is one) match this.stream.as_mut().poll_next(cx) { diff --git a/tower/src/util/call_all/ordered.rs b/tower/src/util/call_all/ordered.rs index a0c9ae4bb..1a97c4744 100644 --- a/tower/src/util/call_all/ordered.rs +++ b/tower/src/util/call_all/ordered.rs @@ -154,10 +154,9 @@ where impl Stream for CallAll where Svc: Service, - Svc::Error: Into, S: Stream, { - type Item = Result; + type Item = Result; fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll> { self.project().inner.poll_next(cx) diff --git a/tower/src/util/call_all/unordered.rs b/tower/src/util/call_all/unordered.rs index acf2c86c7..307c79851 100644 --- a/tower/src/util/call_all/unordered.rs +++ b/tower/src/util/call_all/unordered.rs @@ -75,10 +75,9 @@ where impl Stream for CallAllUnordered where Svc: Service, - Svc::Error: Into, S: Stream, { - type Item = Result; + type Item = Result; fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll> { self.project().inner.poll_next(cx)