From 9ad2188bb8ba082c4262d774dcb5077aba1d7ce9 Mon Sep 17 00:00:00 2001
From: Henry de Valence <hdevalence@hdevalence.ca>
Date: Mon, 18 Dec 2017 15:08:49 -0800
Subject: [PATCH] Try to get travis working if yolocrypto=>nightly

---
 .travis.yml | 15 ++++++++++-----
 Cargo.toml  |  6 +++---
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6a3e92b..cc2bcfb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,10 +6,11 @@ rust:
   - nightly
 
 env:
-  - TEST_COMMAND=test EXTRA_FLAGS='' FEATURES='yolocrypto'
-  - TEST_COMMAND=test EXTRA_FLAGS='' FEATURES='yolocrypto serde'
+  - TEST_COMMAND=test EXTRA_FLAGS='' FEATURES=''
+  - TEST_COMMAND=test EXTRA_FLAGS='' FEATURES='serde'
+  - TEST_COMMAND=test EXTRA_FLAGS='' FEATURES='nightly'
   - TEST_COMMAND=test EXTRA_FLAGS='' FEATURES='yolocrypto nightly'
-  - TEST_COMMAND=bench EXTRA_FLAGS='' FEATURES='yolocrypto bench'
+  - TEST_COMMAND=bench EXTRA_FLAGS='' FEATURES='nightly bench'
   - TEST_COMMAND=bench EXTRA_FLAGS='' FEATURES='yolocrypto nightly bench'
   - TEST_COMMAND=build EXTRA_FLAGS=--no-default-features FEATURES='' 
 
@@ -20,14 +21,18 @@ matrix:
     # run benchmarks, which causes dalek not to build on stable.  See
     # https://github.com/isislovecruft/curve25519-dalek/pull/38#issuecomment-286027562
     - rust: stable
-      env: TEST_COMMAND=bench EXTRA_FLAGS='' FEATURES='yolocrypto bench'
+      env: TEST_COMMAND=bench EXTRA_FLAGS='' FEATURES='nightly bench'
     - rust: beta
-      env: TEST_COMMAND=bench EXTRA_FLAGS='' FEATURES='yolocrypto bench'
+      env: TEST_COMMAND=bench EXTRA_FLAGS='' FEATURES='nightly bench'
     - rust: stable
       env: TEST_COMMAND=bench EXTRA_FLAGS='' FEATURES='yolocrypto nightly bench'
     - rust: beta
       env: TEST_COMMAND=bench EXTRA_FLAGS='' FEATURES='yolocrypto nightly bench'
     # Test nightly features, such as radix_51, only on nightly.
+    - rust: stable
+      env: TEST_COMMAND=test EXTRA_FLAGS='' FEATURES='nightly'
+    - rust: beta
+      env: TEST_COMMAND=test EXTRA_FLAGS='' FEATURES='nightly'
     - rust: stable
       env: TEST_COMMAND=test EXTRA_FLAGS='' FEATURES='yolocrypto nightly'
     - rust: beta
diff --git a/Cargo.toml b/Cargo.toml
index 0cf7005..8508b38 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -26,7 +26,7 @@ travis-ci = { repository = "isislovecruft/curve25519-dalek", branch = "master"}
 
 [dependencies.stdsimd]
 git = "https://github.com/rust-lang-nursery/stdsimd"
-#optional = true
+optional = true
 
 [dependencies.serde]
 version = "1.0"
@@ -66,7 +66,7 @@ clear_on_drop = "=0.2.3"
 
 [build-dependencies.stdsimd]
 git = "https://github.com/rust-lang-nursery/stdsimd"
-#optional = true
+optional = true
 
 [build-dependencies.serde]
 version = "1.0"
@@ -84,4 +84,4 @@ radix_51 = []
 # Include precomputed basepoint tables.  This is off by default so that build.rs can generate the tables, and then re-enabled by build.rs in the main-stage compilation.
 precomputed_tables = []
 # experimental avx2 support
-avx2_backend = ["nightly"]
+avx2_backend = ["nightly", "stdsimd"]