From 0b376b439f759613966916787b613616627bb3f9 Mon Sep 17 00:00:00 2001
From: René Kijewski <kijewski@library.vetmed.fu-berlin.de>
Date: Fri, 25 Feb 2022 21:38:13 +0100
Subject: Actix Web v4.0 is here

---
 askama_actix/Cargo.toml        | 7 ++++---
 askama_actix/src/lib.rs        | 1 +
 askama_shared/Cargo.toml       | 2 +-
 askama_shared/src/generator.rs | 8 ++++----
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/askama_actix/Cargo.toml b/askama_actix/Cargo.toml
index 14bfaea..ab5c905 100644
--- a/askama_actix/Cargo.toml
+++ b/askama_actix/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "askama_actix"
-version = "0.12.0"
+version = "0.13.0"
 description = "Actix-Web integration for Askama templates"
 documentation = "https://docs.rs/askama"
 keywords = ["markup", "template", "jinja2", "html"]
@@ -13,8 +13,9 @@ readme = "README.md"
 edition = "2018"
 
 [dependencies]
-actix-web = { version = "4.0.0-rc.1", default-features = false }
-askama = { version = "0.11.0", path = "../askama", default-features = false, features = ["with-actix-web", "mime", "mime_guess"] }
+actix-web = { version = "4", default-features = false }
+askama = { version = "0.11.1", path = "../askama", default-features = false, features = ["with-actix-web"] }
+askama_shared = { version = "0.12.2", path = "../askama_shared" }
 
 [dev-dependencies]
 actix-rt = { version = "2", default-features = false }
diff --git a/askama_actix/src/lib.rs b/askama_actix/src/lib.rs
index 59957f4..d98debc 100644
--- a/askama_actix/src/lib.rs
+++ b/askama_actix/src/lib.rs
@@ -4,6 +4,7 @@
 
 use std::fmt;
 
+pub use actix_web;
 use actix_web::body::BoxBody;
 use actix_web::http::header::HeaderValue;
 use actix_web::http::StatusCode;
diff --git a/askama_shared/Cargo.toml b/askama_shared/Cargo.toml
index 1a69867..8e2be28 100644
--- a/askama_shared/Cargo.toml
+++ b/askama_shared/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "askama_shared"
-version = "0.12.1"
+version = "0.12.2"
 description = "Shared code for Askama"
 homepage = "https://github.com/djc/askama"
 repository = "https://github.com/djc/askama"
diff --git a/askama_shared/src/generator.rs b/askama_shared/src/generator.rs
index ea22a83..9997139 100644
--- a/askama_shared/src/generator.rs
+++ b/askama_shared/src/generator.rs
@@ -203,12 +203,12 @@ impl<'a, S: std::hash::BuildHasher> Generator<'a, S> {
 
     // Implement Actix-web's `Responder`.
     fn impl_actix_web_responder(&mut self, buf: &mut Buffer) -> Result<(), CompileError> {
-        self.write_header(buf, "::actix_web::Responder", None)?;
-        buf.writeln("type Body = ::actix_web::body::BoxBody;")?;
+        self.write_header(buf, "::askama_actix::actix_web::Responder", None)?;
+        buf.writeln("type Body = ::askama_actix::actix_web::body::BoxBody;")?;
         buf.writeln("#[inline]")?;
         buf.writeln(
-            "fn respond_to(self, _req: &::actix_web::HttpRequest) \
-             -> ::actix_web::web::HttpResponse<Self::Body> {",
+            "fn respond_to(self, _req: &::askama_actix::actix_web::HttpRequest) \
+             -> ::askama_actix::actix_web::HttpResponse<Self::Body> {",
         )?;
         buf.writeln("<Self as ::askama_actix::TemplateToResponse>::to_response(&self)")?;
         buf.writeln("}")?;
-- 
cgit