Updates for 0.5.0

This maintains most output styles, but removes coloring from output. On Windows,
this is the default setting if Full would have been used

Cargo.lock

@@ -21,7 +21,7 @@ name = "atty"
 version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
  "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -31,15 +31,20 @@ name = "bitflags"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "cfg-if"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "clap"
-version = "2.29.2"
+version = "2.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "ansi_term 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "atty 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "strsim 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "term_size 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "textwrap 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -52,7 +57,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -71,9 +76,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "clicolors-control 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "termios 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -95,15 +100,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "hyperfine"
-version = "0.3.0"
+version = "0.5.0"
 dependencies = [
  "approx 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "atty 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "clap 2.29.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clap 2.30.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "colored 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "indicatif 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
  "statistical 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -113,8 +120,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "console 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -138,7 +145,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "libc"
-version = "0.2.36"
+version = "0.2.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -146,73 +153,73 @@ name = "memchr"
 version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "num"
-version = "0.1.41"
+version = "0.1.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "num-bigint 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-complex 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-integer 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-iter 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-rational 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-bigint 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-complex 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-integer 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-iter 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-rational 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "num-bigint"
-version = "0.1.41"
+version = "0.1.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "num-integer 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-integer 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "num-complex"
-version = "0.1.41"
+version = "0.1.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "num-traits 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "num-integer"
-version = "0.1.35"
+version = "0.1.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "num-traits 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "num-iter"
-version = "0.1.34"
+version = "0.1.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "num-integer 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-integer 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "num-rational"
-version = "0.1.40"
+version = "0.1.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "num-bigint 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-integer 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-bigint 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-integer 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "num-traits"
-version = "0.1.42"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -225,31 +232,42 @@ dependencies = [
 
 [[package]]
 name = "parking_lot"
-version = "0.5.3"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot_core 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot_core 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "parking_lot_core"
-version = "0.2.10"
+version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "rand"
-version = "0.3.20"
+version = "0.3.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -267,7 +285,7 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "aho-corasick 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -302,13 +320,13 @@ name = "statistical"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "num 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "strsim"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -317,7 +335,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -326,7 +344,7 @@ name = "termion"
 version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
  "redox_syscall 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
  "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -336,7 +354,7 @@ name = "termios"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -415,7 +433,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum approx 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "08abcc3b4e9339e33a3d0a5ed15d84a687350c05689d825e0f6655eef9e76a94"
 "checksum atty 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "8352656fd42c30a0c3c89d26dea01e3b77c0ab2af18230835c15e2e13cd51859"
 "checksum bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b3c30d3802dfb7281680d6285f2ccdaa8c2d8fee41f93805dba5c4cf50dc23cf"
-"checksum clap 2.29.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4151c5790817c7d21bbdc6c3530811f798172915f93258244948b93ba19604a6"
+"checksum cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c819a1287eb618df47cc647173c5c4c66ba19d888a6e50d605672aed3140de"
+"checksum clap 2.30.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1c07b9257a00f3fc93b7f3c417fc15607ec7a56823bc2c37ec744e266387de5b"
 "checksum clicolors-control 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1f84dec9bc083ce2503908cd305af98bd363da6f54bf8d4bf0ac14ee749ad5d1"
 "checksum colored 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b0aa3473e85a3161b59845d6096b289bb577874cafeaf75ea1b1beaa6572c7fc"
 "checksum console 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7649ca90478264b9686aac8d269fcb014f14c2bed7c79a7e51b9f6afd4d783eb"
@@ -425,28 +444,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
 "checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
 "checksum lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c8f31047daa365f19be14b47c29df4f7c3b581832407daabe6ae77397619237d"
-"checksum libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)" = "1e5d97d6708edaa407429faa671b942dc0f2727222fb6b6539bf1db936e4b121"
+"checksum libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)" = "56aebce561378d99a0bb578f8cb15b6114d2a1814a6c7949bbe646d968bb4fa9"
 "checksum memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "796fba70e76612589ed2ce7f45282f5af869e0fdd7cc6199fa1aa1f1d591ba9d"
-"checksum num 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "cc4083e14b542ea3eb9b5f33ff48bd373a92d78687e74f4cc0a30caeb754f0ca"
-"checksum num-bigint 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "bdc1494b5912f088f260b775799468d9b9209ac60885d8186a547a0476289e23"
-"checksum num-complex 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "58de7b4bf7cf5dbecb635a5797d489864eadd03b107930cbccf9e0fd7428b47c"
-"checksum num-integer 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)" = "d1452e8b06e448a07f0e6ebb0bb1d92b8890eea63288c0b627331d53514d0fba"
-"checksum num-iter 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)" = "7485fcc84f85b4ecd0ea527b14189281cf27d60e583ae65ebc9c088b13dffe01"
-"checksum num-rational 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "0c7cb72a95250d8a370105c828f388932373e0e94414919891a0f945222310fe"
-"checksum num-traits 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "9936036cc70fe4a8b2d338ab665900323290efb03983c86cbe235ae800ad8017"
+"checksum num 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e"
+"checksum num-bigint 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "81b483ea42927c463e191802e7334556b48e7875297564c0e9951bd3a0ae53e3"
+"checksum num-complex 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "26ff8edeab9f1d8cf6b595e35138c2a389ea29f4f57a0e6bc44abf406e4b0077"
+"checksum num-integer 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)" = "f8d26da319fb45674985c78f1d1caf99aa4941f785d384a2ae36d0740bc3e2fe"
+"checksum num-iter 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)" = "4b226df12c5a59b63569dd57fafb926d91b385dfce33d8074a412411b689d593"
+"checksum num-rational 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "ee314c74bd753fc86b4780aa9475da469155f3848473a261d2d18e35245a784e"
+"checksum num-traits 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3c2bd9b9d21e48e956b763c9f37134dc62d9e95da6edb3f672cacb6caf3cd3"
 "checksum owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37"
-"checksum parking_lot 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3e7f7c9857874e54afeb950eebeae662b1e51a2493666d2ea4c0a5d91dcf0412"
-"checksum parking_lot_core 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "9f35048d735bb93dd115a0030498785971aab3234d311fbe273d020084d26bd8"
-"checksum rand 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)" = "512870020642bb8c221bf68baa1b2573da814f6ccfe5c9699b1c303047abe9b1"
+"checksum parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "9fd9d732f2de194336fb02fe11f9eed13d9e76f13f4315b4d88a14ca411750cd"
+"checksum parking_lot_core 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "538ef00b7317875071d5e00f603f24d16f0b474c1a5fc0ccb8b454ca72eafa79"
+"checksum rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)" = "15a732abf9d20f0ad8eeb6f909bf6868722d9a06e1e50802b6a70351f40b4eb1"
+"checksum rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "eba5f8cb59cc50ed56be8880a5c7b496bfd9bd26394e176bc67884094145c2c5"
 "checksum redox_syscall 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)" = "0d92eecebad22b767915e4d529f89f28ee96dbbf5a4810d2b844373f136417fd"
 "checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
-"checksum regex 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "744554e01ccbd98fff8c457c3b092cd67af62a555a43bfe97ae8a0451f7799fa"
+"checksum regex 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "5be5347bde0c48cfd8c3fdc0766cdfe9d8a755ef84d620d6794c778c91de8b2b"
 "checksum regex-syntax 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8e931c58b93d86f080c734bfd2bce7dd0079ae2331235818133c8be7f422e20e"
 "checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
 "checksum smallvec 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44db0ecb22921ef790d17ae13a3f6d15784183ff5f2a01aa32098c7498d2b4b9"
 "checksum stable_deref_trait 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "15132e0e364248108c5e2c02e3ab539be8d6f5d52a01ca9bbf27ed657316f02b"
 "checksum statistical 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c139942f46d96c53b28420a2cdfb374629f122656bd9daef7fc221ed4d8ec228"
-"checksum strsim 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b4d15c810519a91cf877e7e36e63fe068815c678181439f2f29e2562147c3694"
+"checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550"
 "checksum term_size 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9e5b9a66db815dcfd2da92db471106457082577c3c278d4138ab3e3b4e189327"
 "checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096"
 "checksum termios 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d5d9cf598a6d7ce700a4e6a9199da127e6819a61e64b68609683cc9a01b5683a"

Cargo.toml

@@ -7,14 +7,20 @@ license = "MIT/Apache-2.0"
 name = "hyperfine"
 readme = "README.md"
 repository = "https://github.com/sharkdp/hyperfine"
-version = "0.3.0"
+version = "0.5.0"
 
 [dependencies]
 colored = "1.6"
 indicatif = "0.9"
 statistical = "0.1"
-libc = "0.2"
 atty = "0.2.2"
+cfg-if = "0.1.2"
+
+[target.'cfg(not(windows))'.dependencies]
+libc = "0.2"
+
+[target.'cfg(windows)'.dependencies]
+winapi = { version = "0.3.4", features = ["processthreadsapi", "minwindef", "winnt"] }
 
 [dependencies.clap]
 version = "2"

README.md

@@ -1,5 +1,6 @@
 # hyperfine
 [![Build Status](https://travis-ci.org/sharkdp/hyperfine.svg?branch=master)](https://travis-ci.org/sharkdp/hyperfine)
+[![Build status](https://ci.appveyor.com/api/projects/status/pdqq5frgkcj0smrs?svg=true)](https://ci.appveyor.com/project/sharkdp/hyperfine)
 [![Version info](https://img.shields.io/crates/v/hyperfine.svg)](https://crates.io/crates/hyperfine)
 
 A command-line benchmarking tool (*inspired by [bench](https://github.com/Gabriel439/bench)*).
@@ -16,6 +17,8 @@ A command-line benchmarking tool (*inspired by [bench](https://github.com/Gabrie
 * Constant feedback about the benchmark progress and current estimates.
 * Warmup runs can be executed before the actual benchmark.
 * Cache-clearing commands can be set up before each timing run.
+* Statistical outlier detection.
+* Cross-platform
 
 ## Usage
 
@@ -37,7 +40,7 @@ hyperfine --min-runs 5 'sleep 0.2' 'sleep 3.2'
 ### I/O-heavy programs
 
 If the program execution time is limited by disk I/O, the benchmarking results can be heavily
-influence by disk caches and whether they are cold or warm.
+influenced by disk caches and whether they are cold or warm.
 
 If you want to run the benchmark on a warm cache, you can use the `-w`/`--warmup` option to perform
 a certain number of program executions before the actual benchmark:
@@ -76,10 +79,17 @@ yaourt -S hyperfine
 Download the appropriate `.deb` package from the [Release page](https://github.com/sharkdp/hyperfine/releases)
 and install it via `dpkg`:
 ```
-wget https://github.com/sharkdp/hyperfine/releases/download/v0.3.0/hyperfine_0.3.0_amd64.deb
-sudo dpkg -i hyperfine_0.3.0_amd64.deb
+wget https://github.com/sharkdp/hyperfine/releases/download/v0.5.0/hyperfine_0.5.0_amd64.deb
+sudo dpkg -i hyperfine_0.6.0_amd64.deb
 ```
 
+### Void Linux
+
+Hyperfine can be installed via xbps
+
+```
+xbps-install -S hyperfine
+```
 
 ## Origin of the name
 

appveyor.yml

@@ -0,0 +1,36 @@
+# Source: https://github.com/starkat99/appveyor-rust/
+
+environment:
+  global:
+    PROJECT_NAME: hyperfine
+  matrix:
+    # Stable channel
+    - TARGET: i686-pc-windows-gnu
+      CHANNEL: stable
+    - TARGET: i686-pc-windows-msvc
+      CHANNEL: stable
+    - TARGET: x86_64-pc-windows-gnu
+      CHANNEL: stable
+    - TARGET: x86_64-pc-windows-msvc
+      CHANNEL: stable
+
+# Install Rust and Cargo
+# (Based on from https://github.com/rust-lang/libc/blob/master/appveyor.yml)
+install:
+  - curl -sSf -o rustup-init.exe https://win.rustup.rs
+  - rustup-init.exe --default-host %TARGET% --default-toolchain %CHANNEL% -y
+  - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
+  - rustc -Vv
+  - cargo -V
+
+# 'cargo test' takes care of building for us, so disable Appveyor's build stage. This prevents
+# the "directory does not contain a project or solution file" error.
+# source: https://github.com/starkat99/appveyor-rust/blob/master/appveyor.yml#L113
+build: false
+
+# Equivalent to Travis' `script` phase
+test_script:
+  - cargo build --verbose
+  - cargo run -- --help
+  - cargo run -- "echo test"
+  - cargo test

src/hyperfine/benchmark.rs

@@ -1,6 +1,4 @@
 use std::io;
-use std::process::{Command, Stdio};
-use std::time::Instant;
 
 use colored::*;
 use statistical::{mean, standard_deviation};
@@ -9,11 +7,13 @@ use hyperfine::internal::{get_progress_bar, max, min, CmdFailureAction, Hyperfin
                           OutputStyleOption, Second, MIN_EXECUTION_TIME};
 use hyperfine::warnings::Warnings;
 use hyperfine::format::{format_duration, format_duration_unit};
-use hyperfine::cputime::{cpu_time_interval, get_cpu_times};
 use hyperfine::outlier_detection::{modified_zscores, OUTLIER_THRESHOLD};
+use hyperfine::timer::{TimerStart, TimerStop};
+use hyperfine::timer::wallclocktimer::WallClockTimer;
+use hyperfine::shell::execute_and_time;
 
 /// Results from timing a single shell command
-#[derive(Debug, Copy, Clone)]
+#[derive(Debug, Default, Copy, Clone)]
 pub struct TimingResult {
     /// Wall clock time
     pub time_real: Second,
@@ -40,21 +40,16 @@ pub fn time_shell_command(
     failure_action: CmdFailureAction,
     shell_spawning_time: Option<TimingResult>,
 ) -> io::Result<(TimingResult, bool)> {
-    let start = Instant::now();
-    let start_cpu = get_cpu_times();
+    let wallclock_timer = WallClockTimer::start();
 
-    let status = Command::new("sh")
-        .arg("-c")
-        .arg(shell_cmd)
-        .stdin(Stdio::null())
-        .stdout(Stdio::null())
-        .stderr(Stdio::null())
-        .status()?;
+    let result = execute_and_time(shell_cmd)?;
 
-    let end_cpu = get_cpu_times();
-    let duration = start.elapsed();
+    let mut time_user = result.user_time;
+    let mut time_system = result.system_time;
 
-    if failure_action == CmdFailureAction::RaiseError && !status.success() {
+    let mut time_real = wallclock_timer.stop();
+
+    if failure_action == CmdFailureAction::RaiseError && !result.status.success() {
         return Err(io::Error::new(
             io::ErrorKind::Other,
             "Command terminated with non-zero exit code. \
@@ -62,19 +57,11 @@ pub fn time_shell_command(
         ));
     }
 
-    // Real time
-    let mut time_real = duration.as_secs() as f64 + (duration.subsec_nanos() as f64) * 1e-9;
-
-    // User and system time
-    let cpu_interval = cpu_time_interval(&start_cpu, &end_cpu);
-    let mut time_user = cpu_interval.user;
-    let mut time_system = cpu_interval.system;
-
     // Correct for shell spawning time
     if let Some(spawning_time) = shell_spawning_time {
         time_real = subtract_shell_spawning_time(time_real, spawning_time.time_real);
-        time_user = subtract_shell_spawning_time(cpu_interval.user, spawning_time.time_user);
-        time_system = subtract_shell_spawning_time(cpu_interval.system, spawning_time.time_system);
+        time_user = subtract_shell_spawning_time(time_user, spawning_time.time_user);
+        time_system = subtract_shell_spawning_time(time_system, spawning_time.time_system);
     }
 
     Ok((
@@ -83,7 +70,7 @@ pub fn time_shell_command(
             time_user,
             time_system,
         },
-        status.success(),
+        result.status.success(),
     ))
 }
 
@@ -126,18 +113,21 @@ pub fn mean_shell_spawning_time(style: &OutputStyleOption) -> io::Result<TimingR
 }
 
 /// Run the command specified by `--prepare`.
-fn run_preparation_command(command: &Option<String>) -> io::Result<()> {
+fn run_preparation_command(command: &Option<String>) -> io::Result<TimingResult> {
     if let &Some(ref preparation_command) = command {
         let res = time_shell_command(preparation_command, CmdFailureAction::RaiseError, None);
-        if let Err(_) = res {
+        if res.is_err() {
             return Err(io::Error::new(
                 io::ErrorKind::Other,
                 "The preparation command terminated with a non-zero exit code. \
                  Append ' || true' to the command if you are sure that this can be ignored.",
             ));
         }
+        return res.map(|r| r.0);
     }
-    Ok(())
+    Ok(TimingResult {
+        ..Default::default()
+    })
 }
 
 /// Run the benchmark for a single shell command
@@ -183,15 +173,16 @@ pub fn run_benchmark(
     );
 
     // Run init / cleanup command
-    run_preparation_command(&options.preparation_command)?;
+    let prepare_res = run_preparation_command(&options.preparation_command)?;
 
     // Initial timing run
     let (res, success) =
         time_shell_command(cmd, options.failure_action, Some(shell_spawning_time))?;
 
     // Determine number of benchmark runs
-    let runs_in_min_time =
-        (options.min_time_sec / (res.time_real + shell_spawning_time.time_real)) as u64;
+    let runs_in_min_time = (options.min_time_sec
+        / (res.time_real + prepare_res.time_real + shell_spawning_time.time_real))
+        as u64;
 
     let count = if runs_in_min_time >= options.min_runs {
         runs_in_min_time

src/hyperfine/internal.rs

@@ -24,6 +24,9 @@ pub enum OutputStyleOption {
 
     /// Output with full color and formatting
     Full,
+
+    /// Keep elements such as progress bar, but use no coloring
+    NoColor,
 }
 
 /// A set of options for hyperfine
@@ -62,16 +65,16 @@ impl Default for HyperfineOptions {
 
 /// Return a pre-configured progress bar
 pub fn get_progress_bar(length: u64, msg: &str, option: &OutputStyleOption) -> ProgressBar {
-    let progressbar_style = match option {
-        &OutputStyleOption::Basic => ProgressStyle::default_bar(),
-        &OutputStyleOption::Full => ProgressStyle::default_spinner()
+    let progressbar_style = match *option {
+        OutputStyleOption::Basic => ProgressStyle::default_bar(),
+        _ => ProgressStyle::default_spinner()
             .tick_chars("⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏")
             .template(" {spinner} {msg:<30} {wide_bar} ETA {eta_precise}"),
     };
 
-    let progress_bar = match option {
-        &OutputStyleOption::Basic => ProgressBar::hidden(),
-        &OutputStyleOption::Full => ProgressBar::new(length),
+    let progress_bar = match *option {
+        OutputStyleOption::Basic => ProgressBar::hidden(),
+        _ => ProgressBar::new(length),
     };
     progress_bar.set_style(progressbar_style.clone());
     progress_bar.enable_steady_tick(80);

src/hyperfine/mod.rs

@@ -1,6 +1,7 @@
 pub mod benchmark;
 pub mod format;
 pub mod internal;
-pub mod cputime;
 pub mod outlier_detection;
 pub mod warnings;
+pub mod timer;
+pub mod shell;

src/hyperfine/outlier_detection.rs

@@ -13,16 +13,16 @@ use statistical::median;
 pub const OUTLIER_THRESHOLD: f64 = 1.4826 * 10.0;
 
 /// Compute modifized Z-scores for a given sample. A (unmodified) Z-score is defined by
-/// (x_i - x_mean)/x_stddev whereas the modified Z-score is defined by |x_i - x_median|/MAD where
-/// MAD is the median average deviation.
+/// `(x_i - x_mean)/x_stddev` whereas the modified Z-score is defined by `|x_i - x_median|/MAD`
+/// where MAD is the median average deviation.
 ///
 /// References:
-/// - https://en.wikipedia.org/wiki/Median_absolute_deviation
+/// - <https://en.wikipedia.org/wiki/Median_absolute_deviation>
 pub fn modified_zscores(xs: &[f64]) -> Vec<f64> {
     assert!(!xs.is_empty());
 
     // Compute sample median:
-    let x_median = median(&xs);
+    let x_median = median(xs);
 
     // Compute the absolute deviations from the median:
     let deviations: Vec<f64> = xs.iter().map(|x| (x - x_median).abs()).collect();

src/hyperfine/shell.rs

@@ -0,0 +1,73 @@
+use std;
+use std::io;
+use std::process::{Command, ExitStatus, Stdio};
+
+use hyperfine::timer::get_cpu_timer;
+
+/// Used to indicate the result of running a command
+#[derive(Debug, Copy, Clone)]
+pub struct ExecuteResult {
+    /// The amount of user time the process used
+    pub user_time: f64,
+
+    /// The amount of cpu time the process used
+    pub system_time: f64,
+
+    /// The exit status of the process
+    pub status: ExitStatus,
+}
+
+/// Execute the given command and return a timing summary
+#[cfg(windows)]
+pub fn execute_and_time(command: &str) -> io::Result<ExecuteResult> {
+    let mut child = run_shell_command(command)?;
+    let cpu_timer = get_cpu_timer(&child);
+    let status = child.wait()?;
+
+    let (user_time, system_time) = cpu_timer.stop();
+    Ok(ExecuteResult {
+        user_time,
+        system_time,
+        status,
+    })
+}
+
+/// Execute the given command and return a timing summary
+#[cfg(not(windows))]
+pub fn execute_and_time(command: &str) -> io::Result<ExecuteResult> {
+    let cpu_timer = get_cpu_timer();
+
+    let status = run_shell_command(command)?;
+
+    let (user_time, system_time) = cpu_timer.stop();
+
+    Ok(ExecuteResult {
+        user_time,
+        system_time,
+        status,
+    })
+}
+
+/// Run a standard shell command
+#[cfg(not(windows))]
+fn run_shell_command(command: &str) -> io::Result<std::process::ExitStatus> {
+    Command::new("sh")
+        .arg("-c")
+        .arg(command)
+        .stdin(Stdio::null())
+        .stdout(Stdio::null())
+        .stderr(Stdio::null())
+        .status()
+}
+
+/// Run a Windows shell command using cmd.exe
+#[cfg(windows)]
+fn run_shell_command(command: &str) -> io::Result<std::process::Child> {
+    Command::new("cmd")
+        .arg("/C")
+        .arg(command)
+        .stdin(Stdio::null())
+        .stdout(Stdio::null())
+        .stderr(Stdio::null())
+        .spawn()
+}

src/hyperfine/timer/internal.rs

@@ -0,0 +1,19 @@
+use hyperfine::internal::Second;
+
+#[derive(Debug, Copy, Clone)]
+pub struct CPUTimes {
+    /// Total amount of time spent executing in user mode
+    pub user_usec: i64,
+
+    /// Total amount of time spent executing in kernel mode
+    pub system_usec: i64,
+}
+
+#[derive(Debug, Copy, Clone)]
+pub struct CPUInterval {
+    /// Total amount of time spent executing in user mode
+    pub user: Second,
+
+    /// Total amount of time spent executing in kernel mode
+    pub system: Second,
+}

src/hyperfine/timer/mod.rs

@@ -0,0 +1,26 @@
+mod internal;
+
+pub mod wallclocktimer;
+
+cfg_if! {
+    if #[cfg(windows)] {
+        mod windows_timer;
+        pub use self::windows_timer::get_cpu_timer;
+    } else {
+        mod unix_timer;
+        pub use self::unix_timer::get_cpu_timer;
+    }
+}
+use std::process::Child;
+
+/// Defines start functionality of a timer.
+pub trait TimerStart {
+    fn start() -> Self;
+    fn start_for_process(process: &Child) -> Self;
+}
+
+/// Defines stop functionality of a timer.
+pub trait TimerStop {
+    type Result;
+    fn stop(&self) -> Self::Result;
+}

src/hyperfine/timer/unix_timer.rs

@@ -1,28 +1,46 @@
-use libc::{getrusage, rusage, RUSAGE_CHILDREN};
-use std::mem;
+#![cfg(not(windows))]
 
+use super::internal::{CPUInterval, CPUTimes};
+use hyperfine::timer::{TimerStart, TimerStop};
 use hyperfine::internal::Second;
 
-#[derive(Debug, Copy, Clone)]
-pub struct CPUTimes {
-    /// Total amount of time spent executing in user mode
-    user_usec: i64,
+use std::mem;
+use std::process::Child;
 
-    /// Total amount of time spent executing in kernel mode
-    system_usec: i64,
+pub fn get_cpu_timer() -> Box<TimerStop<Result = (Second, Second)>> {
+    Box::new(CPUTimer::start())
 }
 
-#[derive(Debug, Copy, Clone)]
-pub struct CPUInterval {
-    /// Total amount of time spent executing in user mode
-    pub user: Second,
+struct CPUTimer {
+    start_cpu: CPUTimes,
+}
 
-    /// Total amount of time spent executing in kernel mode
-    pub system: Second,
+impl TimerStart for CPUTimer {
+    fn start() -> Self {
+        CPUTimer {
+            start_cpu: get_cpu_times(),
+        }
+    }
+
+    fn start_for_process(_: &Child) -> Self {
+        Self::start()
+    }
+}
+
+impl TimerStop for CPUTimer {
+    type Result = (Second, Second);
+
+    fn stop(&self) -> Self::Result {
+        let end_cpu = get_cpu_times();
+        let cpu_interval = cpu_time_interval(&self.start_cpu, &end_cpu);
+        (cpu_interval.user, cpu_interval.system)
+    }
 }
 
 /// Read CPU execution times ('user' and 'system')
-pub fn get_cpu_times() -> CPUTimes {
+fn get_cpu_times() -> CPUTimes {
+    use libc::{getrusage, rusage, RUSAGE_CHILDREN};
+
     let result: rusage = unsafe {
         let mut buf = mem::zeroed();
         let success = getrusage(RUSAGE_CHILDREN, &mut buf);
@@ -41,7 +59,7 @@ pub fn get_cpu_times() -> CPUTimes {
 }
 
 /// Compute the time intervals in between two `CPUTimes` snapshots
-pub fn cpu_time_interval(start: &CPUTimes, end: &CPUTimes) -> CPUInterval {
+fn cpu_time_interval(start: &CPUTimes, end: &CPUTimes) -> CPUInterval {
     CPUInterval {
         user: ((end.user_usec - start.user_usec) as f64) * 1e-6,
         system: ((end.system_usec - start.system_usec) as f64) * 1e-6,

src/hyperfine/timer/wallclocktimer.rs

@@ -0,0 +1,30 @@
+use std::process::Child;
+use std::time::Instant;
+
+use hyperfine::internal::Second;
+use hyperfine::timer::{TimerStart, TimerStop};
+
+pub struct WallClockTimer {
+    start: Instant,
+}
+
+impl TimerStart for WallClockTimer {
+    fn start() -> WallClockTimer {
+        WallClockTimer {
+            start: Instant::now(),
+        }
+    }
+
+    fn start_for_process(_: &Child) -> Self {
+        Self::start()
+    }
+}
+
+impl TimerStop for WallClockTimer {
+    type Result = Second;
+
+    fn stop(&self) -> Second {
+        let duration = self.start.elapsed();
+        duration.as_secs() as f64 + (duration.subsec_nanos() as f64) * 1e-9
+    }
+}

src/hyperfine/timer/windows_timer.rs

@@ -0,0 +1,74 @@
+#![cfg(windows)]
+
+use super::internal::CPUTimes;
+use hyperfine::internal::Second;
+use hyperfine::timer::{TimerStart, TimerStop};
+
+use winapi::um::processthreadsapi::GetProcessTimes;
+use winapi::um::winnt::HANDLE;
+
+use std::mem;
+use std::os::windows::io::{AsRawHandle, RawHandle};
+use std::process::Child;
+
+const HUNDRED_NS_PER_MS: i64 = 10;
+
+pub fn get_cpu_timer(process: &Child) -> Box<TimerStop<Result=(Second,Second)>> {
+    Box::new(CPUTimer::start_for_process(process))
+}
+
+struct CPUTimer {
+    handle: RawHandle,
+}
+
+impl TimerStart for CPUTimer {
+
+    fn start() -> Self {
+        panic!()
+    }
+
+    fn start_for_process(process: &Child) -> Self {
+        CPUTimer { handle: process.as_raw_handle() }
+    }    
+}
+
+impl TimerStop for CPUTimer {
+    type Result = (Second, Second);
+
+    fn stop(&self) -> Self::Result {
+        let times = get_cpu_times(self.handle);
+        (times.user_usec as f64 * 1e-6, times.system_usec as f64 * 1e-6)
+    }
+}
+
+/// Read CPU execution times (dummy for now)
+fn get_cpu_times(handle: RawHandle) -> CPUTimes {
+    let (user_usec, system_usec) = unsafe {
+        let mut _ctime = mem::zeroed();
+        let mut _etime = mem::zeroed();
+        let mut kernel_time = mem::zeroed();
+        let mut user_time = mem::zeroed();
+        let res = GetProcessTimes(
+            handle as HANDLE,
+            &mut _ctime,
+            &mut _etime,
+            &mut kernel_time,
+            &mut user_time,
+        );
+
+        // GetProcessTimes will exit with non-zero if success as per: https://msdn.microsoft.com/en-us/library/windows/desktop/ms683223(v=vs.85).aspx
+        if res != 0 {
+            // Extract times as laid out here: https://support.microsoft.com/en-us/help/188768/info-working-with-the-filetime-structure
+            // Both user_time and kernel_time are spans that the proces spent in either. 
+            let user: i64 = (((user_time.dwHighDateTime as i64) << 32) + user_time.dwLowDateTime as i64) / HUNDRED_NS_PER_MS;
+            let kernel: i64 = (((kernel_time.dwHighDateTime as i64) << 32) + kernel_time.dwLowDateTime as i64) / HUNDRED_NS_PER_MS;
+            (user, kernel)
+        } else {
+            (0, 0)
+        }
+    };
+
+    CPUTimes {
+        user_usec, system_usec,
+    }
+}

src/main.rs

@@ -1,12 +1,22 @@
 extern crate atty;
 
+#[macro_use]
+extern crate cfg_if;
+
 #[macro_use]
 extern crate clap;
 extern crate colored;
 extern crate indicatif;
-extern crate libc;
 extern crate statistical;
 
+cfg_if! {
+    if #[cfg(windows)] {
+        extern crate winapi;
+    } else {
+        extern crate libc;
+    }
+}
+
 #[cfg(test)]
 #[macro_use]
 extern crate approx;
@@ -105,11 +115,12 @@ fn main() {
                 .short("s")
                 .takes_value(true)
                 .value_name("TYPE")
-                .possible_values(&["auto", "basic", "full"])
+                .possible_values(&["auto", "basic", "full", "nocolor"])
                 .help(
-                    "Set output style type. If set to 'basic', all colors and special \
-                     formatting will be disabled. If set to 'auto' when output target is not \
-                     a TTY, 'basic' is used (default: auto).",
+                    "Set output style type (default: auto). Set this to 'basic' to disable output \
+                     coloring and interactive elements. Set it to 'full' to enable all effects \
+                     even if no interactive terminal was detected. Setting to 'nocolor' maintains \
+                     all advanced output, but uses no colorization.",
                 ),
         )
         .arg(
@@ -139,6 +150,7 @@ fn main() {
     options.output_style = match matches.value_of("style") {
         Some("full") => OutputStyleOption::Full,
         Some("basic") => OutputStyleOption::Basic,
+        Some("nocolor") => OutputStyleOption::NoColor,
         _ => if atty::is(Stream::Stdout) {
             OutputStyleOption::Full
         } else {
@@ -146,9 +158,15 @@ fn main() {
         },
     };
 
-    if options.output_style == OutputStyleOption::Basic {
+    // We default Windows to NoColor if full had been specified.
+    if cfg!(windows) && options.output_style == OutputStyleOption::Full {
+        options.output_style = OutputStyleOption::NoColor;
+    }
+
+    if options.output_style != OutputStyleOption::Full {
         colored::control::set_override(false);
     }
+
     if matches.is_present("ignore-failure") {
         options.failure_action = CmdFailureAction::Ignore;
     }