From 7a994eb95b0fa447e95d7d28a020fd30143b87b6 Mon Sep 17 00:00:00 2001
From: Dirkjan Ochtman <dirkjan@ochtman.nl>
Date: Sun, 22 Jul 2018 15:47:31 +0100
Subject: Work around conflicting dependencies for actix-web and rocket

---
 testing/tests/actix_web.rs | 1 +
 testing/tests/rocket.rs    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'testing/tests')

diff --git a/testing/tests/actix_web.rs b/testing/tests/actix_web.rs
index 12724d9..e2d8bcf 100644
--- a/testing/tests/actix_web.rs
+++ b/testing/tests/actix_web.rs
@@ -1,3 +1,4 @@
+#![cfg(feature = "actix")]
 #[macro_use]
 extern crate askama;
 extern crate actix_web;
diff --git a/testing/tests/rocket.rs b/testing/tests/rocket.rs
index c613311..2bf4713 100644
--- a/testing/tests/rocket.rs
+++ b/testing/tests/rocket.rs
@@ -1,4 +1,4 @@
-#![cfg(feature = "rocket")]
+#![cfg(feature = "with-rocket")]
 #![feature(plugin)]
 #![plugin(rocket_codegen)]
 
-- 
cgit