aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Dirkjan Ochtman <dirkjan@ochtman.nl>2020-12-15 09:16:20 +0100
committerLibravatar GitHub <noreply@github.com>2020-12-15 09:16:20 +0100
commit5057b75e7752f2186157fb3e1f5e5d2d0c5ff880 (patch)
tree213711d7aa654705188ce4c89f303f3a2df81ac9
parent3b57663b5b626a322e81f9399f0ab39a88411fd4 (diff)
parent11441aa4a1927c186a0eb7e6d519b709f7e40605 (diff)
downloadaskama-5057b75e7752f2186157fb3e1f5e5d2d0c5ff880.tar.gz
askama-5057b75e7752f2186157fb3e1f5e5d2d0c5ff880.tar.bz2
askama-5057b75e7752f2186157fb3e1f5e5d2d0c5ff880.zip
Merge pull request #400 from djc/local
Sync local repo with GitHub
-rw-r--r--askama/Cargo.toml6
-rw-r--r--askama_derive/Cargo.toml4
-rw-r--r--askama_shared/Cargo.toml2
-rw-r--r--askama_shared/src/generator.rs4
4 files changed, 8 insertions, 8 deletions
diff --git a/askama/Cargo.toml b/askama/Cargo.toml
index 0b3a897..da53a98 100644
--- a/askama/Cargo.toml
+++ b/askama/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "askama"
-version = "0.10.3"
+version = "0.10.5"
authors = ["Dirkjan Ochtman <dirkjan@ochtman.nl>"]
description = "Type-safe, compiled Jinja-like templates for Rust"
documentation = "https://docs.rs/askama"
@@ -33,9 +33,9 @@ with-tide = ["askama_derive/tide"]
with-warp = ["askama_derive/warp"]
[dependencies]
-askama_derive = { version = "0.10.3", path = "../askama_derive" }
+askama_derive = { version = "0.10.5", path = "../askama_derive" }
askama_escape = { version = "0.10", path = "../askama_escape" }
-askama_shared = { version = "0.10.4", path = "../askama_shared", default-features = false }
+askama_shared = { version = "0.11", path = "../askama_shared", default-features = false }
mime = { version = "0.3", optional = true }
mime_guess = { version = "2.0.0-alpha", optional = true }
diff --git a/askama_derive/Cargo.toml b/askama_derive/Cargo.toml
index 63d08bd..f3df891 100644
--- a/askama_derive/Cargo.toml
+++ b/askama_derive/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "askama_derive"
-version = "0.10.3"
+version = "0.10.5"
authors = ["Dirkjan Ochtman <dirkjan@ochtman.nl>"]
description = "Procedural macro package for Askama"
homepage = "https://github.com/djc/askama"
@@ -23,6 +23,6 @@ tide = []
warp = []
[dependencies]
-askama_shared = { version = "0.10.4", path = "../askama_shared", default-features = false }
+askama_shared = { version = "0.11", path = "../askama_shared", default-features = false }
proc-macro2 = "1"
syn = "1"
diff --git a/askama_shared/Cargo.toml b/askama_shared/Cargo.toml
index 19946e7..fdc5a4c 100644
--- a/askama_shared/Cargo.toml
+++ b/askama_shared/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "askama_shared"
-version = "0.10.5"
+version = "0.11.1"
authors = ["Dirkjan Ochtman <dirkjan@ochtman.nl>"]
description = "Shared code for Askama"
homepage = "https://github.com/djc/askama"
diff --git a/askama_shared/src/generator.rs b/askama_shared/src/generator.rs
index 320e55e..146f9db 100644
--- a/askama_shared/src/generator.rs
+++ b/askama_shared/src/generator.rs
@@ -308,12 +308,12 @@ impl<'a, S: std::hash::BuildHasher> Generator<'a, S> {
)?;
buf.writeln(
- "fn into_response(self, app: &A) \
+ "fn into_response(self, app: &A, req: &::mendes::http::request::Parts) \
-> ::mendes::http::Response<A::ResponseBody> {",
)?;
buf.writeln(&format!(
- "::mendes::askama::into_response(app, &self, {:?})",
+ "::mendes::askama::into_response(app, req, &self, {:?})",
self.input.path.extension()
))?;
buf.writeln("}")?;