From 8ce98f689ff8d7822272a7ddf411ea98c06947c3 Mon Sep 17 00:00:00 2001
From: Coleman McFarland <coleman.mcfarland@gmail.com>
Date: Mon, 11 Jun 2018 17:40:10 -0700
Subject: [PATCH] Build features separately.
Compiling rocket and actix-web together presents problems, since ring - a
native dependency - cannot have more than one version linked.
---
.travis.yml | 5 ++++-
maud/src/lib.rs | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index f26f51c..a713be0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,10 @@ before_script:
- export PATH=$HOME/.cargo/bin:$PATH
script:
- - cargo test --all --all-features
+ - cargo build --features="iron"
+ - cargo build --features="rocket"
+ - cargo build --features="actix-web"
+ - cargo test --all
- |
if command -v cargo-clippy > /dev/null; then
CLIPPY_STATUS=0
diff --git a/maud/src/lib.rs b/maud/src/lib.rs
index 8dc7410..1e7dcf7 100644
--- a/maud/src/lib.rs
+++ b/maud/src/lib.rs
@@ -199,7 +199,7 @@ mod actix_support {
impl Responder for PreEscaped<String> {
type Item = HttpResponse;
type Error = Error;
- fn respond_to<String>(self, _req: &HttpRequest<String>) -> Result<Self::Item, Self::Error> {
+ fn respond_to<S>(self, _req: &HttpRequest<S>) -> Result<Self::Item, Self::Error> {
Ok(HttpResponse::Ok().body(self.0))
}
}