From dade818ebaab441e8cc5d359068209daa002b488 Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Tue, 31 Aug 2021 04:18:54 +0100
Subject: [PATCH] add middleware composition tests (#2375)

---
 actix-http/CHANGES.md               |  2 ++
 actix-http/src/body/message_body.rs |  4 ---
 actix-http/src/encoding/encoder.rs  |  4 +--
 actix-http/src/h1/utils.rs          |  4 ++-
 src/middleware/mod.rs               | 40 +++++++++++++++++++++++++++++
 5 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/actix-http/CHANGES.md b/actix-http/CHANGES.md
index 57c09d2d..63172e56 100644
--- a/actix-http/CHANGES.md
+++ b/actix-http/CHANGES.md
@@ -6,8 +6,10 @@
 
 ### Fixed
 * Remove slice creation pointing to potential uninitialized data on h1 encoder. [#2364]
+* Remove `Into<Error>` bound on `Encoder` body types. [#2375]
 
 [#2364]: https://github.com/actix/actix-web/pull/2364
+[#2375]: https://github.com/actix/actix-web/pull/2375
 
 
 ## 3.0.0-beta.8 - 2021-08-09
diff --git a/actix-http/src/body/message_body.rs b/actix-http/src/body/message_body.rs
index 2d2642ba..edb4c550 100644
--- a/actix-http/src/body/message_body.rs
+++ b/actix-http/src/body/message_body.rs
@@ -11,8 +11,6 @@ use bytes::{Bytes, BytesMut};
 use futures_core::ready;
 use pin_project_lite::pin_project;
 
-use crate::error::Error;
-
 use super::BodySize;
 
 /// An interface for response bodies.
@@ -47,7 +45,6 @@ impl MessageBody for () {
 impl<B> MessageBody for Box<B>
 where
     B: MessageBody + Unpin,
-    B::Error: Into<Error>,
 {
     type Error = B::Error;
 
@@ -66,7 +63,6 @@ where
 impl<B> MessageBody for Pin<Box<B>>
 where
     B: MessageBody,
-    B::Error: Into<Error>,
 {
     type Error = B::Error;
 
diff --git a/actix-http/src/encoding/encoder.rs b/actix-http/src/encoding/encoder.rs
index c39c0e88..abd8cedb 100644
--- a/actix-http/src/encoding/encoder.rs
+++ b/actix-http/src/encoding/encoder.rs
@@ -29,7 +29,7 @@ use crate::{
         header::{ContentEncoding, CONTENT_ENCODING},
         HeaderValue, StatusCode,
     },
-    Error, ResponseHead,
+    ResponseHead,
 };
 
 use super::Writer;
@@ -107,7 +107,6 @@ enum EncoderBody<B> {
 impl<B> MessageBody for EncoderBody<B>
 where
     B: MessageBody,
-    B::Error: Into<Error>,
 {
     type Error = EncoderError<B::Error>;
 
@@ -142,7 +141,6 @@ where
 impl<B> MessageBody for Encoder<B>
 where
     B: MessageBody,
-    B::Error: Into<Error>,
 {
     type Error = EncoderError<B::Error>;
 
diff --git a/actix-http/src/h1/utils.rs b/actix-http/src/h1/utils.rs
index 5fd3cc21..2547f449 100644
--- a/actix-http/src/h1/utils.rs
+++ b/actix-http/src/h1/utils.rs
@@ -65,7 +65,9 @@ where
                     let next =
                         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))) => return Poll::Ready(Err(err.into())),
+                            Poll::Ready(Some(Err(err))) => {
+                                return Poll::Ready(Err(err.into()))
+                            }
                             Poll::Ready(None) => Poll::Ready(None),
                             Poll::Pending => Poll::Pending,
                         };
diff --git a/src/middleware/mod.rs b/src/middleware/mod.rs
index 96a361fc..d19cb64e 100644
--- a/src/middleware/mod.rs
+++ b/src/middleware/mod.rs
@@ -19,3 +19,43 @@ mod compress;
 
 #[cfg(feature = "__compress")]
 pub use self::compress::Compress;
+
+#[cfg(test)]
+mod tests {
+    use crate::{http::StatusCode, App};
+
+    use super::*;
+
+    #[test]
+    fn common_combinations() {
+        // ensure there's no reason that the built-in middleware cannot compose
+
+        let _ = App::new()
+            .wrap(Compat::new(Logger::default()))
+            .wrap(Condition::new(true, DefaultHeaders::new()))
+            .wrap(DefaultHeaders::new().header("X-Test2", "X-Value2"))
+            .wrap(ErrorHandlers::new().handler(StatusCode::FORBIDDEN, |res| {
+                Ok(ErrorHandlerResponse::Response(res))
+            }))
+            .wrap(Logger::default())
+            .wrap(NormalizePath::new(TrailingSlash::Trim));
+
+        let _ = App::new()
+            .wrap(NormalizePath::new(TrailingSlash::Trim))
+            .wrap(Logger::default())
+            .wrap(ErrorHandlers::new().handler(StatusCode::FORBIDDEN, |res| {
+                Ok(ErrorHandlerResponse::Response(res))
+            }))
+            .wrap(DefaultHeaders::new().header("X-Test2", "X-Value2"))
+            .wrap(Condition::new(true, DefaultHeaders::new()))
+            .wrap(Compat::new(Logger::default()));
+
+        #[cfg(feature = "__compress")]
+        {
+            let _ = App::new().wrap(Compress::default()).wrap(Logger::default());
+            let _ = App::new().wrap(Logger::default()).wrap(Compress::default());
+            let _ = App::new().wrap(Compat::new(Compress::default()));
+            let _ = App::new().wrap(Condition::new(true, Compat::new(Compress::default())));
+        }
+    }
+}