[actix-web] Only support actix-web 2.0.0 from now on

As discussed in Pull Request #182 we will only support actix-web 2.0.0
from this point onwards. If you still wish to use a previous version of
actix-web you'll have to pin the version.

Author: czyba

maud/Cargo.toml

@@ -12,16 +12,15 @@ categories = ["template-engine"]
 edition = "2018"
 
 [features]
-actix-web-2 = ["actix-web-2-dep", "futures"]
+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 }
-actix-web-2-dep = { version = "2.0.0", optional = true, default-features = false, package = "actix-web" }
 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"] }

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,23 +194,7 @@ mod rocket_support {
 #[cfg(feature = "actix-web")]
 mod actix_support {
     use crate::PreEscaped;
-    use actix_web::{Responder, HttpResponse, HttpRequest, Error};
-
-    impl Responder for PreEscaped<String> {
-        type Error = Error;
-        type Future = Result<HttpResponse, Self::Error>;
-        fn respond_to(self, _req: &HttpRequest) -> Self::Future {
-            Ok(HttpResponse::Ok()
-               .content_type("text/html; charset=utf-8")
-               .body(self.0))
-        }
-    }
-}
-
-#[cfg(feature = "actix-web-2")]
-mod actix2_support {
-    use crate::PreEscaped;
-    use actix_web_2_dep::{Responder, HttpResponse, HttpRequest, Error};
+    use actix_web_dep::{Responder, HttpResponse, HttpRequest, Error};
     use futures::future::{ok, Ready};
 
     impl Responder for PreEscaped<String> {