From 34b39083bca36b4bc58137c8b97caa6282f4c456 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Wed, 1 Feb 2017 00:38:02 -0800
Subject: [PATCH] No error if clippy install fails

---
 .travis.yml | 4 ----
 travis.sh   | 7 ++++---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d5bf00f3..05bd0df7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,9 +13,5 @@ matrix:
   include:
     - rust: nightly
       env: CLIPPY=true
-  allow_failures:
-    - rust: nightly
-      env: CLIPPY=true
-  fast_finish: true
 
 script: ./travis.sh
diff --git a/travis.sh b/travis.sh
index 7c981c60..24de5d28 100755
--- a/travis.sh
+++ b/travis.sh
@@ -17,9 +17,10 @@ channel() {
 }
 
 if [ -n "${CLIPPY}" ]; then
-    if [ -n "${TRAVIS}" ]; then
-        # cached installation will not work on a later nightly
-        cargo install clippy --debug --force
+    # cached installation will not work on a later nightly
+    if [ -n "${TRAVIS}" ] && ! cargo install clippy --debug --force; then
+        echo "COULD NOT COMPILE CLIPPY, IGNORING CLIPPY TESTS"
+        exit
     fi
 
     cd "$DIR/serde"