aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Dirkjan Ochtman <dirkjan@ochtman.nl>2018-12-07 15:35:32 +0100
committerLibravatar Juan Aguilar <mhpoin@gmail.com>2018-12-08 21:43:20 +0100
commitb18664fe9fe773ff2e6c513c747313342bb6573a (patch)
treefb156751d7fece9fe36251b7a88b28bca0ce671e
parentcdafc8d641632ed89fb6435bfebd70d27bfa74ba (diff)
downloadaskama-b18664fe9fe773ff2e6c513c747313342bb6573a.tar.gz
askama-b18664fe9fe773ff2e6c513c747313342bb6573a.tar.bz2
askama-b18664fe9fe773ff2e6c513c747313342bb6573a.zip
Upgrade to Rocket 0.4
-rw-r--r--askama/Cargo.toml2
-rw-r--r--testing/Cargo.toml5
-rw-r--r--testing/tests/rocket.rs4
3 files changed, 5 insertions, 6 deletions
diff --git a/askama/Cargo.toml b/askama/Cargo.toml
index 79a8103..5a97ef2 100644
--- a/askama/Cargo.toml
+++ b/askama/Cargo.toml
@@ -28,7 +28,7 @@ with-actix-web = ["actix-web", "askama_derive/actix-web", "mime_guess"]
askama_derive = { version = "0.8.0", path = "../askama_derive" }
askama_shared = { version = "0.7.2", path = "../askama_shared" }
iron = { version = ">= 0.5, < 0.7", optional = true }
-rocket = { version = "0.3", optional = true }
+rocket = { version = "0.4", optional = true }
actix-web = { version = "0.7", optional = true }
mime_guess = { version = "2.0.0-alpha", optional = true }
diff --git a/testing/Cargo.toml b/testing/Cargo.toml
index 15cbfe2..3071542 100644
--- a/testing/Cargo.toml
+++ b/testing/Cargo.toml
@@ -9,7 +9,7 @@ actix = ["actix-web", "bytes", "askama/with-actix-web"]
default = []
full = ["actix", "with-iron", "serde-json"]
serde-json = ["serde_json", "askama/serde-json"]
-with-rocket = ["rocket", "rocket_codegen", "askama/with-rocket"]
+with-rocket = ["rocket", "askama/with-rocket"]
with-iron = ["iron", "askama/with-iron"]
[dependencies]
@@ -17,8 +17,7 @@ actix-web = { version = "0.7", optional = true }
askama = { path = "../askama", version = "*" }
bytes = { version = "0.4", optional = true }
iron = { version = "0.6", optional = true }
-rocket = { version = "0.3", optional = true }
-rocket_codegen = { version = "0.3", optional = true }
+rocket = { version = "0.4", optional = true }
serde_json = { version = "1.0", optional = true }
[build-dependencies]
diff --git a/testing/tests/rocket.rs b/testing/tests/rocket.rs
index 2bf4713..93cf93d 100644
--- a/testing/tests/rocket.rs
+++ b/testing/tests/rocket.rs
@@ -1,9 +1,9 @@
#![cfg(feature = "with-rocket")]
-#![feature(plugin)]
-#![plugin(rocket_codegen)]
+#![feature(proc_macro_hygiene, decl_macro)]
#[macro_use]
extern crate askama;
+#[macro_use]
extern crate rocket;
use askama::Template;