diff --git a/actix-cors/CHANGES.md b/actix-cors/CHANGES.md index 89c2ad305..f06f44674 100644 --- a/actix-cors/CHANGES.md +++ b/actix-cors/CHANGES.md @@ -1,8 +1,11 @@ # Changes ## Unreleased - 2021-xx-xx +- Relax body type bounds on middleware impl. [#223] - Update `actix-web` dependency to `4.0.0-rc.1`. +[#223]: https://github.com/actix/actix-extras/pull/223 + ## 0.6.0-beta.8 - 2021-12-29 - Minimum supported Rust version (MSRV) is now 1.54. diff --git a/actix-cors/src/builder.rs b/actix-cors/src/builder.rs index 67490c4ff..6d55671c9 100644 --- a/actix-cors/src/builder.rs +++ b/actix-cors/src/builder.rs @@ -490,7 +490,6 @@ where S::Future: 'static, B: MessageBody + 'static, - B::Error: Into, { type Response = ServiceResponse>; type Error = Error; diff --git a/actix-cors/src/middleware.rs b/actix-cors/src/middleware.rs index ad186f050..1f01d997e 100644 --- a/actix-cors/src/middleware.rs +++ b/actix-cors/src/middleware.rs @@ -143,7 +143,6 @@ where S::Future: 'static, B: MessageBody + 'static, - B::Error: Into, { type Response = ServiceResponse>; type Error = Error; @@ -189,12 +188,19 @@ where mod tests { use actix_web::{ dev::Transform, + middleware::Compat, test::{self, TestRequest}, + App, }; use super::*; use crate::Cors; + #[test] + fn compat_compat() { + let _ = App::new().wrap(Compat::new(Cors::default())); + } + #[actix_web::test] async fn test_options_no_origin() { // Tests case where allowed_origins is All but there are validate functions to run incase. diff --git a/actix-identity/CHANGES.md b/actix-identity/CHANGES.md index 897d03bc7..595aee27b 100644 --- a/actix-identity/CHANGES.md +++ b/actix-identity/CHANGES.md @@ -1,8 +1,11 @@ # Changes ## Unreleased - 2021-xx-xx +- Relax body type bounds on middleware impl. [#223] - Update `actix-web` dependency to `4.0.0-rc.1`. +[#223]: https://github.com/actix/actix-extras/pull/223 + ## 0.4.0-beta.8 - 2022-01-21 - No significant changes since `0.4.0-beta.7`. diff --git a/actix-identity/src/middleware.rs b/actix-identity/src/middleware.rs index 2c3fe8478..9e5deb2b2 100644 --- a/actix-identity/src/middleware.rs +++ b/actix-identity/src/middleware.rs @@ -44,7 +44,6 @@ where S::Future: 'static, T: IdentityPolicy, B: MessageBody + 'static, - B::Error: Into, { type Response = ServiceResponse>; type Error = Error; @@ -80,7 +79,6 @@ where S::Future: 'static, T: IdentityPolicy, B: MessageBody + 'static, - B::Error: Into, { type Response = ServiceResponse>; type Error = Error; diff --git a/actix-session/src/cookie.rs b/actix-session/src/cookie.rs index f520d5fca..01778600e 100644 --- a/actix-session/src/cookie.rs +++ b/actix-session/src/cookie.rs @@ -301,7 +301,6 @@ where S::Future: 'static, S::Error: 'static, B: MessageBody + 'static, - B::Error: Into, { type Response = ServiceResponse>; type Error = S::Error; @@ -329,7 +328,6 @@ where S::Future: 'static, S::Error: 'static, B: MessageBody + 'static, - B::Error: Into, { type Response = ServiceResponse>; type Error = S::Error; diff --git a/actix-web-httpauth/CHANGES.md b/actix-web-httpauth/CHANGES.md index 9078d7481..e927cc115 100644 --- a/actix-web-httpauth/CHANGES.md +++ b/actix-web-httpauth/CHANGES.md @@ -1,8 +1,11 @@ # Changes ## Unreleased - 2021-xx-xx +- Relax body type bounds on middleware impl. [#223] - Update `actix-web` dependency to `4.0.0-rc.1`. +[#223]: https://github.com/actix/actix-extras/pull/223 + ## 0.6.0-beta.7 - 2021-12-29 - Minimum supported Rust version (MSRV) is now 1.54. diff --git a/actix-web-httpauth/src/middleware.rs b/actix-web-httpauth/src/middleware.rs index d3a9a4797..fa82f72b9 100644 --- a/actix-web-httpauth/src/middleware.rs +++ b/actix-web-httpauth/src/middleware.rs @@ -124,7 +124,6 @@ where O: Future> + 'static, T: AuthExtractor + 'static, B: MessageBody + 'static, - B::Error: Into, { type Response = ServiceResponse>; type Error = Error; @@ -159,7 +158,6 @@ where O: Future> + 'static, T: AuthExtractor + 'static, B: MessageBody + 'static, - B::Error: Into, { type Response = ServiceResponse>; type Error = S::Error;