Merge pull request #182 from czyba/master

actix-web >= 2.0.0 support
lambda-fairy · Mar 21, 2020 · dfa7d5a · dfa7d5a
2 parents c119dbc + 34d1b6a
commit dfa7d5a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Change Log
 
 ## [Unreleased]
+- [Changed] Update Actix to 2.0.0. Actix 1.0.0 is no longer supported.
+  [#182](https://github.com/lambda-fairy/maud/pull/182)
 
 ## [0.21.0] - 2019-07-01
 

diff --git a/maud/Cargo.toml b/maud/Cargo.toml
@@ -11,12 +11,16 @@ description = "Compile-time HTML templates."
 categories = ["template-engine"]
 edition = "2018"
 
+[features]
+actix-web = ["actix-web-dep", "futures"]
+
 [dependencies]
 maud_htmlescape = { version = "0.17.0", path = "../maud_htmlescape" }
 maud_macros = { version = "0.21.0", path = "../maud_macros" }
 iron = { version = ">= 0.5.1, < 0.7.0", optional = true }
 rocket = { version = ">= 0.3, < 0.5", optional = true }
-actix-web = { version = "1.0.0", optional = true, default-features = false }
+futures = { version = "0.3.0", optional = true }
+actix-web-dep = { version = "2.0.0", optional = true, default-features = false, package = "actix-web" }
 
 [dev-dependencies]
 compiletest_rs = { version = "0.3.19", features = ["stable"] }

diff --git a/maud/src/lib.rs b/maud/src/lib.rs
@@ -9,7 +9,7 @@
 
 #![doc(html_root_url = "https://docs.rs/maud/0.21.0")]
 
-#[cfg(feature = "actix-web")] extern crate actix_web;
+#[cfg(feature = "actix-web")] extern crate actix_web_dep;
 #[cfg(feature = "iron")] extern crate iron;
 #[cfg(feature = "rocket")] extern crate rocket;
 
@@ -194,13 +194,14 @@ mod rocket_support {
 #[cfg(feature = "actix-web")]
 mod actix_support {
     use crate::PreEscaped;
-    use actix_web::{Responder, HttpResponse, HttpRequest, Error};
+    use actix_web_dep::{Responder, HttpResponse, HttpRequest, Error};
+    use futures::future::{ok, Ready};
 
     impl Responder for PreEscaped<String> {
         type Error = Error;
-        type Future = Result<HttpResponse, Self::Error>;
+        type Future = Ready<Result<HttpResponse, Self::Error>>;
         fn respond_to(self, _req: &HttpRequest) -> Self::Future {
-            Ok(HttpResponse::Ok()
+            ok(HttpResponse::Ok()
                .content_type("text/html; charset=utf-8")
                .body(self.0))
         }