From b29d96bc2b8dc959e2278ff6029528acb043571f Mon Sep 17 00:00:00 2001
From: Sean McArthur <sean.monstar@gmail.com>
Date: Mon, 1 Jun 2015 10:23:16 -0700
Subject: [PATCH] chore(travis): don't build docs with deps, or run full
 benchmarks

---
 .travis.sh  | 12 ------------
 .travis.yml |  9 ++++-----
 2 files changed, 4 insertions(+), 17 deletions(-)
 delete mode 100755 .travis.sh

diff --git a/.travis.sh b/.travis.sh
deleted file mode 100755
index b4682eb4..00000000
--- a/.travis.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-if [ "$BENCH" != "" ]
-then
-    echo "cargo bench $FEATURES"
-    cargo bench --verbose $FEATURES
-else
-    echo "cargo build $FEATURES"
-    cargo build --verbose  $FEATURES
-    echo "cargo test $FEATURES"
-    cargo test --verbose $FEATURES
-fi
diff --git a/.travis.yml b/.travis.yml
index 3f77397a..30772622 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,9 +5,6 @@ matrix:
         - rust: nightly
           env: FEATURES="--features nightly"
           sudo: false
-        - rust: nightly
-          env: FEATURES="--features nightly" BENCH=true
-          sudo: false
         - rust: beta
           sudo: false
         - rust: stable
@@ -17,7 +14,9 @@ cache:
     directories:
         - target
 
-script: ./.travis.sh
+script:
+  - cargo build --verbose $FEATURES
+  - cargo test --verbose $FEATURES
 
 after_success: |
     [ $TRAVIS_RUST_VERSION = stable ] &&
@@ -29,7 +28,7 @@ after_success: |
     [ $TRAVIS_BRANCH = master ] &&
     [ $TRAVIS_PULL_REQUEST = false ] &&
     [ $TRAVIS_RUST_VERSION = stable ] &&
-    cargo doc  &&
+    cargo doc --no-deps &&
     echo '<meta http-equiv=refresh content=0;url=hyper/index.html>' > target/doc/index.html &&
     pip install --user ghp-import &&
     /home/travis/.local/bin/ghp-import -n target/doc &&