Skip to content

Commit

Permalink
Build features separately.
Browse files Browse the repository at this point in the history
Compiling rocket and actix-web together presents problems, since ring - a
native dependency - cannot have more than one version linked.
  • Loading branch information
anxiousmodernman authored and lambda-fairy committed Jun 15, 2018
1 parent fd59814 commit 8ce98f6
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion maud/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
}
Expand Down

0 comments on commit 8ce98f6

Please sign in to comment.