Merge #396

396: Use criterion for benchmarking r=jswrenn a=orium

Not only is it a better benchmark tool, it also avoids depending on nightly rustc.

Co-authored-by: Diogo Sousa <[email protected]>

Author: bors[bot]

.travis.yml

@@ -2,12 +2,10 @@ language: rust
 sudo: false
 matrix:
   include:
-    - rust: 1.24.0
+    - rust: 1.32.0
     - rust: stable
     - rust: beta
     - rust: nightly
-      env:
-       - BENCH=1
 branches:
   only:
     - master
@@ -19,4 +17,4 @@ script:
       cargo build --verbose --no-default-features &&
       cargo build --verbose --features "$FEATURES" &&
       cargo test --verbose --features "$FEATURES" &&
-      ([ "$BENCH" != 1 ] || cargo bench --verbose --features "$FEATURES")
+      cargo bench --verbose --features "$FEATURES"

Cargo.toml

@@ -24,10 +24,11 @@ test = false
 either = { version = "1.0", default-features = false }
 
 [dev-dependencies]
-rand = "0.6"
+rand = "0.7"
+criterion = "0.3"
 
 [dev-dependencies.quickcheck]
-version = "0.7"
+version = "0.9"
 default-features = false
 
 [dev-dependencies.permutohedron]
@@ -39,3 +40,27 @@ use_std = []
 
 [profile]
 bench = { debug = true }
+
+[[bench]]
+name = "tuple_combinations"
+harness = false
+
+[[bench]]
+name = "tuples"
+harness = false
+
+[[bench]]
+name = "fold_specialization"
+harness = false
+
+[[bench]]
+name = "combinations_with_replacement"
+harness = false
+
+[[bench]]
+name = "tree_fold1"
+harness = false
+
+[[bench]]
+name = "bench1"
+harness = false