use rust 1.51 features

Cargo.toml

@@ -24,6 +24,7 @@ name = "actix_web"
 path = "src/lib.rs"
 
 [workspace]
+resolver = "2"
 members = [
     ".",
     "awc",

actix-http/src/body/body.rs

@@ -7,7 +7,7 @@ use std::{
 };
 
 use bytes::{Bytes, BytesMut};
-use futures_core::{ready, Stream};
+use futures_core::Stream;
 
 use crate::error::Error;
 
@@ -74,14 +74,10 @@ impl MessageBody for AnyBody {
                 }
             }
 
-            // TODO: MSRV 1.51: poll_map_err
+            AnyBody::Message(body) => body
-            AnyBody::Message(body) => match ready!(body.as_pin_mut().poll_next(cx)) {
+                .as_pin_mut()
-                Some(Err(err)) => {
+                .poll_next(cx)
-                    Poll::Ready(Some(Err(Error::new_body().with_cause(err))))
+                .map_err(|err| Error::new_body().with_cause(err)),
-                }
-                Some(Ok(val)) => Poll::Ready(Some(Ok(val))),
-                None => Poll::Ready(None),
-            },
         }
     }
 }
@@ -223,11 +219,9 @@ impl MessageBody for BoxAnyBody {
         mut self: Pin<&mut Self>,
         cx: &mut Context<'_>,
     ) -> Poll<Option<Result<Bytes, Self::Error>>> {
-        // TODO: MSRV 1.51: poll_map_err
+        self.0
-        match ready!(self.0.as_mut().poll_next(cx)) {
+            .as_mut()
-            Some(Err(err)) => Poll::Ready(Some(Err(Error::new_body().with_cause(err)))),
+            .poll_next(cx)
-            Some(Ok(val)) => Poll::Ready(Some(Ok(val))),
+            .map_err(|err| Error::new_body().with_cause(err))
-            None => Poll::Ready(None),
-        }
     }
 }

actix-http/src/body/response_body.rs

@@ -5,7 +5,7 @@ use std::{
 };
 
 use bytes::Bytes;
-use futures_core::{ready, Stream};
+use futures_core::Stream;
 use pin_project::pin_project;
 
 use crate::error::Error;
@@ -77,12 +77,7 @@ where
         cx: &mut Context<'_>,
     ) -> Poll<Option<Self::Item>> {
         match self.project() {
-            // TODO: MSRV 1.51: poll_map_err
+            ResponseBodyProj::Body(body) => body.poll_next(cx).map_err(Into::into),
-            ResponseBodyProj::Body(body) => match ready!(body.poll_next(cx)) {
-                Some(Err(err)) => Poll::Ready(Some(Err(err.into()))),
-                Some(Ok(val)) => Poll::Ready(Some(Ok(val))),
-                None => Poll::Ready(None),
-            },
             ResponseBodyProj::Other(body) => Pin::new(body).poll_next(cx),
         }
     }

actix-http/src/encoding/encoder.rs

@@ -131,18 +131,9 @@ where
                     Poll::Ready(Some(Ok(std::mem::take(b))))
                 }
             }
-            // TODO: MSRV 1.51: poll_map_err
+            EncoderBodyProj::Stream(b) => b.poll_next(cx).map_err(EncoderError::Body),
-            EncoderBodyProj::Stream(b) => match ready!(b.poll_next(cx)) {
-                Some(Err(err)) => Poll::Ready(Some(Err(EncoderError::Body(err)))),
-                Some(Ok(val)) => Poll::Ready(Some(Ok(val))),
-                None => Poll::Ready(None),
-            },
             EncoderBodyProj::BoxedStream(ref mut b) => {
-                match ready!(b.as_pin_mut().poll_next(cx)) {
+                b.as_pin_mut().poll_next(cx).map_err(EncoderError::Boxed)
-                    Some(Err(err)) => Poll::Ready(Some(Err(EncoderError::Boxed(err)))),
-                    Some(Ok(val)) => Poll::Ready(Some(Ok(val))),
-                    None => Poll::Ready(None),
-                }
             }
         }
     }

actix-http/src/h1/utils.rs

@@ -63,12 +63,9 @@ where
                         .is_write_buf_full()
                 {
                     let next =
-                        // TODO: MSRV 1.51: poll_map_err
                         match this.body.as_mut().as_pin_mut().unwrap().poll_next(cx) {
                             Poll::Ready(Some(Ok(item))) => Poll::Ready(Some(item)),
-                            Poll::Ready(Some(Err(err))) => {
+                            Poll::Ready(Some(Err(err))) => return Poll::Ready(Err(err.into())),
-                                return Poll::Ready(Err(err.into()))
-                            }
                             Poll::Ready(None) => Poll::Ready(None),
                             Poll::Pending => Poll::Pending,
                         };

src/middleware/logger.rs

@@ -341,7 +341,6 @@ where
     ) -> Poll<Option<Result<Bytes, Self::Error>>> {
         let this = self.project();
 
-        // TODO: MSRV 1.51: poll_map_err
         match ready!(this.body.poll_next(cx)) {
             Some(Ok(chunk)) => {
                 *this.size += chunk.len();