From ad4e726e495dec59b5dcf83946a29da94cab29fe Mon Sep 17 00:00:00 2001
From: Isis Lovecruft <isis@torproject.org>
Date: Tue, 14 Mar 2017 22:19:59 +0000
Subject: [PATCH] Change .travis.yml to use include directives.

---
 .travis.yml | 29 ++++++++++-------------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b40c613..acc4c6c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,26 +6,17 @@ rust:
   - nightly
 
 env:
-  - TEST_COMMAND=test FEATURES='no-std'
-  - TEST_COMMAND=test FEATURES='std'
-  - TEST_COMMAND=test FEATURES='nightly'
-  - TEST_COMMAND=bench FEATURES='bench'
-  - TEST_COMMAND=bench FEATURES='nightly bench'
+  - TEST_COMMAND=test FEATURES=''
+  - TEST_COMMAND=test FEATURES='--features="no-std"'
 
 matrix:
-  exclude:
-    - rust: stable
-      env: TEST_COMMAND=bench FEATURES='bench'
-    - rust: beta
-      env: TEST_COMMAND=bench FEATURES='bench'
-    - rust: stable
-      env: TEST_COMMAND=test FEATURES='nightly'
-    - rust: beta
-      env: TEST_COMMAND=test FEATURES='nightly'
-    - rust: stable
-      env: TEST_COMMAND=bench FEATURES='nightly bench'
-    - rust: beta
-      env: TEST_COMMAND=bench FEATURES='nightly bench'
+  include:
+    - rust: nightly
+      env: TEST_COMMAND=test FEATURES='--features="nightly"'
+    - rust: nightly
+      env: TEST_COMMAND=bench FEATURES='--features="bench"'
+    - rust: nightly
+      env: TEST_COMMAND=bench FEATURES='--features="nightly bench"'
 
 script:
-  - cargo $TEST_COMMAND --features="$FEATURES"
+  - cargo $TEST_COMMAND $FEATURES