From 7426569c4dc2943cb9f68d48c3aab92515d11149 Mon Sep 17 00:00:00 2001
From: kraktus <kraktus@users.noreply.github.com>
Date: Wed, 4 May 2022 19:08:21 +0200
Subject: [PATCH 01/22] test CLI output with `trycmd`

Important before moving from `StructOpt` to `clap`
---
 Cargo.toml            |  1 +
 tests/cli_tests.rs    |  4 ++
 tests/cmd/h.stderr    |  0
 tests/cmd/h.stdout    | 48 ++++++++++++++++++++++
 tests/cmd/h.sterr     |  0
 tests/cmd/h.toml      |  2 +
 tests/cmd/help.stderr |  0
 tests/cmd/help.stdout | 94 +++++++++++++++++++++++++++++++++++++++++++
 tests/cmd/help.toml   |  2 +
 9 files changed, 151 insertions(+)
 create mode 100644 tests/cli_tests.rs
 create mode 100644 tests/cmd/h.stderr
 create mode 100644 tests/cmd/h.stdout
 create mode 100644 tests/cmd/h.sterr
 create mode 100644 tests/cmd/h.toml
 create mode 100644 tests/cmd/help.stderr
 create mode 100644 tests/cmd/help.stdout
 create mode 100644 tests/cmd/help.toml

diff --git a/Cargo.toml b/Cargo.toml
index a7b4a6c..ad98224 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -34,3 +34,4 @@ colored = "2"
 
 [dev-dependencies]
 quickcheck = "0.9.2"
+trycmd = "0.13.4"
diff --git a/tests/cli_tests.rs b/tests/cli_tests.rs
new file mode 100644
index 0000000..edecca6
--- /dev/null
+++ b/tests/cli_tests.rs
@@ -0,0 +1,4 @@
+#[test]
+fn cli_tests() {
+    trycmd::TestCases::new().case("tests/cmd/*.toml");
+}
diff --git a/tests/cmd/h.stderr b/tests/cmd/h.stderr
new file mode 100644
index 0000000..e69de29
diff --git a/tests/cmd/h.stdout b/tests/cmd/h.stdout
new file mode 100644
index 0000000..a9fb4a6
--- /dev/null
+++ b/tests/cmd/h.stdout
@@ -0,0 +1,48 @@
+cargo-bisect-rustc 0.6.3
+
+USAGE:
+    cargo-bisect-rustc [FLAGS] [OPTIONS] [-- <command-args>...]
+
+FLAGS:
+    -a, --alt                Download the alt build instead of normal build
+        --by-commit          Bisect via commit artifacts
+        --force-install      Force installation over existing artifacts
+    -h, --help               Prints help information
+        --preserve           Preserve the downloaded artifacts
+        --preserve-target    Preserve the target directory used for builds
+        --prompt             Manually evaluate for regression with prompts
+    -V, --version            Prints version information
+        --verbose            
+        --with-dev           Download rustc-dev [default: no download]
+        --with-src           Download rust-src [default: no download]
+        --without-cargo      Do not install cargo [default: install cargo]
+
+OPTIONS:
+        --access <access>              How to access Rust git repository [github|checkout]
+    -c, --component <components>...    additional components to install
+        --end <end>                    Right bound for search (*with* regression). You can use a date (YYYY-MM-DD), git
+                                       tag name (e.g. 1.58.0) or git commit SHA.
+        --host <host>                  Host triple for the compiler [default: unknown]
+        --install <install>            Install the given artifact
+        --regress <regress>            Custom regression definition [default: error]
+        --script <script>              Script replacement for `cargo build` command
+        --start <start>                Left bound for search (*without* regression). You can use a date (YYYY-MM-DD),
+                                       git tag name (e.g. 1.58.0) or git commit SHA.
+        --target <target>              Cross-compilation target platform
+        --test-dir <test-dir>          Root directory for tests [default: .]
+    -t, --timeout <timeout>            Assume failure after specified number of seconds (for bisecting hangs)
+
+ARGS:
+    <command-args>...    Arguments to pass to cargo or the file specified by --script during tests
+
+EXAMPLES:
+    Run a fully automatic nightly bisect doing `cargo check`:
+    ```
+    cargo bisect-rustc --start 2018-07-07 --end 2018-07-30 --test-dir ../my_project/ -- check
+    ```
+
+    Run a PR-based bisect with manual prompts after each run doing `cargo build`:
+    ```
+    cargo bisect-rustc --start 6a1c0637ce44aeea6c60527f4c0e7fb33f2bcd0d /
+      --end 866a713258915e6cbb212d135f751a6a8c9e1c0a --test-dir ../my_project/ --prompt -- build
+    ```
diff --git a/tests/cmd/h.sterr b/tests/cmd/h.sterr
new file mode 100644
index 0000000..e69de29
diff --git a/tests/cmd/h.toml b/tests/cmd/h.toml
new file mode 100644
index 0000000..020e6f6
--- /dev/null
+++ b/tests/cmd/h.toml
@@ -0,0 +1,2 @@
+bin.name = "cargo-bisect-rustc"
+args = "-h"
diff --git a/tests/cmd/help.stderr b/tests/cmd/help.stderr
new file mode 100644
index 0000000..e69de29
diff --git a/tests/cmd/help.stdout b/tests/cmd/help.stdout
new file mode 100644
index 0000000..e8db417
--- /dev/null
+++ b/tests/cmd/help.stdout
@@ -0,0 +1,94 @@
+cargo-bisect-rustc 0.6.3
+
+USAGE:
+    cargo-bisect-rustc [FLAGS] [OPTIONS] [-- <command-args>...]
+
+FLAGS:
+    -a, --alt                
+            Download the alt build instead of normal build
+
+        --by-commit          
+            Bisect via commit artifacts
+
+        --force-install      
+            Force installation over existing artifacts
+
+    -h, --help               
+            Prints help information
+
+        --preserve           
+            Preserve the downloaded artifacts
+
+        --preserve-target    
+            Preserve the target directory used for builds
+
+        --prompt             
+            Manually evaluate for regression with prompts
+
+    -V, --version            
+            Prints version information
+
+        --verbose            
+            
+
+        --with-dev           
+            Download rustc-dev [default: no download]
+
+        --with-src           
+            Download rust-src [default: no download]
+
+        --without-cargo      
+            Do not install cargo [default: install cargo]
+
+
+OPTIONS:
+        --access <access>              
+            How to access Rust git repository [github|checkout]
+
+    -c, --component <components>...    
+            additional components to install
+
+        --end <end>                    
+            Right bound for search (*with* regression). You can use a date (YYYY-MM-DD), git tag name (e.g. 1.58.0) or
+            git commit SHA.
+        --host <host>                  
+            Host triple for the compiler [default: unknown]
+
+        --install <install>            
+            Install the given artifact
+
+        --regress <regress>            
+            Custom regression definition [error|non-error|ice|non-ice|success] [default: error]
+
+        --script <script>              
+            Script replacement for `cargo build` command
+
+        --start <start>                
+            Left bound for search (*without* regression). You can use a date (YYYY-MM-DD), git tag name (e.g. 1.58.0) or
+            git commit SHA.
+        --target <target>              
+            Cross-compilation target platform
+
+        --test-dir <test-dir>          
+            Root directory for tests [default: .]
+
+    -t, --timeout <timeout>            
+            Assume failure after specified number of seconds (for bisecting hangs)
+
+
+ARGS:
+    <command-args>...    
+            Arguments to pass to cargo or the file specified by --script during tests
+
+
+EXAMPLES:
+    Run a fully automatic nightly bisect doing `cargo check`:
+    ```
+    cargo bisect-rustc --start 2018-07-07 --end 2018-07-30 --test-dir ../my_project/ -- check
+    ```
+
+    Run a PR-based bisect with manual prompts after each run doing `cargo build`:
+    ```
+    cargo bisect-rustc --start 6a1c0637ce44aeea6c60527f4c0e7fb33f2bcd0d /
+      --end 866a713258915e6cbb212d135f751a6a8c9e1c0a --test-dir ../my_project/ --prompt -- build
+    ```
diff --git a/tests/cmd/help.toml b/tests/cmd/help.toml
new file mode 100644
index 0000000..a10767f
--- /dev/null
+++ b/tests/cmd/help.toml
@@ -0,0 +1,2 @@
+bin.name = "cargo-bisect-rustc"
+args = "--help"

From 8cdd423aa5af6769e7c82b0a0e420da68fc3c7d1 Mon Sep 17 00:00:00 2001
From: kraktus <kraktus@users.noreply.github.com>
Date: Wed, 4 May 2022 19:19:23 +0200
Subject: [PATCH 02/22] update `Cargo.lock`

---
 Cargo.lock | 925 ++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 628 insertions(+), 297 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4060313..fdb69f1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,33 +4,33 @@ version = 3
 
 [[package]]
 name = "addr2line"
-version = "0.13.0"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b6a2d3371669ab3ca9797670853d61402b03d0b4b9ebf33d677dfa720203072"
+checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b"
 dependencies = [
  "gimli",
 ]
 
 [[package]]
 name = "adler"
-version = "0.2.3"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "aho-corasick"
-version = "0.7.13"
+version = "0.7.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86"
+checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "ansi_term"
-version = "0.11.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
+checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
 dependencies = [
  "winapi 0.3.9",
 ]
@@ -48,18 +48,19 @@ dependencies = [
 
 [[package]]
 name = "autocfg"
-version = "1.0.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "backtrace"
-version = "0.3.50"
+version = "0.3.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46254cf2fdcdf1badb5934448c1bcbe046a56537b3987d96c51a7afc5d03f293"
+checksum = "11a17d453482a265fd5f8479f2a3f405566e6ca627837aaddb85af8b1ab8ef61"
 dependencies = [
  "addr2line",
- "cfg-if",
+ "cc",
+ "cfg-if 1.0.0",
  "libc",
  "miniz_oxide",
  "object",
@@ -68,21 +69,21 @@ dependencies = [
 
 [[package]]
 name = "base64"
-version = "0.12.3"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff"
+checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
 
 [[package]]
 name = "bitflags"
-version = "1.2.1"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bumpalo"
-version = "3.4.0"
+version = "3.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820"
+checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899"
 
 [[package]]
 name = "bytes"
@@ -90,6 +91,12 @@ version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
 
+[[package]]
+name = "bytes"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
+
 [[package]]
 name = "cargo-bisect-rustc"
 version = "0.6.3"
@@ -113,14 +120,15 @@ dependencies = [
  "tar",
  "tee",
  "tempdir",
+ "trycmd",
  "xz2",
 ]
 
 [[package]]
 name = "cc"
-version = "1.0.59"
+version = "1.0.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66120af515773fb005778dc07c261bd201ec8ce50bd6e7144c927753fe013381"
+checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
 dependencies = [
  "jobserver",
 ]
@@ -131,22 +139,30 @@ version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
 
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
 [[package]]
 name = "chrono"
-version = "0.4.15"
+version = "0.4.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942f72db697d8767c22d46a598e01f2d3b475501ea43d0db4f16d90259182d0b"
+checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
 dependencies = [
+ "libc",
  "num-integer",
  "num-traits",
  "time",
+ "winapi 0.3.9",
 ]
 
 [[package]]
 name = "clap"
-version = "2.33.3"
+version = "2.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
+checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
 dependencies = [
  "ansi_term",
  "atty",
@@ -168,6 +184,33 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "combine"
+version = "4.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a604e93b79d1808327a6fca85a6f2d69de66461e7620f5a4cbf5fb4d1d7c948"
+dependencies = [
+ "bytes 1.1.0",
+ "memchr",
+]
+
+[[package]]
+name = "concolor"
+version = "0.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "015267563b1df20adccdd00cb05257b1dfbea70a04928e9cf88ffb850c1a40af"
+dependencies = [
+ "atty",
+ "bitflags",
+ "concolor-query",
+]
+
+[[package]]
+name = "concolor-query"
+version = "0.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6417fe6fc03a8b533fd2177742eeb39a90c7233eedec7bac96d4d6b69a09449"
+
 [[package]]
 name = "console"
 version = "0.11.3"
@@ -185,11 +228,20 @@ dependencies = [
  "winapi-util",
 ]
 
+[[package]]
+name = "content_inspector"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7bda66e858c683005a53a9a60c69a4aca7eeaa45d124526e389f7aec8e62f38"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "core-foundation"
-version = "0.7.0"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171"
+checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -197,37 +249,61 @@ dependencies = [
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.7.0"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac"
+checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
 
 [[package]]
 name = "crc32fast"
-version = "1.2.0"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
+checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
 ]
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.4.4"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87"
+checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53"
 dependencies = [
+ "cfg-if 1.0.0",
  "crossbeam-utils",
- "maybe-uninit",
 ]
 
 [[package]]
-name = "crossbeam-utils"
-version = "0.7.2"
+name = "crossbeam-deque"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
+checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"
+dependencies = [
+ "cfg-if 1.0.0",
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c"
 dependencies = [
  "autocfg",
- "cfg-if",
+ "cfg-if 1.0.0",
+ "crossbeam-utils",
+ "lazy_static",
+ "memoffset",
+ "scopeguard",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38"
+dependencies = [
+ "cfg-if 1.0.0",
  "lazy_static",
 ]
 
@@ -243,10 +319,16 @@ dependencies = [
 ]
 
 [[package]]
-name = "dtoa"
-version = "0.4.6"
+name = "dunce"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134951f4028bdadb9b84baf4232681efbf277da25144b9b0ad65df75946c422b"
+checksum = "453440c271cf5577fd2a40e4942540cb7d0d2f85e27c8d07dd0023c925a67541"
+
+[[package]]
+name = "either"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
 
 [[package]]
 name = "encode_unicode"
@@ -256,11 +338,11 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.24"
+version = "0.8.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a51b8cf747471cb9499b6d59e59b0444f4c90eba8968c4e44874e92b5b64ace2"
+checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
 ]
 
 [[package]]
@@ -270,7 +352,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
 dependencies = [
  "atty",
- "humantime",
+ "humantime 1.3.0",
  "log",
  "regex",
  "termcolor",
@@ -298,13 +380,22 @@ dependencies = [
  "synstructure",
 ]
 
+[[package]]
+name = "fastrand"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf"
+dependencies = [
+ "instant",
+]
+
 [[package]]
 name = "filetime"
-version = "0.2.12"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ed85775dcc68644b5c950ac06a2b23768d3bc9390464151aaf27136998dcf9e"
+checksum = "c0408e2626025178a6a7f7ffc05a25bc47103229f19c113755de7bf63816290c"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "libc",
  "redox_syscall",
  "winapi 0.3.9",
@@ -312,11 +403,11 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.0.17"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "766d0e77a2c1502169d4a93ff3b8c15a71fd946cd0126309752104e5f3c46d94"
+checksum = "b39522e96686d38f4bc984b9198e3a0613264abaebaff2c5c918bfa6b6da09af"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "crc32fast",
  "libc",
  "miniz_oxide",
@@ -343,6 +434,16 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
+[[package]]
+name = "form_urlencoded"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"
+dependencies = [
+ "matches",
+ "percent-encoding",
+]
+
 [[package]]
 name = "fuchsia-cprng"
 version = "0.1.1"
@@ -367,77 +468,74 @@ checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
 
 [[package]]
 name = "futures-channel"
-version = "0.3.5"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f366ad74c28cca6ba456d95e6422883cfb4b252a83bed929c83abfdbbf2967d5"
+checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010"
 dependencies = [
  "futures-core",
 ]
 
 [[package]]
 name = "futures-core"
-version = "0.3.5"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59f5fff90fd5d971f936ad674802482ba441b6f09ba5e15fd8b39145582ca399"
+checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3"
 
 [[package]]
 name = "futures-io"
-version = "0.3.5"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de27142b013a8e869c14957e6d2edeef89e97c289e69d042ee3a49acd8b51789"
+checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b"
 
 [[package]]
 name = "futures-sink"
-version = "0.3.5"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f2032893cb734c7a05d85ce0cc8b8c4075278e93b24b66f9de99d6eb0fa8acc"
+checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868"
 
 [[package]]
 name = "futures-task"
-version = "0.3.5"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdb66b5f09e22019b1ab0830f7785bcea8e7a42148683f99214f73f8ec21a626"
-dependencies = [
- "once_cell",
-]
+checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a"
 
 [[package]]
 name = "futures-util"
-version = "0.3.5"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8764574ff08b701a084482c3c7031349104b07ac897393010494beaa18ce32c6"
+checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a"
 dependencies = [
  "futures-core",
  "futures-io",
  "futures-task",
  "memchr",
- "pin-project",
+ "pin-project-lite 0.2.9",
  "pin-utils",
  "slab",
 ]
 
 [[package]]
 name = "getrandom"
-version = "0.1.14"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
+checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "libc",
  "wasi 0.9.0+wasi-snapshot-preview1",
 ]
 
 [[package]]
 name = "gimli"
-version = "0.22.0"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aaf91faf136cb47367fa430cd46e37a788775e7fa104f8b4bcb3861dc389b724"
+checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4"
 
 [[package]]
 name = "git2"
-version = "0.13.11"
+version = "0.13.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e094214efbc7fdbbdee952147e493b00e99a4e52817492277e98967ae918165"
+checksum = "f29229cc1b24c0e6062f6e742aa3e256492a5323365e5ed3413599f8a5eff7d6"
 dependencies = [
  "bitflags",
  "libc",
@@ -448,13 +546,19 @@ dependencies = [
  "url",
 ]
 
+[[package]]
+name = "glob"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
+
 [[package]]
 name = "h2"
-version = "0.2.6"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "993f9e0baeed60001cf565546b0d3dbe6a6ad23f2bd31644a133c641eccf6d53"
+checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535"
 dependencies = [
- "bytes",
+ "bytes 0.5.6",
  "fnv",
  "futures-core",
  "futures-sink",
@@ -465,28 +569,29 @@ dependencies = [
  "tokio",
  "tokio-util",
  "tracing",
+ "tracing-futures",
 ]
 
 [[package]]
 name = "hashbrown"
-version = "0.9.0"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00d63df3d41950fb462ed38308eea019113ad1508da725bbedcd0fa5a85ef5f7"
+checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
 
 [[package]]
 name = "heck"
-version = "0.3.1"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
+checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
 dependencies = [
  "unicode-segmentation",
 ]
 
 [[package]]
 name = "hermit-abi"
-version = "0.1.15"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9"
+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
 dependencies = [
  "libc",
 ]
@@ -502,13 +607,13 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "0.2.1"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9"
+checksum = "ff8670570af52249509a86f5e3e18a08c60b177071826898fde8997cf5f6bfbb"
 dependencies = [
- "bytes",
+ "bytes 1.1.0",
  "fnv",
- "itoa",
+ "itoa 1.0.1",
 ]
 
 [[package]]
@@ -517,15 +622,21 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b"
 dependencies = [
- "bytes",
+ "bytes 0.5.6",
  "http",
 ]
 
 [[package]]
 name = "httparse"
-version = "1.3.4"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
+checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c"
+
+[[package]]
+name = "httpdate"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47"
 
 [[package]]
 name = "humantime"
@@ -536,13 +647,29 @@ dependencies = [
  "quick-error",
 ]
 
+[[package]]
+name = "humantime"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+
+[[package]]
+name = "humantime-serde"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57a3db5ea5923d99402c94e9feb261dc5ee9b4efa158b0315f788cf549cc200c"
+dependencies = [
+ "humantime 2.1.0",
+ "serde",
+]
+
 [[package]]
 name = "hyper"
-version = "0.13.7"
+version = "0.13.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e68a8dd9716185d9e64ea473ea6ef63529252e3e27623295a0378a19665d5eb"
+checksum = "8a6f157065790a3ed2f88679250419b5cdd96e714a0d65f7797fd337186e96bb"
 dependencies = [
- "bytes",
+ "bytes 0.5.6",
  "futures-channel",
  "futures-core",
  "futures-util",
@@ -550,10 +677,10 @@ dependencies = [
  "http",
  "http-body",
  "httparse",
- "itoa",
+ "httpdate",
+ "itoa 0.4.8",
  "pin-project",
  "socket2",
- "time",
  "tokio",
  "tower-service",
  "tracing",
@@ -566,7 +693,7 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed"
 dependencies = [
- "bytes",
+ "bytes 0.5.6",
  "hyper",
  "native-tls",
  "tokio",
@@ -575,9 +702,9 @@ dependencies = [
 
 [[package]]
 name = "idna"
-version = "0.2.0"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
+checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
 dependencies = [
  "matches",
  "unicode-bidi",
@@ -586,14 +713,23 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "1.6.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55e2e4c765aa53a0424761bf9f41aa7a6ac1efa87238f59560640e27fca028f2"
+checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee"
 dependencies = [
  "autocfg",
  "hashbrown",
 ]
 
+[[package]]
+name = "instant"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+dependencies = [
+ "cfg-if 1.0.0",
+]
+
 [[package]]
 name = "iovec"
 version = "0.1.4"
@@ -605,30 +741,45 @@ dependencies = [
 
 [[package]]
 name = "ipnet"
-version = "2.3.0"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b"
+
+[[package]]
+name = "itertools"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47be2f14c678be2fdcab04ab1171db51b2762ce6f0a8ee87c8dd4a04ed216135"
+checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3"
+dependencies = [
+ "either",
+]
 
 [[package]]
 name = "itoa"
-version = "0.4.6"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
+
+[[package]]
+name = "itoa"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6"
+checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"
 
 [[package]]
 name = "jobserver"
-version = "0.1.21"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2"
+checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "js-sys"
-version = "0.3.45"
+version = "0.3.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca059e81d9486668f12d455a4ea6daa600bd408134cd17e3d3fb5a32d1f016f8"
+checksum = "671a26f820db17c2a2750743f1dd03bafd15b98c9f30c7c2628c024c05d73397"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -651,15 +802,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.76"
+version = "0.2.125"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "755456fae044e6fa1ebbbd1b3e902ae19e73097ed4ed87bb79934a867c007bc3"
+checksum = "5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b"
 
 [[package]]
 name = "libgit2-sys"
-version = "0.12.13+1.0.1"
+version = "0.12.26+1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "069eea34f76ec15f2822ccf78fe0cdb8c9016764d0a12865278585a74dbdeae5"
+checksum = "19e1c899248e606fbfe68dcb31d8b0176ebab833b103824af31bddf4b7457494"
 dependencies = [
  "cc",
  "libc",
@@ -671,9 +822,9 @@ dependencies = [
 
 [[package]]
 name = "libssh2-sys"
-version = "0.2.19"
+version = "0.2.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca46220853ba1c512fc82826d0834d87b06bcd3c2a42241b7de72f3d2fe17056"
+checksum = "b094a36eb4b8b8c8a7b4b8ae43b2944502be3e59cd87687595cf6b0a71b3f4ca"
 dependencies = [
  "cc",
  "libc",
@@ -685,9 +836,9 @@ dependencies = [
 
 [[package]]
 name = "libz-sys"
-version = "1.1.2"
+version = "1.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "602113192b08db8f38796c4e85c39e960c145965140e918018bcde1952429655"
+checksum = "92e7e15d7610cce1d9752e137625f14e61a28cd45929b6e12e47b50fe154ee2e"
 dependencies = [
  "cc",
  "libc",
@@ -697,18 +848,18 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.11"
+version = "0.4.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
+checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
 ]
 
 [[package]]
 name = "lzma-sys"
-version = "0.1.16"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f24f76ec44a8ac23a31915d6e326bca17ce88da03096f1ff194925dc714dac99"
+checksum = "bdb4b7c3eddad11d3af9e86c487607d2d2442d185d848575365c4856ba96d619"
 dependencies = [
  "cc",
  "libc",
@@ -717,21 +868,24 @@ dependencies = [
 
 [[package]]
 name = "matches"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
+checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
 
 [[package]]
-name = "maybe-uninit"
-version = "2.0.0"
+name = "memchr"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
+checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
 
 [[package]]
-name = "memchr"
-version = "2.3.3"
+name = "memoffset"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
+checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
+dependencies = [
+ "autocfg",
+]
 
 [[package]]
 name = "mime"
@@ -741,9 +895,9 @@ checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
 
 [[package]]
 name = "mime_guess"
-version = "2.0.3"
+version = "2.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212"
+checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef"
 dependencies = [
  "mime",
  "unicase",
@@ -751,20 +905,20 @@ dependencies = [
 
 [[package]]
 name = "miniz_oxide"
-version = "0.4.1"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d7559a8a40d0f97e1edea3220f698f78b1c5ab67532e49f68fde3910323b722"
+checksum = "d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082"
 dependencies = [
  "adler",
 ]
 
 [[package]]
 name = "mio"
-version = "0.6.22"
+version = "0.6.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430"
+checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "fuchsia-zircon",
  "fuchsia-zircon-sys",
  "iovec",
@@ -779,9 +933,9 @@ dependencies = [
 
 [[package]]
 name = "miow"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
+checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d"
 dependencies = [
  "kernel32-sys",
  "net2",
@@ -791,9 +945,9 @@ dependencies = [
 
 [[package]]
 name = "native-tls"
-version = "0.2.4"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b0d88c06fe90d5ee94048ba40409ef1d9315d86f6f38c2efdaad4fb50c58b2d"
+checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9"
 dependencies = [
  "lazy_static",
  "libc",
@@ -809,20 +963,26 @@ dependencies = [
 
 [[package]]
 name = "net2"
-version = "0.2.35"
+version = "0.2.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ebc3ec692ed7c9a255596c67808dee269f64655d8baf7b4f0638e51ba1d6853"
+checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "libc",
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "normalize-line-endings"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
+
 [[package]]
 name = "num-integer"
-version = "0.1.43"
+version = "0.1.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b"
+checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
 dependencies = [
  "autocfg",
  "num-traits",
@@ -830,18 +990,18 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.12"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611"
+checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "num_cpus"
-version = "1.13.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
+checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
 dependencies = [
  "hermit-abi",
  "libc",
@@ -849,41 +1009,56 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.20.0"
+version = "0.28.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ab52be62400ca80aa00285d25253d7f7c437b7375c4de678f5405d3afe82ca5"
+checksum = "40bec70ba014595f99f7aa110b84331ffe1ee9aece7fe6f387cc7e3ecda4d456"
+dependencies = [
+ "memchr",
+]
 
 [[package]]
 name = "once_cell"
-version = "1.4.1"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "260e51e7efe62b592207e9e13a68e43692a7a279171d6ba57abd208bf23645ad"
+checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9"
 
 [[package]]
 name = "openssl"
-version = "0.10.30"
+version = "0.10.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4"
+checksum = "fb81a6430ac911acb25fe5ac8f1d2af1b4ea8a4fdfda0f1ee4292af2e2d8eb0e"
 dependencies = [
  "bitflags",
- "cfg-if",
+ "cfg-if 1.0.0",
  "foreign-types",
- "lazy_static",
  "libc",
+ "once_cell",
+ "openssl-macros",
  "openssl-sys",
 ]
 
+[[package]]
+name = "openssl-macros"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "openssl-probe"
-version = "0.1.2"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
+checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.58"
+version = "0.9.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de"
+checksum = "9d5fd19fb3e0a8191c1e34935718976a3e70c112ab9a24af6d7cadccd9d90bc0"
 dependencies = [
  "autocfg",
  "cc",
@@ -892,11 +1067,21 @@ dependencies = [
  "vcpkg",
 ]
 
+[[package]]
+name = "os_pipe"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c92f2b54f081d635c77e7120862d48db8e91f7f21cef23ab1b4fe9971c59f55"
+dependencies = [
+ "libc",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "pbr"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74333e3d1d8bced07fd0b8599304825684bcdb4a1fcc6fa6a470e6e08cefd254"
+checksum = "ff5751d87f7c00ae6403eb1fcbba229b9c76c9a30de8c1cf87182177b168cea2"
 dependencies = [
  "crossbeam-channel",
  "libc",
@@ -912,18 +1097,18 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
 
 [[package]]
 name = "pin-project"
-version = "0.4.23"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca4433fff2ae79342e497d9f8ee990d174071408f28f726d6d83af93e58e48aa"
+checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "0.4.23"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c0e815c3ee9a031fdf5af21c10aa17c573c9c6a566328d99e3936c34e36461f"
+checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -932,9 +1117,15 @@ dependencies = [
 
 [[package]]
 name = "pin-project-lite"
-version = "0.1.7"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777"
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282adbf10f2698a7a77f8e983a74b2d18176c19a7fd32a45446139ae7b02b715"
+checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
 
 [[package]]
 name = "pin-utils"
@@ -944,15 +1135,15 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "pkg-config"
-version = "0.3.18"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33"
+checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.9"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c36fa947111f5c62a733b652544dd0016a43ce89619538a8ef92724a6f501a20"
+checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
 
 [[package]]
 name = "proc-macro-error"
@@ -980,9 +1171,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.20"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "175c513d55719db99da20232b06cda8bab6b83ec2d04e3283edf0213c37c1a29"
+checksum = "ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1"
 dependencies = [
  "unicode-xid",
 ]
@@ -1007,9 +1198,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.7"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
+checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1"
 dependencies = [
  "proc-macro2",
 ]
@@ -1083,6 +1274,30 @@ dependencies = [
  "rand_core 0.5.1",
 ]
 
+[[package]]
+name = "rayon"
+version = "1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd249e82c21598a9a426a4e00dd7adc1d640b22445ec8545feef801d1a74c221"
+dependencies = [
+ "autocfg",
+ "crossbeam-deque",
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f51245e1e62e1f1629cbfec37b5793bbabcaeb90f30e94d2ba03564687353e4"
+dependencies = [
+ "crossbeam-channel",
+ "crossbeam-deque",
+ "crossbeam-utils",
+ "num_cpus",
+]
+
 [[package]]
 name = "rdrand"
 version = "0.4.0"
@@ -1094,27 +1309,29 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.1.57"
+version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
+checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42"
+dependencies = [
+ "bitflags",
+]
 
 [[package]]
 name = "regex"
-version = "1.3.9"
+version = "1.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6"
+checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286"
 dependencies = [
  "aho-corasick",
  "memchr",
  "regex-syntax",
- "thread_local",
 ]
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.18"
+version = "0.6.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8"
+checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
 
 [[package]]
 name = "remove_dir_all"
@@ -1127,12 +1344,12 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.10.8"
+version = "0.10.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9eaa17ac5d7b838b7503d118fa16ad88f440498bf9ffe5424e621f93190d61e"
+checksum = "0718f81a8e14c4dbb3b34cf23dc6aaf9ab8a0dfec160c534b3dbca1aaa21f47c"
 dependencies = [
  "base64",
- "bytes",
+ "bytes 0.5.6",
  "encoding_rs",
  "futures-core",
  "futures-util",
@@ -1148,7 +1365,7 @@ dependencies = [
  "mime_guess",
  "native-tls",
  "percent-encoding",
- "pin-project-lite",
+ "pin-project-lite 0.2.9",
  "serde",
  "serde_json",
  "serde_urlencoded",
@@ -1163,9 +1380,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.16"
+version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
+checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"
 
 [[package]]
 name = "rustc_version"
@@ -1178,9 +1395,18 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.5"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
+checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f"
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
 
 [[package]]
 name = "schannel"
@@ -1192,11 +1418,17 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "scopeguard"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+
 [[package]]
 name = "security-framework"
-version = "0.4.4"
+version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64808902d7d99f78eaddd2b4e2509713babc3dc3c85ad6f4c447680f3c01e535"
+checksum = "2dc14f172faf8a0194a3aded622712b0de276821addc574fa54fc0a1167e10dc"
 dependencies = [
  "bitflags",
  "core-foundation",
@@ -1207,9 +1439,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "0.4.3"
+version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17bf11d99252f512695eb468de5516e5cf75455521e69dfe343f3b74e4748405"
+checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -1232,18 +1464,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
 name = "serde"
-version = "1.0.115"
+version = "1.0.137"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e54c9a88f2da7238af84b5101443f0c0d0a3bbdc455e34a5c9497b1903ed55d5"
+checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.115"
+version = "1.0.137"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "609feed1d0a73cc36a0182a840a9b37b4a82f0b1150369f0536a9e3f2a31dc48"
+checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1252,42 +1484,79 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.57"
+version = "1.0.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "164eacbdb13512ec2745fb09d51fd5b22b0d65ed294a1dcf7285a360c80a675c"
+checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c"
 dependencies = [
- "itoa",
+ "itoa 1.0.1",
  "ryu",
  "serde",
 ]
 
 [[package]]
 name = "serde_urlencoded"
-version = "0.6.1"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97"
+checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
 dependencies = [
- "dtoa",
- "itoa",
+ "form_urlencoded",
+ "itoa 1.0.1",
+ "ryu",
  "serde",
- "url",
 ]
 
+[[package]]
+name = "shlex"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
+
+[[package]]
+name = "similar"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e24979f63a11545f5f2c60141afe249d4f19f84581ea2138065e400941d83d3"
+
 [[package]]
 name = "slab"
-version = "0.4.2"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
+checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32"
+
+[[package]]
+name = "snapbox"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "767a1d5da232b6959cd1bd5c9e8db8a7cce09c3038e89deedb49a549a2aefd93"
+dependencies = [
+ "concolor",
+ "content_inspector",
+ "dunce",
+ "filetime",
+ "normalize-line-endings",
+ "os_pipe",
+ "similar",
+ "snapbox-macros",
+ "tempfile",
+ "wait-timeout",
+ "walkdir",
+ "yansi",
+]
+
+[[package]]
+name = "snapbox-macros"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c01dea7e04cbb27ef4c86e9922184608185f7cd95c1763bc30d727cda4a5e930"
 
 [[package]]
 name = "socket2"
-version = "0.3.12"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918"
+checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "libc",
- "redox_syscall",
  "winapi 0.3.9",
 ]
 
@@ -1299,9 +1568,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
 
 [[package]]
 name = "structopt"
-version = "0.3.17"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6cc388d94ffabf39b5ed5fadddc40147cb21e605f53db6f8f36a625d27489ac5"
+checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10"
 dependencies = [
  "clap",
  "lazy_static",
@@ -1310,9 +1579,9 @@ dependencies = [
 
 [[package]]
 name = "structopt-derive"
-version = "0.4.10"
+version = "0.4.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e2513111825077552a6751dfad9e11ce0fba07d7276a3943a037d7e93e64c5f"
+checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0"
 dependencies = [
  "heck",
  "proc-macro-error",
@@ -1323,9 +1592,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.40"
+version = "1.0.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "963f7d3cc59b59b9325165add223142bbf1df27655d07789f109896d353d8350"
+checksum = "7ff7c592601f11445996a06f8ad0c27f094a58857c2f89e97974ab9235b92c52"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1334,9 +1603,9 @@ dependencies = [
 
 [[package]]
 name = "synstructure"
-version = "0.12.4"
+version = "0.12.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701"
+checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1346,13 +1615,12 @@ dependencies = [
 
 [[package]]
 name = "tar"
-version = "0.4.30"
+version = "0.4.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "489997b7557e9a43e192c527face4feacc78bfbe6eed67fd55c4c9e381cba290"
+checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6"
 dependencies = [
  "filetime",
  "libc",
- "redox_syscall",
  "xattr",
 ]
 
@@ -1374,13 +1642,13 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.1.0"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
+checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
+ "fastrand",
  "libc",
- "rand 0.7.3",
  "redox_syscall",
  "remove_dir_all",
  "winapi 0.3.9",
@@ -1388,18 +1656,18 @@ dependencies = [
 
 [[package]]
 name = "termcolor"
-version = "1.1.0"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f"
+checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
 dependencies = [
  "winapi-util",
 ]
 
 [[package]]
 name = "terminal_size"
-version = "0.1.13"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a14cd9f8c72704232f0bfc8455c0e861f0ad4eb60cc9ec8a170e231414c1e13"
+checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df"
 dependencies = [
  "libc",
  "winapi 0.3.9",
@@ -1407,9 +1675,9 @@ dependencies = [
 
 [[package]]
 name = "termios"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f0fcee7b24a25675de40d5bb4de6e41b0df07bc9856295e7e2b3a3600c400c2"
+checksum = "411c5bf740737c7918b8b1fe232dca4dc9f8e754b8ad5e20966814001ed0ac6b"
 dependencies = [
  "libc",
 ]
@@ -1423,15 +1691,6 @@ dependencies = [
  "unicode-width",
 ]
 
-[[package]]
-name = "thread_local"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
-dependencies = [
- "lazy_static",
-]
-
 [[package]]
 name = "time"
 version = "0.1.44"
@@ -1445,17 +1704,26 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "0.3.4"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "238ce071d267c5710f9d31451efec16c5ee22de34df17cc05e56cbc92e967117"
+checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "0.2.22"
+version = "0.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d34ca54d84bf2b5b4d7d31e901a8464f7b60ac145a284fba25ceb801f2ddccd"
+checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092"
 dependencies = [
- "bytes",
+ "bytes 0.5.6",
  "fnv",
  "futures-core",
  "iovec",
@@ -1463,7 +1731,7 @@ dependencies = [
  "memchr",
  "mio",
  "num_cpus",
- "pin-project-lite",
+ "pin-project-lite 0.1.12",
  "slab",
 ]
 
@@ -1483,46 +1751,85 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499"
 dependencies = [
- "bytes",
+ "bytes 0.5.6",
  "futures-core",
  "futures-sink",
  "log",
- "pin-project-lite",
+ "pin-project-lite 0.1.12",
  "tokio",
 ]
 
+[[package]]
+name = "toml_edit"
+version = "0.14.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba98375fd631b83696f87c64e4ed8e29e6a1f3404d6aed95fa95163bad38e705"
+dependencies = [
+ "combine",
+ "indexmap",
+ "itertools",
+ "serde",
+]
+
 [[package]]
 name = "tower-service"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860"
+checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
 
 [[package]]
 name = "tracing"
-version = "0.1.19"
+version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d79ca061b032d6ce30c660fded31189ca0b9922bf483cd70759f13a2d86786c"
+checksum = "5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "log",
+ "pin-project-lite 0.2.9",
  "tracing-core",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.16"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bcf46c1f1f06aeea2d6b81f3c863d0930a596c86ad1920d4e5bad6dd1d7119a"
+checksum = "f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f"
 dependencies = [
  "lazy_static",
 ]
 
+[[package]]
+name = "tracing-futures"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2"
+dependencies = [
+ "pin-project",
+ "tracing",
+]
+
 [[package]]
 name = "try-lock"
 version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
 
+[[package]]
+name = "trycmd"
+version = "0.13.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffb4185126cc904642173a54c185083f410c86d1202ada6761aacf7c40829f13"
+dependencies = [
+ "glob",
+ "humantime 2.1.0",
+ "humantime-serde",
+ "rayon",
+ "serde",
+ "shlex",
+ "snapbox",
+ "toml_edit",
+]
+
 [[package]]
 name = "unicase"
 version = "2.6.0"
@@ -1534,46 +1841,44 @@ dependencies = [
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.4"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
-dependencies = [
- "matches",
-]
+checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.13"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977"
+checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9"
 dependencies = [
  "tinyvec",
 ]
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.6.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0"
+checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
+checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.1"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
+checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04"
 
 [[package]]
 name = "url"
-version = "2.1.1"
+version = "2.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb"
+checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"
 dependencies = [
+ "form_urlencoded",
  "idna",
  "matches",
  "percent-encoding",
@@ -1581,9 +1886,9 @@ dependencies = [
 
 [[package]]
 name = "vcpkg"
-version = "0.2.10"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
 [[package]]
 name = "vec_map"
@@ -1593,9 +1898,29 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
 
 [[package]]
 name = "version_check"
-version = "0.9.2"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "wait-timeout"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed"
+checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "walkdir"
+version = "2.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
+dependencies = [
+ "same-file",
+ "winapi 0.3.9",
+ "winapi-util",
+]
 
 [[package]]
 name = "want"
@@ -1621,11 +1946,11 @@ checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.68"
+version = "0.2.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ac64ead5ea5f05873d7c12b545865ca2b8d28adfc50a49b84770a3a97265d42"
+checksum = "27370197c907c55e3f1a9fbe26f44e937fe6451368324e009cba39e139dc08ad"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "serde",
  "serde_json",
  "wasm-bindgen-macro",
@@ -1633,9 +1958,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.68"
+version = "0.2.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f22b422e2a757c35a73774860af8e112bff612ce6cb604224e8e47641a9e4f68"
+checksum = "53e04185bfa3a779273da532f5025e33398409573f348985af9a1cbf3774d3f4"
 dependencies = [
  "bumpalo",
  "lazy_static",
@@ -1648,11 +1973,11 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.18"
+version = "0.4.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7866cab0aa01de1edf8b5d7936938a7e397ee50ce24119aef3e1eaa3b6171da"
+checksum = "6f741de44b75e14c35df886aff5f1eb73aa114fa5d4d00dcd37b5e01259bf3b2"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "js-sys",
  "wasm-bindgen",
  "web-sys",
@@ -1660,9 +1985,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.68"
+version = "0.2.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b13312a745c08c469f0b292dd2fcd6411dba5f7160f593da6ef69b64e407038"
+checksum = "17cae7ff784d7e83a2fe7611cfe766ecf034111b49deb850a3dc7699c08251f5"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -1670,9 +1995,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.68"
+version = "0.2.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f249f06ef7ee334cc3b8ff031bfc11ec99d00f34d86da7498396dc1e3b1498fe"
+checksum = "99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1683,15 +2008,15 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.68"
+version = "0.2.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d649a3145108d7d3fbcde896a468d1bd636791823c9921135218ad89be08307"
+checksum = "d554b7f530dee5964d9a9468d95c1f8b8acae4f282807e7d27d4b03099a46744"
 
 [[package]]
 name = "web-sys"
-version = "0.3.45"
+version = "0.3.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bf6ef87ad7ae8008e15a355ce696bed26012b7caa21605188cfd8214ab51e2d"
+checksum = "7b17e741662c70c8bd24ac5c5b18de314a2c26c32bf8346ee1e6f53de919c283"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -1761,9 +2086,9 @@ dependencies = [
 
 [[package]]
 name = "xattr"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "244c3741f4240ef46274860397c7c74e50eb23624996930e484c16679633a54c"
+checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc"
 dependencies = [
  "libc",
 ]
@@ -1776,3 +2101,9 @@ checksum = "c179869f34fc7c01830d3ce7ea2086bc3a07e0d35289b667d0a8bf910258926c"
 dependencies = [
  "lzma-sys",
 ]
+
+[[package]]
+name = "yansi"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"

From 46473849b1b1d209ea87ba5ae779074a10161933 Mon Sep 17 00:00:00 2001
From: kraktus <kraktus@users.noreply.github.com>
Date: Wed, 4 May 2022 19:27:08 +0200
Subject: [PATCH 03/22] Replace `failure` with `anyhow` and `thiserror`

`failure` is deprecated in favour of these two librairies

Update `Cargo.lock` and `Cargo.toml`
---
 Cargo.lock         | 108 ++++++++++++---------------------------------
 Cargo.toml         |   3 +-
 src/git.rs         |   6 +--
 src/github.rs      |   9 ++--
 src/main.rs        |  11 +++--
 src/repo_access.rs |  10 ++---
 src/toolchains.rs  |  51 +++++++++++----------
 7 files changed, 74 insertions(+), 124 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fdb69f1..f3e31aa 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,15 +2,6 @@
 # It is not intended for manual editing.
 version = 3
 
-[[package]]
-name = "addr2line"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b"
-dependencies = [
- "gimli",
-]
-
 [[package]]
 name = "adler"
 version = "1.0.2"
@@ -35,6 +26,12 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "anyhow"
+version = "1.0.57"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08f9b8508dccb7687a1d6c4ce66b2b0ecef467c94667de27d8d7fe1f8d2a9cdc"
+
 [[package]]
 name = "atty"
 version = "0.2.14"
@@ -52,21 +49,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
-[[package]]
-name = "backtrace"
-version = "0.3.65"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11a17d453482a265fd5f8479f2a3f405566e6ca627837aaddb85af8b1ab8ef61"
-dependencies = [
- "addr2line",
- "cc",
- "cfg-if 1.0.0",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
-]
-
 [[package]]
 name = "base64"
 version = "0.13.0"
@@ -101,11 +83,11 @@ checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
 name = "cargo-bisect-rustc"
 version = "0.6.3"
 dependencies = [
+ "anyhow",
  "chrono",
  "colored",
  "dialoguer",
  "env_logger",
- "failure",
  "flate2",
  "git2",
  "home",
@@ -120,6 +102,7 @@ dependencies = [
  "tar",
  "tee",
  "tempdir",
+ "thiserror",
  "trycmd",
  "xz2",
 ]
@@ -358,28 +341,6 @@ dependencies = [
  "termcolor",
 ]
 
-[[package]]
-name = "failure"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86"
-dependencies = [
- "backtrace",
- "failure_derive",
-]
-
-[[package]]
-name = "failure_derive"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "synstructure",
-]
-
 [[package]]
 name = "fastrand"
 version = "1.7.0"
@@ -525,12 +486,6 @@ dependencies = [
  "wasi 0.9.0+wasi-snapshot-preview1",
 ]
 
-[[package]]
-name = "gimli"
-version = "0.26.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4"
-
 [[package]]
 name = "git2"
 version = "0.13.25"
@@ -1007,15 +962,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "object"
-version = "0.28.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40bec70ba014595f99f7aa110b84331ffe1ee9aece7fe6f387cc7e3ecda4d456"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "once_cell"
 version = "1.10.0"
@@ -1378,12 +1324,6 @@ dependencies = [
  "winreg",
 ]
 
-[[package]]
-name = "rustc-demangle"
-version = "0.1.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"
-
 [[package]]
 name = "rustc_version"
 version = "0.2.3"
@@ -1601,18 +1541,6 @@ dependencies = [
  "unicode-xid",
 ]
 
-[[package]]
-name = "synstructure"
-version = "0.12.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "unicode-xid",
-]
-
 [[package]]
 name = "tar"
 version = "0.4.38"
@@ -1691,6 +1619,26 @@ dependencies = [
  "unicode-width",
 ]
 
+[[package]]
+name = "thiserror"
+version = "1.0.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "time"
 version = "0.1.44"
diff --git a/Cargo.toml b/Cargo.toml
index ad98224..6edf6b7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,7 +15,8 @@ edition = "2021"
 dialoguer = "0.6.2"
 home = "0.5"
 env_logger = "0.7.1"
-failure = "0.1"
+thiserror = "1"
+anyhow = "1"
 flate2 = "1.0.14"
 git2 = "0.13.5"
 log = "0.4"
diff --git a/src/git.rs b/src/git.rs
index c17221d..21a4a56 100644
--- a/src/git.rs
+++ b/src/git.rs
@@ -8,7 +8,7 @@ use std::ops::Deref;
 use std::path::Path;
 
 use chrono::{TimeZone, Utc};
-use failure::{bail, Error, ResultExt};
+use anyhow::{bail, Error, Context};
 use git2::build::RepoBuilder;
 use git2::{Commit as Git2Commit, Repository};
 use log::debug;
@@ -110,8 +110,8 @@ fn find_origin_remote(repo: &Repository) -> Result<String, Error> {
         .filter_map(|name| name.and_then(|name| repo.find_remote(name).ok()))
         .find(|remote| remote.url().map_or(false, |url| url.contains(RUST_SRC_URL)))
         .and_then(|remote| remote.name().map(std::string::ToString::to_string))
-        .ok_or_else(|| {
-            failure::format_err!(
+        .with_context(|| {
+            format!(
                 "rust-lang/rust remote not found. \
 Try adding a remote pointing to `{}` in the rust repository at `{}`.",
                 RUST_SRC_URL,
diff --git a/src/github.rs b/src/github.rs
index 4377129..b96b8e0 100644
--- a/src/github.rs
+++ b/src/github.rs
@@ -1,4 +1,4 @@
-use failure::{Error, format_err};
+use anyhow::{Error, Context};
 use reqwest::{self, blocking::Client, blocking::Response};
 use serde::{Deserialize, Serialize};
 
@@ -28,9 +28,10 @@ struct GithubAuthor {
 
 impl GithubCommitElem {
     fn date(&self) -> Result<GitDate, Error> {
-        let (date_str, _) = self.commit.committer.date.split_once("T").ok_or_else(|| {
-            format_err!("commit date should folllow the ISO 8061 format, eg: 2022-05-04T09:55:51Z")
-        })?;
+        let (date_str, _) =
+            self.commit.committer.date.split_once("T").context(
+                "commit date should folllow the ISO 8061 format, eg: 2022-05-04T09:55:51Z",
+            )?;
         Ok(parse_to_utc_date(date_str)?)
     }
 
diff --git a/src/main.rs b/src/main.rs
index e3f98eb..add7e4b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -15,7 +15,7 @@ use std::str::FromStr;
 
 use chrono::{Date, Duration, NaiveDate, Utc};
 use colored::Colorize;
-use failure::{bail, format_err, Fail, Error};
+use anyhow::{bail, Error, Context};
 use log::debug;
 use reqwest::blocking::Client;
 use structopt::StructOpt;
@@ -177,8 +177,8 @@ enum Bound {
     Date(GitDate),
 }
 
-#[derive(Fail, Debug)]
-#[fail(display = "will never happen")]
+#[derive(thiserror::Error, Debug)]
+#[error("will never happen")]
 struct BoundParseError {}
 
 impl FromStr for Bound {
@@ -227,7 +227,7 @@ impl Opts {
     }
 }
 
-#[derive(Debug, Fail)]
+#[derive(Debug, thiserror::Error)]
 struct ExitError(i32);
 
 impl fmt::Display for ExitError {
@@ -925,8 +925,7 @@ fn bisect_nightlies(cfg: &Config, client: &Client) -> Result<BisectionResult, Er
         }
     }
 
-    let first_success =
-        first_success.ok_or_else(|| format_err!("could not find a nightly that built"))?;
+    let first_success = first_success.context("could not find a nightly that built")?;
 
     // confirm that the end of the date range has the regression
     let mut t_end = Toolchain {
diff --git a/src/repo_access.rs b/src/repo_access.rs
index 4371f1d..9b26717 100644
--- a/src/repo_access.rs
+++ b/src/repo_access.rs
@@ -1,3 +1,5 @@
+use anyhow::Context;
+
 use crate::{Bound, Commit, Error, GitDate, git, github};
 
 pub(crate) trait RustRepositoryAccessor {
@@ -38,12 +40,8 @@ impl RustRepositoryAccessor for AccessViaLocalGit {
             "fetching (via local git) commits from {} to {}",
             start_sha, end_sha
         );
-        git::get_commits_between(start_sha, end_sha).map_err(|e| {
-            failure::format_err!(
-                "failed during attempt to create/access local git repository: {}",
-                e
-            )
-        })
+        git::get_commits_between(start_sha, end_sha)
+            .context("failed during attempt to create/access local git repository")
     }
 }
 
diff --git a/src/toolchains.rs b/src/toolchains.rs
index 447be2f..3cd2b55 100644
--- a/src/toolchains.rs
+++ b/src/toolchains.rs
@@ -7,7 +7,7 @@ use std::process::{self, Command, Stdio};
 use chrono::{Date, NaiveDate, Utc};
 use colored::Colorize;
 use dialoguer::Select;
-use failure::{Fail, Error};
+use anyhow::Error;
 use flate2::read::GzDecoder;
 use log::debug;
 use pbr::{ProgressBar, Units};
@@ -28,20 +28,20 @@ pub const YYYY_MM_DD: &str = "%Y-%m-%d";
 pub(crate) const NIGHTLY_SERVER: &str = "https://static.rust-lang.org/dist";
 const CI_SERVER: &str = "https://s3-us-west-1.amazonaws.com/rust-lang-ci2";
 
-#[derive(Fail, Debug)]
+#[derive(thiserror::Error, Debug)]
 pub(crate) enum InstallError {
-    #[fail(display = "Could not find {}; url: {}", spec, url)]
+    #[error("Could not find {spec}; url: {url}")]
     NotFound { url: String, spec: ToolchainSpec },
-    #[fail(display = "Could not download toolchain: {}", _0)]
-    Download(#[cause] DownloadError),
-    #[fail(display = "Could not create tempdir: {}", _0)]
-    TempDir(#[cause] io::Error),
-    #[fail(display = "Could not move tempdir into destination: {}", _0)]
-    Move(#[cause] io::Error),
-    #[fail(display = "Could not run subcommand {}: {}", cmd, err)]
+    #[error("Could not download toolchain: {0}")]
+    Download(#[source] DownloadError),
+    #[error("Could not create tempdir: {0}")]
+    TempDir(#[source] io::Error),
+    #[error("Could not move tempdir into destination: {0}")]
+    Move(#[source] io::Error),
+    #[error("Could not run subcommand {cmd}: {err}")]
     Subcommand {
         cmd: String,
-        #[cause]
+        #[source]
         err: io::Error,
     },
 }
@@ -155,7 +155,10 @@ impl Toolchain {
             } else {
                 Err(InstallError::Subcommand {
                     cmd: format!("{cmd:?}"),
-                    err: io::Error::new(io::ErrorKind::Other, "failed to link via `rustup`"),
+                    err: io::Error::new(
+                        io::ErrorKind::Other,
+                        "thiserror::Errored to link via `rustup`",
+                    ),
                 })
             };
         }
@@ -296,7 +299,7 @@ impl Toolchain {
         let output = match cmd.output() {
             Ok(output) => output,
             Err(err) => {
-                panic!("failed to run {:?}: {:?}", cmd, err);
+                panic!("thiserror::Errored to run {:?}: {:?}", cmd, err);
             }
         };
 
@@ -428,22 +431,22 @@ impl DownloadParams {
     }
 }
 
-#[derive(Fail, Debug)]
+#[derive(thiserror::Error, Debug)]
 pub(crate) enum ArchiveError {
-    #[fail(display = "Failed to parse archive: {}", _0)]
-    Archive(#[cause] io::Error),
-    #[fail(display = "Failed to create directory: {}", _0)]
-    CreateDir(#[cause] io::Error),
+    #[error("thiserror::Errored to parse archive: {0}")]
+    Archive(#[source] io::Error),
+    #[error("thiserror::Errored to create directory: {0}")]
+    CreateDir(#[source] io::Error),
 }
 
-#[derive(Fail, Debug)]
+#[derive(thiserror::Error, Debug)]
 pub(crate) enum DownloadError {
-    #[fail(display = "Tarball not found at {}", _0)]
+    #[error("Tarball not found at {0}")]
     NotFound(String),
-    #[fail(display = "A reqwest error occurred: {}", _0)]
-    Reqwest(#[cause] reqwest::Error),
-    #[fail(display = "An archive error occurred: {}", _0)]
-    Archive(#[cause] ArchiveError),
+    #[error("A reqwest error occurred: {0}")]
+    Reqwest(#[from] reqwest::Error),
+    #[error("An archive error occurred: {0}")]
+    Archive(#[from] ArchiveError),
 }
 
 pub(crate) fn download_progress(

From 030a530576d981a7ba28e1e4d05a4e9249df7488 Mon Sep 17 00:00:00 2001
From: kraktus <kraktus@users.noreply.github.com>
Date: Wed, 4 May 2022 20:56:42 +0200
Subject: [PATCH 04/22] more accurate and simpler return type for `remove` and
 `do_remove`

---
 src/toolchains.rs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/toolchains.rs b/src/toolchains.rs
index 3cd2b55..c796336 100644
--- a/src/toolchains.rs
+++ b/src/toolchains.rs
@@ -7,7 +7,6 @@ use std::process::{self, Command, Stdio};
 use chrono::{Date, NaiveDate, Utc};
 use colored::Colorize;
 use dialoguer::Select;
-use anyhow::Error;
 use flate2::read::GzDecoder;
 use log::debug;
 use pbr::{ProgressBar, Units};
@@ -209,7 +208,7 @@ impl Toolchain {
         fs::rename(tmpdir.into_path(), dest).map_err(InstallError::Move)
     }
 
-    pub(crate) fn remove(&self, dl_params: &DownloadParams) -> Result<(), Error> {
+    pub(crate) fn remove(&self, dl_params: &DownloadParams) -> Result<(), io::Error> {
         eprintln!("uninstalling {}", self);
         self.do_remove(dl_params)
     }
@@ -218,7 +217,7 @@ impl Toolchain {
     ///
     /// The main reason to call this (instead of `fs::remove_dir_all` directly)
     /// is to guard against deleting state not managed by `cargo-bisect-rustc`.
-    fn do_remove(&self, dl_params: &DownloadParams) -> Result<(), Error> {
+    fn do_remove(&self, dl_params: &DownloadParams) -> Result<(), io::Error> {
         let rustup_name = self.rustup_name();
 
         // Guard against destroying directories that this tool didn't create.
@@ -227,8 +226,7 @@ impl Toolchain {
         );
 
         let dir = dl_params.install_dir.join(rustup_name);
-        fs::remove_dir_all(&dir)?;
-        Ok(())
+        fs::remove_dir_all(&dir)
     }
 
     pub(crate) fn run_test(&self, cfg: &Config) -> process::Output {

From 09dc463bec4472e2f72a58077f75d12841f420a0 Mon Sep 17 00:00:00 2001
From: kraktus <kraktus@users.noreply.github.com>
Date: Wed, 4 May 2022 21:11:43 +0200
Subject: [PATCH 05/22] start replacing Result<_, anyhow::Error>

by anyhow::Result<_> or true error type when possible
---
 src/git.rs    | 16 ++++++++--------
 src/github.rs | 27 ++++++++++++++-------------
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/git.rs b/src/git.rs
index 21a4a56..bcb7878 100644
--- a/src/git.rs
+++ b/src/git.rs
@@ -8,7 +8,7 @@ use std::ops::Deref;
 use std::path::Path;
 
 use chrono::{TimeZone, Utc};
-use anyhow::{bail, Error, Context};
+use anyhow::{bail, Context};
 use git2::build::RepoBuilder;
 use git2::{Commit as Git2Commit, Repository};
 use log::debug;
@@ -39,7 +39,7 @@ impl Deref for RustcRepo {
     }
 }
 
-fn lookup_rev<'rev>(repo: &'rev RustcRepo, rev: &str) -> Result<Git2Commit<'rev>, Error> {
+fn lookup_rev<'rev>(repo: &'rev RustcRepo, rev: &str) -> anyhow::Result<Git2Commit<'rev>> {
     let revision = repo.revparse_single(rev)?;
 
     // Find the merge-base between the revision and master.
@@ -61,8 +61,8 @@ fn lookup_rev<'rev>(repo: &'rev RustcRepo, rev: &str) -> Result<Git2Commit<'rev>
     bail!("Could not find a commit for revision specifier '{}'", rev)
 }
 
-fn get_repo() -> Result<RustcRepo, Error> {
-    fn open(path: &Path) -> Result<(Repository, String), Error> {
+fn get_repo() -> anyhow::Result<RustcRepo> {
+    fn open(path: &Path) -> anyhow::Result<(Repository, String)> {
         eprintln!("opening existing repository at {:?}", path);
         let repo = Repository::open(path)?;
 
@@ -104,7 +104,7 @@ fn get_repo() -> Result<RustcRepo, Error> {
     })
 }
 
-fn find_origin_remote(repo: &Repository) -> Result<String, Error> {
+fn find_origin_remote(repo: &Repository) -> anyhow::Result<String> {
     repo.remotes()?
         .iter()
         .filter_map(|name| name.and_then(|name| repo.find_remote(name).ok()))
@@ -120,7 +120,7 @@ Try adding a remote pointing to `{}` in the rust repository at `{}`.",
         })
 }
 
-pub(crate) fn get_commit(sha: &str) -> Result<Commit, Error> {
+pub(crate) fn get_commit(sha: &str) -> anyhow::Result<Commit> {
     let repo = get_repo()?;
     let mut rev = lookup_rev(&repo, sha)?;
     Ok(Commit::from_git2_commit(&mut rev))
@@ -128,7 +128,7 @@ pub(crate) fn get_commit(sha: &str) -> Result<Commit, Error> {
 
 /// Returns the bors merge commits between the two specified boundaries
 /// (boundaries inclusive).
-pub fn get_commits_between(first_commit: &str, last_commit: &str) -> Result<Vec<Commit>, Error> {
+pub fn get_commits_between(first_commit: &str, last_commit: &str) -> anyhow::Result<Vec<Commit>> {
     let repo = get_repo()?;
     eprintln!("looking up first commit");
     let mut first = lookup_rev(&repo, first_commit)?;
@@ -137,7 +137,7 @@ pub fn get_commits_between(first_commit: &str, last_commit: &str) -> Result<Vec<
 
     // Sanity check -- our algorithm below only works reliably if the
     // two commits are merge commits made by bors
-    let assert_by_bors = |c: &Git2Commit<'_>| -> Result<(), Error> {
+    let assert_by_bors = |c: &Git2Commit<'_>| -> anyhow::Result<()> {
         match c.author().name() {
             Some("bors") => Ok(()),
             Some(author) => bail!("Expected author {} to be bors for {}.\n Make sure specified commits are on the master branch!", author, c.id()),
diff --git a/src/github.rs b/src/github.rs
index b96b8e0..ca31345 100644
--- a/src/github.rs
+++ b/src/github.rs
@@ -1,5 +1,6 @@
-use anyhow::{Error, Context};
+use anyhow::Context;
 use reqwest::{self, blocking::Client, blocking::Response};
+use reqwest::header::{HeaderMap, InvalidHeaderValue, HeaderValue, USER_AGENT, AUTHORIZATION};
 use serde::{Deserialize, Serialize};
 
 use crate::{Commit, GitDate, parse_to_utc_date};
@@ -27,7 +28,7 @@ struct GithubAuthor {
 }
 
 impl GithubCommitElem {
-    fn date(&self) -> Result<GitDate, Error> {
+    fn date(&self) -> anyhow::Result<GitDate> {
         let (date_str, _) =
             self.commit.committer.date.split_once("T").context(
                 "commit date should folllow the ISO 8061 format, eg: 2022-05-04T09:55:51Z",
@@ -35,7 +36,7 @@ impl GithubCommitElem {
         Ok(parse_to_utc_date(date_str)?)
     }
 
-    fn git_commit(self) -> Result<Commit, Error> {
+    fn git_commit(self) -> anyhow::Result<Commit> {
         let date = self.date()?;
         Ok(Commit {
             sha: self.sha,
@@ -45,20 +46,20 @@ impl GithubCommitElem {
     }
 }
 
-fn headers() -> Result<reqwest::header::HeaderMap, Error> {
-    let mut headers = reqwest::header::HeaderMap::new();
+fn headers() -> Result<HeaderMap, InvalidHeaderValue> {
+    let mut headers = HeaderMap::new();
     let user_agent = concat!(env!("CARGO_PKG_NAME"), "/", env!("CARGO_PKG_VERSION"));
-    let user_agent = reqwest::header::HeaderValue::from_static(user_agent);
-    headers.insert(reqwest::header::USER_AGENT, user_agent);
+    let user_agent = HeaderValue::from_static(user_agent);
+    headers.insert(USER_AGENT, user_agent);
     if let Ok(token) = std::env::var("GITHUB_TOKEN") {
         eprintln!("adding local env GITHUB_TOKEN value to headers in github query");
-        let value = reqwest::header::HeaderValue::from_str(&format!("token {}", token))?;
-        headers.insert(reqwest::header::AUTHORIZATION, value);
+        let value = HeaderValue::from_str(&format!("token {}", token))?;
+        headers.insert(AUTHORIZATION, value);
     }
     Ok(headers)
 }
 
-pub(crate) fn get_commit(sha: &str) -> Result<Commit, Error> {
+pub(crate) fn get_commit(sha: &str) -> anyhow::Result<Commit> {
     let url = CommitDetailsUrl { sha }.url();
     let client = Client::builder().default_headers(headers()?).build()?;
     let response: Response = client.get(&url).send()?;
@@ -77,7 +78,7 @@ pub(crate) struct CommitsQuery<'a> {
 /// (boundaries inclusive).
 
 impl CommitsQuery<'_> {
-    pub fn get_commits(&self) -> Result<Vec<Commit>, Error> {
+    pub fn get_commits(&self) -> anyhow::Result<Vec<Commit>> {
         // build up commit sequence, by feeding in `sha` as the starting point, and
         // working way backwards to max(`self.since_date`, `self.earliest_sha`).
         let mut commits = Vec::new();
@@ -192,8 +193,8 @@ enum Loop {
 
 fn parse_paged_elems(
     response: Response,
-    mut k: impl FnMut(GithubCommitElem) -> Result<Loop, Error>,
-) -> Result<Loop, Error> {
+    mut k: impl FnMut(GithubCommitElem) -> anyhow::Result<Loop>,
+) -> anyhow::Result<Loop> {
     let elems: Vec<GithubCommitElem> = response.json()?;
 
     if elems.is_empty() {

From aa94dc0212a088c1a579ff714bcacd760d822c97 Mon Sep 17 00:00:00 2001
From: kraktus <kraktus@users.noreply.github.com>
Date: Wed, 4 May 2022 21:16:44 +0200
Subject: [PATCH 06/22] remove `anyhow::Error` from `repo_access.rs`

---
 src/repo_access.rs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/repo_access.rs b/src/repo_access.rs
index 9b26717..0688891 100644
--- a/src/repo_access.rs
+++ b/src/repo_access.rs
@@ -1,10 +1,10 @@
 use anyhow::Context;
 
-use crate::{Bound, Commit, Error, GitDate, git, github};
+use crate::{Bound, Commit, GitDate, git, github};
 
 pub(crate) trait RustRepositoryAccessor {
     /// Maps `bound` to its associated date, looking up its commit if necessary.
-    fn bound_to_date(&self, bound: Bound) -> Result<GitDate, Error> {
+    fn bound_to_date(&self, bound: Bound) -> anyhow::Result<GitDate> {
         match bound {
             Bound::Date(date) => Ok(date),
             Bound::Commit(ref commit_ref) => self.commit(commit_ref).map(|commit| commit.date),
@@ -13,13 +13,13 @@ pub(crate) trait RustRepositoryAccessor {
 
     /// Looks up commit associated with `commit_ref`, which can be either a sha
     /// or a more general reference like "origin/master".
-    fn commit(&self, commit_ref: &str) -> Result<Commit, Error>;
+    fn commit(&self, commit_ref: &str) -> anyhow::Result<Commit>;
 
     /// Looks up a series of commits ending with `end_sha`; the resulting series
     /// should start with `start_sha`. If `start_sha` is not a predecessor of
     /// `end_sha` in the history, then the series will cover all commits as far
     /// back as the date associated with `start_sha`.
-    fn commits(&self, start_sha: &str, end_sha: &str) -> Result<Vec<Commit>, Error>;
+    fn commits(&self, start_sha: &str, end_sha: &str) -> anyhow::Result<Vec<Commit>>;
 }
 
 pub(crate) struct AccessViaLocalGit;
@@ -27,10 +27,10 @@ pub(crate) struct AccessViaLocalGit;
 pub(crate) struct AccessViaGithub;
 
 impl RustRepositoryAccessor for AccessViaLocalGit {
-    fn commit(&self, commit_ref: &str) -> Result<Commit, Error> {
+    fn commit(&self, commit_ref: &str) -> anyhow::Result<Commit> {
         git::get_commit(commit_ref)
     }
-    fn commits(&self, start_sha: &str, end_sha: &str) -> Result<Vec<Commit>, Error> {
+    fn commits(&self, start_sha: &str, end_sha: &str) -> anyhow::Result<Vec<Commit>> {
         let end_sha = if end_sha == "origin/master" {
             "FETCH_HEAD"
         } else {
@@ -46,11 +46,11 @@ impl RustRepositoryAccessor for AccessViaLocalGit {
 }
 
 impl RustRepositoryAccessor for AccessViaGithub {
-    fn commit(&self, commit_ref: &str) -> Result<Commit, Error> {
+    fn commit(&self, commit_ref: &str) -> anyhow::Result<Commit> {
         github::get_commit(commit_ref)
     }
 
-    fn commits(&self, start_sha: &str, end_sha: &str) -> Result<Vec<Commit>, Error> {
+    fn commits(&self, start_sha: &str, end_sha: &str) -> anyhow::Result<Vec<Commit>> {
         // `earliest_date` is an lower bound on what we should search in our
         // github query. Why is it `start` date minus 1?
         //

From fcb52c18fadcf91d289ee1e79262b6a2253608e1 Mon Sep 17 00:00:00 2001
From: kraktus <kraktus@users.noreply.github.com>
Date: Wed, 4 May 2022 21:22:44 +0200
Subject: [PATCH 07/22] finish replacing `anyhow::Result`

---
 src/main.rs | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index add7e4b..c3ea07d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -15,7 +15,7 @@ use std::str::FromStr;
 
 use chrono::{Date, Duration, NaiveDate, Utc};
 use colored::Colorize;
-use anyhow::{bail, Error, Context};
+use anyhow::{bail, Context};
 use log::debug;
 use reqwest::blocking::Client;
 use structopt::StructOpt;
@@ -192,7 +192,7 @@ impl FromStr for Bound {
 }
 
 impl Bound {
-    fn sha(&self) -> Result<String, Error> {
+    fn sha(&self) -> anyhow::Result<String> {
         match self {
             Bound::Commit(commit) => Ok(commit.clone()),
             Bound::Date(date) => {
@@ -216,7 +216,7 @@ impl Bound {
         }
     }
 
-    fn as_commit(&self) -> Result<Self, Error> {
+    fn as_commit(&self) -> anyhow::Result<Self> {
         self.sha().map(Bound::Commit)
     }
 }
@@ -365,7 +365,7 @@ struct Config {
 }
 
 impl Config {
-    fn from_args(mut args: Opts) -> Result<Config, Error> {
+    fn from_args(mut args: Opts) -> anyhow::Result<Config> {
         if args.host == "unknown" {
             if let Some(host) = option_env!("HOST") {
                 args.host = host.to_string();
@@ -448,7 +448,7 @@ impl Config {
     }
 }
 
-fn check_bounds(start: &Option<Bound>, end: &Option<Bound>) -> Result<(), Error> {
+fn check_bounds(start: &Option<Bound>, end: &Option<Bound>) -> anyhow::Result<()> {
     // current UTC date
     let current = Utc::today();
     match start.as_ref().zip(end.as_ref()) {
@@ -481,7 +481,7 @@ fn check_bounds(start: &Option<Bound>, end: &Option<Bound>) -> Result<(), Error>
 }
 
 // Application entry point
-fn run() -> Result<(), Error> {
+fn run() -> anyhow::Result<()> {
     env_logger::try_init()?;
     let args = env::args_os().filter(|a| a != "bisect-rustc");
     let args = Opts::from_iter(args);
@@ -497,7 +497,7 @@ fn run() -> Result<(), Error> {
     }
 }
 
-fn install(cfg: &Config, client: &Client, bound: &Bound) -> Result<(), Error> {
+fn install(cfg: &Config, client: &Client, bound: &Bound) -> anyhow::Result<()> {
     match *bound {
         Bound::Commit(ref sha) => {
             let sha = cfg.repo_access.commit(sha)?.sha;
@@ -531,7 +531,7 @@ fn install(cfg: &Config, client: &Client, bound: &Bound) -> Result<(), Error> {
 }
 
 // bisection entry point
-fn bisect(cfg: &Config, client: &Client) -> Result<(), Error> {
+fn bisect(cfg: &Config, client: &Client) -> anyhow::Result<()> {
     if cfg.is_commit {
         let bisection_result = bisect_ci(cfg, client)?;
         print_results(cfg, client, &bisection_result);
@@ -833,7 +833,7 @@ fn date_is_future(test_date: Date<Utc>) -> bool {
 }
 
 // nightlies branch of bisect execution
-fn bisect_nightlies(cfg: &Config, client: &Client) -> Result<BisectionResult, Error> {
+fn bisect_nightlies(cfg: &Config, client: &Client) -> anyhow::Result<BisectionResult> {
     if cfg.args.alt {
         bail!("cannot bisect nightlies with --alt: not supported");
     }
@@ -986,7 +986,7 @@ fn toolchains_between(cfg: &Config, a: ToolchainSpec, b: ToolchainSpec) -> Vec<T
 }
 
 // CI branch of bisect execution
-fn bisect_ci(cfg: &Config, client: &Client) -> Result<BisectionResult, Error> {
+fn bisect_ci(cfg: &Config, client: &Client) -> anyhow::Result<BisectionResult> {
     eprintln!("bisecting ci builds");
     let start = if let Some(Bound::Commit(ref sha)) = cfg.args.start {
         sha
@@ -1011,7 +1011,7 @@ fn bisect_ci_via(
     access: &dyn RustRepositoryAccessor,
     start_sha: &str,
     end_ref: &str,
-) -> Result<BisectionResult, Error> {
+) -> anyhow::Result<BisectionResult> {
     let end_sha = access.commit(end_ref)?.sha;
     let commits = access.commits(start_sha, &end_sha)?;
 
@@ -1046,7 +1046,7 @@ fn bisect_ci_in_commits(
     start: &str,
     end: &str,
     mut commits: Vec<Commit>,
-) -> Result<BisectionResult, Error> {
+) -> anyhow::Result<BisectionResult> {
     let dl_spec = DownloadParams::for_ci(cfg);
     commits.retain(|c| Utc::today() - c.date < Duration::days(167));
 

From 8325c9df9e90295ccaa6e627ed80ea454bd87e52 Mon Sep 17 00:00:00 2001
From: kraktus <kraktus@users.noreply.github.com>
Date: Wed, 4 May 2022 21:43:44 +0200
Subject: [PATCH 08/22] clippy

---
 src/github.rs | 2 +-
 src/main.rs   | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/github.rs b/src/github.rs
index ca31345..5c7cade 100644
--- a/src/github.rs
+++ b/src/github.rs
@@ -30,7 +30,7 @@ struct GithubAuthor {
 impl GithubCommitElem {
     fn date(&self) -> anyhow::Result<GitDate> {
         let (date_str, _) =
-            self.commit.committer.date.split_once("T").context(
+            self.commit.committer.date.split_once('T').context(
                 "commit date should folllow the ISO 8061 format, eg: 2022-05-04T09:55:51Z",
             )?;
         Ok(parse_to_utc_date(date_str)?)
diff --git a/src/main.rs b/src/main.rs
index c3ea07d..3384a93 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -904,10 +904,8 @@ fn bisect_nightlies(cfg: &Config, client: &Client) -> anyhow::Result<BisectionRe
                         "the start of the range ({}) must not reproduce the regression",
                         t
                     );
-                } else {
-                    last_failure = nightly_date;
                 }
-
+                last_failure = nightly_date;
                 nightly_date = nightly_iter.next().unwrap();
             }
             Err(InstallError::NotFound { .. }) => {

From efcd477c079ec502ac9ffaedc93ddf62d029b079 Mon Sep 17 00:00:00 2001
From: kraktus <kraktus@users.noreply.github.com>
Date: Thu, 5 May 2022 15:39:47 +0200
Subject: [PATCH 09/22] Use `clap` instead of `Structopt`

`Structopt` is now in maintenance-only mode and advise to use `clap` instead
---
 Cargo.lock  | 105 +++++++++++++++++++++-------------------------------
 Cargo.toml  |   2 +-
 src/main.rs |  53 +++++++++++++-------------
 3 files changed, 69 insertions(+), 91 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f3e31aa..a07e4e8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -17,15 +17,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "ansi_term"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
-dependencies = [
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "anyhow"
 version = "1.0.57"
@@ -85,6 +76,7 @@ version = "0.6.3"
 dependencies = [
  "anyhow",
  "chrono",
+ "clap",
  "colored",
  "dialoguer",
  "env_logger",
@@ -98,7 +90,6 @@ dependencies = [
  "rustc_version",
  "serde",
  "serde_json",
- "structopt",
  "tar",
  "tee",
  "tempdir",
@@ -143,17 +134,41 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "2.34.0"
+version = "3.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
+checksum = "85a35a599b11c089a7f49105658d089b8f2cf0882993c17daf6de15285c2c35d"
 dependencies = [
- "ansi_term",
  "atty",
  "bitflags",
+ "clap_derive",
+ "clap_lex",
+ "indexmap",
+ "lazy_static",
  "strsim",
+ "termcolor",
  "textwrap",
- "unicode-width",
- "vec_map",
+]
+
+[[package]]
+name = "clap_derive"
+version = "3.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3aab4734e083b809aaf5794e14e756d1c798d2c69c7f7de7a09a2f5214993c1"
+dependencies = [
+ "heck",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a37c35f1112dad5e6e0b1adaff798507497a18fceeb30cceb3bae7d1427b9213"
+dependencies = [
+ "os_str_bytes",
 ]
 
 [[package]]
@@ -535,12 +550,9 @@ checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
 
 [[package]]
 name = "heck"
-version = "0.3.3"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
-dependencies = [
- "unicode-segmentation",
-]
+checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
 
 [[package]]
 name = "hermit-abi"
@@ -1023,6 +1035,12 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "os_str_bytes"
+version = "6.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64"
+
 [[package]]
 name = "pbr"
 version = "1.0.4"
@@ -1502,33 +1520,9 @@ dependencies = [
 
 [[package]]
 name = "strsim"
-version = "0.8.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
-
-[[package]]
-name = "structopt"
-version = "0.3.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10"
-dependencies = [
- "clap",
- "lazy_static",
- "structopt-derive",
-]
-
-[[package]]
-name = "structopt-derive"
-version = "0.4.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0"
-dependencies = [
- "heck",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn",
-]
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
 [[package]]
 name = "syn"
@@ -1612,12 +1606,9 @@ dependencies = [
 
 [[package]]
 name = "textwrap"
-version = "0.11.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-dependencies = [
- "unicode-width",
-]
+checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"
 
 [[package]]
 name = "thiserror"
@@ -1802,12 +1793,6 @@ dependencies = [
  "tinyvec",
 ]
 
-[[package]]
-name = "unicode-segmentation"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99"
-
 [[package]]
 name = "unicode-width"
 version = "0.1.9"
@@ -1838,12 +1823,6 @@ version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
-[[package]]
-name = "vec_map"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
-
 [[package]]
 name = "version_check"
 version = "0.9.4"
diff --git a/Cargo.toml b/Cargo.toml
index 6edf6b7..206bd66 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,7 +25,7 @@ reqwest = { version = "0.10.4", features = ["blocking", "json"] }
 rustc_version = "0.2.3"
 serde = { version = "1.0.110", features = ["derive"] }
 serde_json = "1.0"
-structopt = "0.3.14"
+clap = { version = "3.1", features = ["derive"] }
 tar = "0.4"
 tee = "0.1"
 tempdir = "0.3.7"
diff --git a/src/main.rs b/src/main.rs
index 3384a93..1fa3df6 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -18,7 +18,7 @@ use colored::Colorize;
 use anyhow::{bail, Context};
 use log::debug;
 use reqwest::blocking::Client;
-use structopt::StructOpt;
+use clap::StructOpt;
 
 mod git;
 mod github;
@@ -57,7 +57,7 @@ const REPORT_HEADER: &str = "\
 ==================================================================================";
 
 #[derive(Debug, StructOpt)]
-#[structopt(after_help = "EXAMPLES:
+#[clap(after_help = "EXAMPLES:
     Run a fully automatic nightly bisect doing `cargo check`:
     ```
     cargo bisect-rustc --start 2018-07-07 --end 2018-07-30 --test-dir ../my_project/ -- check
@@ -70,7 +70,7 @@ const REPORT_HEADER: &str = "\
     ```")]
 #[allow(clippy::struct_excessive_bools)]
 struct Opts {
-    #[structopt(
+    #[clap(
         long,
         default_value = "error",
         help = "Custom regression definition",
@@ -79,31 +79,31 @@ struct Opts {
     )]
     regress: String,
 
-    #[structopt(short, long, help = "Download the alt build instead of normal build")]
+    #[clap(short, long, help = "Download the alt build instead of normal build")]
     alt: bool,
 
-    #[structopt(long, help = "Host triple for the compiler", default_value = "unknown")]
+    #[clap(long, help = "Host triple for the compiler", default_value = "unknown")]
     host: String,
 
-    #[structopt(long, help = "Cross-compilation target platform")]
+    #[clap(long, help = "Cross-compilation target platform")]
     target: Option<String>,
 
-    #[structopt(long, help = "Preserve the downloaded artifacts")]
+    #[clap(long, help = "Preserve the downloaded artifacts")]
     preserve: bool,
 
-    #[structopt(long, help = "Preserve the target directory used for builds")]
+    #[clap(long, help = "Preserve the target directory used for builds")]
     preserve_target: bool,
 
-    #[structopt(long, help = "Download rust-src [default: no download]")]
+    #[clap(long, help = "Download rust-src [default: no download]")]
     with_src: bool,
 
-    #[structopt(long, help = "Download rustc-dev [default: no download]")]
+    #[clap(long, help = "Download rustc-dev [default: no download]")]
     with_dev: bool,
 
-    #[structopt(short, long = "component", help = "additional components to install")]
+    #[clap(short, long = "component", help = "additional components to install")]
     components: Vec<String>,
 
-    #[structopt(
+    #[clap(
         long,
         help = "Root directory for tests",
         default_value = ".",
@@ -111,61 +111,61 @@ struct Opts {
     )]
     test_dir: PathBuf,
 
-    #[structopt(long, help = "Manually evaluate for regression with prompts")]
+    #[clap(long, help = "Manually evaluate for regression with prompts")]
     prompt: bool,
 
-    #[structopt(
+    #[clap(
         long,
         short,
         help = "Assume failure after specified number of seconds (for bisecting hangs)"
     )]
     timeout: Option<usize>,
 
-    #[structopt(long = "verbose", parse(from_occurrences))]
+    #[clap(long = "verbose", parse(from_occurrences))]
     verbosity: usize,
 
-    #[structopt(
+    #[clap(
         help = "Arguments to pass to cargo or the file specified by --script during tests",
-        multiple = true,
+        multiple_values = true,
         last = true,
         parse(from_os_str)
     )]
     command_args: Vec<OsString>,
 
-    #[structopt(
+    #[clap(
         long,
         help = "Left bound for search (*without* regression). You can use \
 a date (YYYY-MM-DD), git tag name (e.g. 1.58.0) or git commit SHA."
     )]
     start: Option<Bound>,
 
-    #[structopt(
+    #[clap(
         long,
         help = "Right bound for search (*with* regression). You can use \
 a date (YYYY-MM-DD), git tag name (e.g. 1.58.0) or git commit SHA."
     )]
     end: Option<Bound>,
 
-    #[structopt(long, help = "Bisect via commit artifacts")]
+    #[clap(long, help = "Bisect via commit artifacts")]
     by_commit: bool,
 
-    #[structopt(long, help = "How to access Rust git repository [github|checkout]")]
+    #[clap(long, help = "How to access Rust git repository [github|checkout]")]
     access: Option<String>,
 
-    #[structopt(long, help = "Install the given artifact")]
+    #[clap(long, help = "Install the given artifact")]
     install: Option<Bound>,
 
-    #[structopt(long, help = "Force installation over existing artifacts")]
+    #[clap(long, help = "Force installation over existing artifacts")]
     force_install: bool,
 
-    #[structopt(
+    #[clap(
         long,
         help = "Script replacement for `cargo build` command",
         parse(from_os_str)
     )]
     script: Option<PathBuf>,
 
-    #[structopt(long, help = "Do not install cargo [default: install cargo]")]
+    #[clap(long, help = "Do not install cargo [default: install cargo]")]
     without_cargo: bool,
 }
 
@@ -483,8 +483,7 @@ fn check_bounds(start: &Option<Bound>, end: &Option<Bound>) -> anyhow::Result<()
 // Application entry point
 fn run() -> anyhow::Result<()> {
     env_logger::try_init()?;
-    let args = env::args_os().filter(|a| a != "bisect-rustc");
-    let args = Opts::from_iter(args);
+    let args = Opts::parse();
     check_bounds(&args.start, &args.end)?;
     let cfg = Config::from_args(args)?;
 

From d3a7bff8a4ab022de6de47e40efaa0384c946bdc Mon Sep 17 00:00:00 2001
From: kraktus <kraktus@users.noreply.github.com>
Date: Thu, 5 May 2022 16:18:37 +0200
Subject: [PATCH 10/22] update tests

---
 src/main.rs           |   8 ++-
 tests/cmd/h.stdout    |  61 ++++++++++++-----------
 tests/cmd/help.stdout | 113 ++++++++++++++++++++++--------------------
 3 files changed, 96 insertions(+), 86 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 1fa3df6..c712b3c 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -57,7 +57,10 @@ const REPORT_HEADER: &str = "\
 ==================================================================================";
 
 #[derive(Debug, StructOpt)]
-#[clap(after_help = "EXAMPLES:
+#[clap(
+    version,
+    about,
+    after_help = "EXAMPLES:
     Run a fully automatic nightly bisect doing `cargo check`:
     ```
     cargo bisect-rustc --start 2018-07-07 --end 2018-07-30 --test-dir ../my_project/ -- check
@@ -67,7 +70,8 @@ const REPORT_HEADER: &str = "\
     ```
     cargo bisect-rustc --start 6a1c0637ce44aeea6c60527f4c0e7fb33f2bcd0d \\
       --end 866a713258915e6cbb212d135f751a6a8c9e1c0a --test-dir ../my_project/ --prompt -- build
-    ```")]
+    ```"
+)]
 #[allow(clippy::struct_excessive_bools)]
 struct Opts {
     #[clap(
diff --git a/tests/cmd/h.stdout b/tests/cmd/h.stdout
index a9fb4a6..97c5291 100644
--- a/tests/cmd/h.stdout
+++ b/tests/cmd/h.stdout
@@ -1,39 +1,40 @@
 cargo-bisect-rustc 0.6.3
+Bisects rustc toolchains with rustup
 
 USAGE:
-    cargo-bisect-rustc [FLAGS] [OPTIONS] [-- <command-args>...]
+    cargo-bisect-rustc [OPTIONS] [-- <COMMAND_ARGS>...]
 
-FLAGS:
-    -a, --alt                Download the alt build instead of normal build
-        --by-commit          Bisect via commit artifacts
-        --force-install      Force installation over existing artifacts
-    -h, --help               Prints help information
-        --preserve           Preserve the downloaded artifacts
-        --preserve-target    Preserve the target directory used for builds
-        --prompt             Manually evaluate for regression with prompts
-    -V, --version            Prints version information
-        --verbose            
-        --with-dev           Download rustc-dev [default: no download]
-        --with-src           Download rust-src [default: no download]
-        --without-cargo      Do not install cargo [default: install cargo]
+ARGS:
+    <COMMAND_ARGS>...    Arguments to pass to cargo or the file specified by --script during
+                         tests
 
 OPTIONS:
-        --access <access>              How to access Rust git repository [github|checkout]
-    -c, --component <components>...    additional components to install
-        --end <end>                    Right bound for search (*with* regression). You can use a date (YYYY-MM-DD), git
-                                       tag name (e.g. 1.58.0) or git commit SHA.
-        --host <host>                  Host triple for the compiler [default: unknown]
-        --install <install>            Install the given artifact
-        --regress <regress>            Custom regression definition [default: error]
-        --script <script>              Script replacement for `cargo build` command
-        --start <start>                Left bound for search (*without* regression). You can use a date (YYYY-MM-DD),
-                                       git tag name (e.g. 1.58.0) or git commit SHA.
-        --target <target>              Cross-compilation target platform
-        --test-dir <test-dir>          Root directory for tests [default: .]
-    -t, --timeout <timeout>            Assume failure after specified number of seconds (for bisecting hangs)
-
-ARGS:
-    <command-args>...    Arguments to pass to cargo or the file specified by --script during tests
+    -a, --alt                       Download the alt build instead of normal build
+        --access <ACCESS>           How to access Rust git repository [github|checkout]
+        --by-commit                 Bisect via commit artifacts
+    -c, --component <COMPONENTS>    additional components to install
+        --end <END>                 Right bound for search (*with* regression). You can use a date
+                                    (YYYY-MM-DD), git tag name (e.g. 1.58.0) or git commit SHA.
+        --force-install             Force installation over existing artifacts
+    -h, --help                      Print help information
+        --host <HOST>               Host triple for the compiler [default: unknown]
+        --install <INSTALL>         Install the given artifact
+        --preserve                  Preserve the downloaded artifacts
+        --preserve-target           Preserve the target directory used for builds
+        --prompt                    Manually evaluate for regression with prompts
+        --regress <REGRESS>         Custom regression definition [default: error]
+        --script <SCRIPT>           Script replacement for `cargo build` command
+        --start <START>             Left bound for search (*without* regression). You can use a date
+                                    (YYYY-MM-DD), git tag name (e.g. 1.58.0) or git commit SHA.
+    -t, --timeout <TIMEOUT>         Assume failure after specified number of seconds (for bisecting
+                                    hangs)
+        --target <TARGET>           Cross-compilation target platform
+        --test-dir <TEST_DIR>       Root directory for tests [default: .]
+    -V, --version                   Print version information
+        --verbose                   
+        --with-dev                  Download rustc-dev [default: no download]
+        --with-src                  Download rust-src [default: no download]
+        --without-cargo             Do not install cargo [default: install cargo]
 
 EXAMPLES:
     Run a fully automatic nightly bisect doing `cargo check`:
diff --git a/tests/cmd/help.stdout b/tests/cmd/help.stdout
index e8db417..7927776 100644
--- a/tests/cmd/help.stdout
+++ b/tests/cmd/help.stdout
@@ -1,85 +1,90 @@
 cargo-bisect-rustc 0.6.3
+Bisects rustc toolchains with rustup
 
 USAGE:
-    cargo-bisect-rustc [FLAGS] [OPTIONS] [-- <command-args>...]
+    cargo-bisect-rustc [OPTIONS] [-- <COMMAND_ARGS>...]
 
-FLAGS:
-    -a, --alt                
-            Download the alt build instead of normal build
+ARGS:
+    <COMMAND_ARGS>...
+            Arguments to pass to cargo or the file specified by --script during tests
 
-        --by-commit          
-            Bisect via commit artifacts
+OPTIONS:
+    -a, --alt
+            Download the alt build instead of normal build
 
-        --force-install      
-            Force installation over existing artifacts
+        --access <ACCESS>
+            How to access Rust git repository [github|checkout]
 
-    -h, --help               
-            Prints help information
+        --by-commit
+            Bisect via commit artifacts
 
-        --preserve           
-            Preserve the downloaded artifacts
+    -c, --component <COMPONENTS>
+            additional components to install
 
-        --preserve-target    
-            Preserve the target directory used for builds
+        --end <END>
+            Right bound for search (*with* regression). You can use a date (YYYY-MM-DD), git tag
+            name (e.g. 1.58.0) or git commit SHA.
 
-        --prompt             
-            Manually evaluate for regression with prompts
+        --force-install
+            Force installation over existing artifacts
 
-    -V, --version            
-            Prints version information
+    -h, --help
+            Print help information
 
-        --verbose            
+        --host <HOST>
+            Host triple for the compiler
             
+            [default: unknown]
 
-        --with-dev           
-            Download rustc-dev [default: no download]
-
-        --with-src           
-            Download rust-src [default: no download]
-
-        --without-cargo      
-            Do not install cargo [default: install cargo]
+        --install <INSTALL>
+            Install the given artifact
 
+        --preserve
+            Preserve the downloaded artifacts
 
-OPTIONS:
-        --access <access>              
-            How to access Rust git repository [github|checkout]
+        --preserve-target
+            Preserve the target directory used for builds
 
-    -c, --component <components>...    
-            additional components to install
+        --prompt
+            Manually evaluate for regression with prompts
 
-        --end <end>                    
-            Right bound for search (*with* regression). You can use a date (YYYY-MM-DD), git tag name (e.g. 1.58.0) or
-            git commit SHA.
-        --host <host>                  
-            Host triple for the compiler [default: unknown]
+        --regress <REGRESS>
+            Custom regression definition [error|non-error|ice|non-ice|success]
+            
+            [default: error]
 
-        --install <install>            
-            Install the given artifact
+        --script <SCRIPT>
+            Script replacement for `cargo build` command
 
-        --regress <regress>            
-            Custom regression definition [error|non-error|ice|non-ice|success] [default: error]
+        --start <START>
+            Left bound for search (*without* regression). You can use a date (YYYY-MM-DD), git tag
+            name (e.g. 1.58.0) or git commit SHA.
 
-        --script <script>              
-            Script replacement for `cargo build` command
+    -t, --timeout <TIMEOUT>
+            Assume failure after specified number of seconds (for bisecting hangs)
 
-        --start <start>                
-            Left bound for search (*without* regression). You can use a date (YYYY-MM-DD), git tag name (e.g. 1.58.0) or
-            git commit SHA.
-        --target <target>              
+        --target <TARGET>
             Cross-compilation target platform
 
-        --test-dir <test-dir>          
-            Root directory for tests [default: .]
+        --test-dir <TEST_DIR>
+            Root directory for tests
+            
+            [default: .]
 
-    -t, --timeout <timeout>            
-            Assume failure after specified number of seconds (for bisecting hangs)
+    -V, --version
+            Print version information
 
+        --verbose
+            
 
-ARGS:
-    <command-args>...    
-            Arguments to pass to cargo or the file specified by --script during tests
+        --with-dev
+            Download rustc-dev [default: no download]
 
+        --with-src
+            Download rust-src [default: no download]
+
+        --without-cargo
+            Do not install cargo [default: install cargo]
 
 EXAMPLES:
     Run a fully automatic nightly bisect doing `cargo check`:

From b0ac34c57e5762b03bf5d181c28ef6d783a5c908 Mon Sep 17 00:00:00 2001
From: kraktus <kraktus@users.noreply.github.com>
Date: Thu, 5 May 2022 16:37:26 +0200
Subject: [PATCH 11/22] Use proper `clap` functions name instead of `structopt`
 aliases

---
 src/main.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index c712b3c..7c49a97 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -14,11 +14,11 @@ use std::process;
 use std::str::FromStr;
 
 use chrono::{Date, Duration, NaiveDate, Utc};
+use clap::Parser;
 use colored::Colorize;
 use anyhow::{bail, Context};
 use log::debug;
 use reqwest::blocking::Client;
-use clap::StructOpt;
 
 mod git;
 mod github;
@@ -56,7 +56,7 @@ const REPORT_HEADER: &str = "\
 = Copy and paste the text below into the issue report thread.  Thanks!           =
 ==================================================================================";
 
-#[derive(Debug, StructOpt)]
+#[derive(Debug, Parser)]
 #[clap(
     version,
     about,
@@ -295,7 +295,7 @@ impl Config {
     }
 }
 
-#[derive(Copy, Clone, PartialEq, Eq, Debug, StructOpt)]
+#[derive(Copy, Clone, PartialEq, Eq, Debug)]
 /// Customize what is treated as regression.
 enum RegressOn {
     /// `ErrorStatus`: Marks test outcome as `Regressed` if and only if

From a446e973b8fa78f6bf0167cc882fb74058d61e1e Mon Sep 17 00:00:00 2001
From: kraktus <kraktus@users.noreply.github.com>
Date: Fri, 6 May 2022 18:41:54 +0200
Subject: [PATCH 12/22] simplify `FromStr` for `Bound`

---
 src/main.rs | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 7c49a97..8c004ad 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -181,17 +181,12 @@ enum Bound {
     Date(GitDate),
 }
 
-#[derive(thiserror::Error, Debug)]
-#[error("will never happen")]
-struct BoundParseError {}
-
 impl FromStr for Bound {
-    type Err = BoundParseError;
-    fn from_str(s: &str) -> Result<Bound, BoundParseError> {
-        match NaiveDate::parse_from_str(s, YYYY_MM_DD) {
-            Ok(date) => Ok(Bound::Date(Date::from_utc(date, Utc))),
-            Err(_) => Ok(Bound::Commit(s.to_string())),
-        }
+    type Err = std::convert::Infallible;
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        parse_to_utc_date(s)
+            .map(Self::Date)
+            .or_else(|_| Ok(Self::Commit(s.to_string())))
     }
 }
 

From 58b13ff438195933c37dce3bd15fa3adfdfd6b9e Mon Sep 17 00:00:00 2001
From: kraktus <kraktus@users.noreply.github.com>
Date: Sat, 7 May 2022 21:44:43 +0200
Subject: [PATCH 13/22] Parse type the expected error directly with `clap`

---
 src/main.rs           |  43 ++++++++++-------
 src/toolchains.rs     |   2 +-
 tests/cmd/h.stdout    |   3 +-
 tests/cmd/help.stdout | 107 ++++++++++++------------------------------
 4 files changed, 58 insertions(+), 97 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 8c004ad..2b6c2ce 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -14,7 +14,7 @@ use std::process;
 use std::str::FromStr;
 
 use chrono::{Date, Duration, NaiveDate, Utc};
-use clap::Parser;
+use clap::{ArgEnum, Parser, PossibleValue};
 use colored::Colorize;
 use anyhow::{bail, Context};
 use log::debug;
@@ -76,12 +76,11 @@ const REPORT_HEADER: &str = "\
 struct Opts {
     #[clap(
         long,
-        default_value = "error",
         help = "Custom regression definition",
-        long_help = "Custom regression definition \
-                     [error|non-error|ice|non-ice|success]"
+        arg_enum,
+        default_value_t = RegressOn::ErrorStatus,
     )]
-    regress: String,
+    regress: RegressOn,
 
     #[clap(short, long, help = "Download the alt build instead of normal build")]
     alt: bool,
@@ -249,7 +248,7 @@ impl Config {
         let saw_ice = stderr_utf8.contains("error: internal compiler error")
             || stderr_utf8.contains("thread 'rustc' has overflowed its stack");
 
-        let input = (self.regress_on(), status.success());
+        let input = (self.args.regress, status.success());
         let result = match input {
             (RegressOn::ErrorStatus, true) | (RegressOn::SuccessStatus, false) => {
                 TestOutcome::Baseline
@@ -277,17 +276,6 @@ impl Config {
         );
         result
     }
-
-    fn regress_on(&self) -> RegressOn {
-        match self.args.regress.as_str() {
-            "error" => RegressOn::ErrorStatus,
-            "non-error" => RegressOn::NonCleanError,
-            "ice" => RegressOn::IceAlone,
-            "non-ice" => RegressOn::NotIce,
-            "success" => RegressOn::SuccessStatus,
-            setting => panic!("Unknown --regress setting: {:?}", setting),
-        }
-    }
 }
 
 #[derive(Copy, Clone, PartialEq, Eq, Debug)]
@@ -345,6 +333,27 @@ enum RegressOn {
     NonCleanError,
 }
 
+impl ArgEnum for RegressOn {
+    fn value_variants<'a>() -> &'a [Self] {
+        &[
+            Self::ErrorStatus,
+            Self::SuccessStatus,
+            Self::IceAlone,
+            Self::NotIce,
+            Self::NonCleanError,
+        ]
+    }
+    fn to_possible_value<'a>(&self) -> Option<PossibleValue<'a>> {
+        Some(PossibleValue::new(match self {
+            Self::ErrorStatus => "error",
+            Self::NonCleanError => "non-error",
+            Self::IceAlone => "ice",
+            Self::NotIce => "non-ice",
+            Self::SuccessStatus => "success",
+        }))
+    }
+}
+
 impl RegressOn {
     fn must_process_stderr(self) -> bool {
         match self {
diff --git a/src/toolchains.rs b/src/toolchains.rs
index c796336..c879a72 100644
--- a/src/toolchains.rs
+++ b/src/toolchains.rs
@@ -280,7 +280,7 @@ impl Toolchain {
         cmd.env("CARGO_TARGET_DIR", format!("target-{}", self.rustup_name()));
 
         // let `cmd` capture stderr for us to process afterward.
-        let must_capture_output = cfg.regress_on().must_process_stderr();
+        let must_capture_output = cfg.args.regress.must_process_stderr();
         let emit_output = cfg.args.emit_cargo_output() || cfg.args.prompt;
 
         let default_stdio = if must_capture_output {
diff --git a/tests/cmd/h.stdout b/tests/cmd/h.stdout
index 97c5291..959f985 100644
--- a/tests/cmd/h.stdout
+++ b/tests/cmd/h.stdout
@@ -22,7 +22,8 @@ OPTIONS:
         --preserve                  Preserve the downloaded artifacts
         --preserve-target           Preserve the target directory used for builds
         --prompt                    Manually evaluate for regression with prompts
-        --regress <REGRESS>         Custom regression definition [default: error]
+        --regress <REGRESS>         Custom regression definition [default: error] [possible values:
+                                    error, success, ice, non-ice, non-error]
         --script <SCRIPT>           Script replacement for `cargo build` command
         --start <START>             Left bound for search (*without* regression). You can use a date
                                     (YYYY-MM-DD), git tag name (e.g. 1.58.0) or git commit SHA.
diff --git a/tests/cmd/help.stdout b/tests/cmd/help.stdout
index 7927776..959f985 100644
--- a/tests/cmd/help.stdout
+++ b/tests/cmd/help.stdout
@@ -5,86 +5,37 @@ USAGE:
     cargo-bisect-rustc [OPTIONS] [-- <COMMAND_ARGS>...]
 
 ARGS:
-    <COMMAND_ARGS>...
-            Arguments to pass to cargo or the file specified by --script during tests
+    <COMMAND_ARGS>...    Arguments to pass to cargo or the file specified by --script during
+                         tests
 
 OPTIONS:
-    -a, --alt
-            Download the alt build instead of normal build
-
-        --access <ACCESS>
-            How to access Rust git repository [github|checkout]
-
-        --by-commit
-            Bisect via commit artifacts
-
-    -c, --component <COMPONENTS>
-            additional components to install
-
-        --end <END>
-            Right bound for search (*with* regression). You can use a date (YYYY-MM-DD), git tag
-            name (e.g. 1.58.0) or git commit SHA.
-
-        --force-install
-            Force installation over existing artifacts
-
-    -h, --help
-            Print help information
-
-        --host <HOST>
-            Host triple for the compiler
-            
-            [default: unknown]
-
-        --install <INSTALL>
-            Install the given artifact
-
-        --preserve
-            Preserve the downloaded artifacts
-
-        --preserve-target
-            Preserve the target directory used for builds
-
-        --prompt
-            Manually evaluate for regression with prompts
-
-        --regress <REGRESS>
-            Custom regression definition [error|non-error|ice|non-ice|success]
-            
-            [default: error]
-
-        --script <SCRIPT>
-            Script replacement for `cargo build` command
-
-        --start <START>
-            Left bound for search (*without* regression). You can use a date (YYYY-MM-DD), git tag
-            name (e.g. 1.58.0) or git commit SHA.
-
-    -t, --timeout <TIMEOUT>
-            Assume failure after specified number of seconds (for bisecting hangs)
-
-        --target <TARGET>
-            Cross-compilation target platform
-
-        --test-dir <TEST_DIR>
-            Root directory for tests
-            
-            [default: .]
-
-    -V, --version
-            Print version information
-
-        --verbose
-            
-
-        --with-dev
-            Download rustc-dev [default: no download]
-
-        --with-src
-            Download rust-src [default: no download]
-
-        --without-cargo
-            Do not install cargo [default: install cargo]
+    -a, --alt                       Download the alt build instead of normal build
+        --access <ACCESS>           How to access Rust git repository [github|checkout]
+        --by-commit                 Bisect via commit artifacts
+    -c, --component <COMPONENTS>    additional components to install
+        --end <END>                 Right bound for search (*with* regression). You can use a date
+                                    (YYYY-MM-DD), git tag name (e.g. 1.58.0) or git commit SHA.
+        --force-install             Force installation over existing artifacts
+    -h, --help                      Print help information
+        --host <HOST>               Host triple for the compiler [default: unknown]
+        --install <INSTALL>         Install the given artifact
+        --preserve                  Preserve the downloaded artifacts
+        --preserve-target           Preserve the target directory used for builds
+        --prompt                    Manually evaluate for regression with prompts
+        --regress <REGRESS>         Custom regression definition [default: error] [possible values:
+                                    error, success, ice, non-ice, non-error]
+        --script <SCRIPT>           Script replacement for `cargo build` command
+        --start <START>             Left bound for search (*without* regression). You can use a date
+                                    (YYYY-MM-DD), git tag name (e.g. 1.58.0) or git commit SHA.
+    -t, --timeout <TIMEOUT>         Assume failure after specified number of seconds (for bisecting
+                                    hangs)
+        --target <TARGET>           Cross-compilation target platform
+        --test-dir <TEST_DIR>       Root directory for tests [default: .]
+    -V, --version                   Print version information
+        --verbose                   
+        --with-dev                  Download rustc-dev [default: no download]
+        --with-src                  Download rust-src [default: no download]
+        --without-cargo             Do not install cargo [default: install cargo]
 
 EXAMPLES:
     Run a fully automatic nightly bisect doing `cargo check`:

From 71e64bcd29dca30f29120cb04c315da8c9930b2b Mon Sep 17 00:00:00 2001
From: kraktus <kraktus@users.noreply.github.com>
Date: Sun, 8 May 2022 12:47:15 +0200
Subject: [PATCH 14/22] validate `access` with `clap`

---
 src/main.rs           | 36 +++++++++++++++++++++---------------
 tests/cmd/h.stdout    |  3 ++-
 tests/cmd/help.stdout |  3 ++-
 3 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 2b6c2ce..1fe9fef 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -152,8 +152,8 @@ a date (YYYY-MM-DD), git tag name (e.g. 1.58.0) or git commit SHA."
     #[clap(long, help = "Bisect via commit artifacts")]
     by_commit: bool,
 
-    #[clap(long, help = "How to access Rust git repository [github|checkout]")]
-    access: Option<String>,
+    #[clap(long, arg_enum, help = "How to access Rust git repository", default_value_t = Access::Checkout)]
+    access: Access,
 
     #[clap(long, help = "Install the given artifact")]
     install: Option<Bound>,
@@ -278,6 +278,21 @@ impl Config {
     }
 }
 
+#[derive(ArgEnum, Clone, Debug)]
+enum Access {
+    Checkout,
+    Github,
+}
+
+impl Access {
+    fn repo(&self) -> Box<dyn RustRepositoryAccessor> {
+        match self {
+            Self::Checkout => Box::new(AccessViaLocalGit),
+            Self::Github => Box::new(AccessViaGithub),
+        }
+    }
+}
+
 #[derive(Copy, Clone, PartialEq, Eq, Debug)]
 /// Customize what is treated as regression.
 enum RegressOn {
@@ -369,7 +384,6 @@ struct Config {
     toolchains_path: PathBuf,
     target: String,
     is_commit: bool,
-    repo_access: Box<dyn RustRepositoryAccessor>,
 }
 
 impl Config {
@@ -439,19 +453,12 @@ impl Config {
             }
         }
 
-        let repo_access: Box<dyn RustRepositoryAccessor> = match args.access.as_deref() {
-            None | Some("checkout") => Box::new(AccessViaLocalGit),
-            Some("github") => Box::new(AccessViaGithub),
-            Some(other) => bail!("unknown access argument: {}", other),
-        };
-
         Ok(Config {
             is_commit: args.by_commit || is_commit == Some(true),
             args,
             target,
             toolchains_path,
             rustup_tmp_path,
-            repo_access,
         })
     }
 }
@@ -507,7 +514,7 @@ fn run() -> anyhow::Result<()> {
 fn install(cfg: &Config, client: &Client, bound: &Bound) -> anyhow::Result<()> {
     match *bound {
         Bound::Commit(ref sha) => {
-            let sha = cfg.repo_access.commit(sha)?.sha;
+            let sha = cfg.args.access.repo().commit(sha)?.sha;
             let mut t = Toolchain {
                 spec: ToolchainSpec::Ci {
                     commit: sha,
@@ -558,8 +565,7 @@ fn bisect(cfg: &Config, client: &Client) -> anyhow::Result<()> {
                 date.format(YYYY_MM_DD),
             );
 
-            let ci_bisection_result =
-                bisect_ci_via(cfg, client, &*cfg.repo_access, &working_commit, &bad_commit)?;
+            let ci_bisection_result = bisect_ci_via(cfg, client, &working_commit, &bad_commit)?;
 
             print_results(cfg, client, &ci_bisection_result);
             print_final_report(cfg, &nightly_bisection_result, &ci_bisection_result);
@@ -1007,16 +1013,16 @@ fn bisect_ci(cfg: &Config, client: &Client) -> anyhow::Result<BisectionResult> {
 
     eprintln!("starting at {}, ending at {}", start, end);
 
-    bisect_ci_via(cfg, client, &*cfg.repo_access, start, end)
+    bisect_ci_via(cfg, client, start, end)
 }
 
 fn bisect_ci_via(
     cfg: &Config,
     client: &Client,
-    access: &dyn RustRepositoryAccessor,
     start_sha: &str,
     end_ref: &str,
 ) -> anyhow::Result<BisectionResult> {
+    let access = cfg.args.access.repo();
     let end_sha = access.commit(end_ref)?.sha;
     let commits = access.commits(start_sha, &end_sha)?;
 
diff --git a/tests/cmd/h.stdout b/tests/cmd/h.stdout
index 959f985..cb84887 100644
--- a/tests/cmd/h.stdout
+++ b/tests/cmd/h.stdout
@@ -10,7 +10,8 @@ ARGS:
 
 OPTIONS:
     -a, --alt                       Download the alt build instead of normal build
-        --access <ACCESS>           How to access Rust git repository [github|checkout]
+        --access <ACCESS>           How to access Rust git repository [default: checkout] [possible
+                                    values: checkout, github]
         --by-commit                 Bisect via commit artifacts
     -c, --component <COMPONENTS>    additional components to install
         --end <END>                 Right bound for search (*with* regression). You can use a date
diff --git a/tests/cmd/help.stdout b/tests/cmd/help.stdout
index 959f985..cb84887 100644
--- a/tests/cmd/help.stdout
+++ b/tests/cmd/help.stdout
@@ -10,7 +10,8 @@ ARGS:
 
 OPTIONS:
     -a, --alt                       Download the alt build instead of normal build
-        --access <ACCESS>           How to access Rust git repository [github|checkout]
+        --access <ACCESS>           How to access Rust git repository [default: checkout] [possible
+                                    values: checkout, github]
         --by-commit                 Bisect via commit artifacts
     -c, --component <COMPONENTS>    additional components to install
         --end <END>                 Right bound for search (*with* regression). You can use a date

From 2c0297066c06ef2bdb68ba808bc75d00f65c1ce9 Mon Sep 17 00:00:00 2001
From: kraktus <kraktus@users.noreply.github.com>
Date: Sun, 8 May 2022 13:17:23 +0200
Subject: [PATCH 15/22] use string interpolation when possible

---
 src/git.rs        |  3 +--
 src/github.rs     | 24 ++++++++----------------
 src/main.rs       | 12 +++++-------
 src/toolchains.rs | 17 ++++++++---------
 4 files changed, 22 insertions(+), 34 deletions(-)

diff --git a/src/git.rs b/src/git.rs
index bcb7878..2cd8bf6 100644
--- a/src/git.rs
+++ b/src/git.rs
@@ -113,8 +113,7 @@ fn find_origin_remote(repo: &Repository) -> anyhow::Result<String> {
         .with_context(|| {
             format!(
                 "rust-lang/rust remote not found. \
-Try adding a remote pointing to `{}` in the rust repository at `{}`.",
-                RUST_SRC_URL,
+Try adding a remote pointing to `{RUST_SRC_URL}` in the rust repository at `{}`.",
                 repo.path().display()
             )
         })
diff --git a/src/github.rs b/src/github.rs
index 5c7cade..8d9b728 100644
--- a/src/github.rs
+++ b/src/github.rs
@@ -53,7 +53,7 @@ fn headers() -> Result<HeaderMap, InvalidHeaderValue> {
     headers.insert(USER_AGENT, user_agent);
     if let Ok(token) = std::env::var("GITHUB_TOKEN") {
         eprintln!("adding local env GITHUB_TOKEN value to headers in github query");
-        let value = HeaderValue::from_str(&format!("token {}", token))?;
+        let value = HeaderValue::from_str(&format!("token {token}"))?;
         headers.insert(AUTHORIZATION, value);
     }
     Ok(headers)
@@ -153,15 +153,12 @@ impl ToUrl for CommitsUrl<'_> {
     fn url(&self) -> String {
         format!(
             "https://api.github.com/repos/{OWNER}/{REPO}/commits\
-                 ?page={PAGE}&per_page={PER_PAGE}\
-                 &author={AUTHOR}&since={SINCE}&sha={SHA}",
-            OWNER = OWNER,
-            REPO = REPO,
-            PAGE = self.page,
-            PER_PAGE = PER_PAGE,
-            AUTHOR = self.author,
-            SINCE = self.since,
-            SHA = self.sha
+                 ?page={page}&per_page={PER_PAGE}\
+                 &author={author}&since={since}&sha={sha}",
+            page = self.page,
+            author = self.author,
+            since = self.since,
+            sha = self.sha
         )
     }
 }
@@ -177,12 +174,7 @@ impl ToUrl for CommitDetailsUrl<'_> {
             self.sha
         };
 
-        format!(
-            "https://api.github.com/repos/{OWNER}/{REPO}/compare/master...{REF}",
-            OWNER = OWNER,
-            REPO = REPO,
-            REF = reference
-        )
+        format!("https://api.github.com/repos/{OWNER}/{REPO}/compare/master...{reference}")
     }
 }
 
diff --git a/src/main.rs b/src/main.rs
index 1fe9fef..d5fad02 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -195,19 +195,17 @@ impl Bound {
             Bound::Commit(commit) => Ok(commit.clone()),
             Bound::Date(date) => {
                 let date_str = date.format(YYYY_MM_DD);
-                let url = format!(
-                    "{}/{}/channel-rust-nightly-git-commit-hash.txt",
-                    NIGHTLY_SERVER, date_str
-                );
+                let url =
+                    format!("{NIGHTLY_SERVER}/{date_str}/channel-rust-nightly-git-commit-hash.txt");
 
-                eprintln!("fetching {}", url);
+                eprintln!("fetching {url}");
                 let client = Client::new();
-                let name = format!("nightly manifest {}", date_str);
+                let name = format!("nightly manifest {date_str}");
                 let mut response = download_progress(&client, &name, &url)?;
                 let mut commit = String::new();
                 response.read_to_string(&mut commit)?;
 
-                eprintln!("converted {} to {}", date_str, commit);
+                eprintln!("converted {date_str} to {commit}");
 
                 Ok(commit)
             }
diff --git a/src/toolchains.rs b/src/toolchains.rs
index c879a72..345296e 100644
--- a/src/toolchains.rs
+++ b/src/toolchains.rs
@@ -73,7 +73,7 @@ impl Toolchain {
                 } else {
                     String::new()
                 };
-                format!("bisector-ci-{}{}-{}", commit, alt_s, self.host)
+                format!("bisector-ci-{commit}{alt_s}-{}", self.host)
             }
             // N.B. We need to call this with a nonstandard name so that rustup utilizes the
             // fallback cargo logic.
@@ -107,7 +107,7 @@ impl Toolchain {
         client: &Client,
         dl_params: &DownloadParams,
     ) -> Result<(), InstallError> {
-        let tc_stdstream_str = format!("{}", self);
+        let tc_stdstream_str = format!("{self}");
         eprintln!("installing {}", tc_stdstream_str.green());
         let tmpdir = TempDir::new_in(&dl_params.tmp_dir, &self.rustup_name())
             .map_err(InstallError::TempDir)?;
@@ -177,20 +177,20 @@ impl Toolchain {
                     // rust-src is target-independent
                     "rust-src-nightly".to_string()
                 } else {
-                    format!("{}-nightly-{}", component, self.host)
+                    format!("{component}-nightly-{}", self.host)
                 }
             })
             .chain(
                 self.std_targets
                     .iter()
-                    .map(|target| format!("rust-std-nightly-{}", target)),
+                    .map(|target| format!("rust-std-nightly-{target}")),
             );
 
         for component in components {
             download_tarball(
                 client,
                 &component,
-                &format!("{}/{}/{}.tar", dl_params.url_prefix, location, component),
+                &format!("{}/{location}/{component}.tar", dl_params.url_prefix),
                 tmpdir.path(),
             )
             .map_err(|e| {
@@ -391,8 +391,7 @@ pub(crate) struct DownloadParams {
 impl DownloadParams {
     pub(crate) fn for_ci(cfg: &Config) -> Self {
         let url_prefix = format!(
-            "{}/rustc-builds{}",
-            CI_SERVER,
+            "{CI_SERVER}/rustc-builds{}",
             if cfg.args.alt { "-alt" } else { "" }
         );
 
@@ -527,9 +526,9 @@ fn download_tarball(
     url: &str,
     dest: &Path,
 ) -> Result<(), DownloadError> {
-    match download_tar_xz(client, name, &format!("{}.xz", url,), dest) {
+    match download_tar_xz(client, name, &format!("{url}.xz"), dest) {
         Err(DownloadError::NotFound { .. }) => {
-            download_tar_gz(client, name, &format!("{}.gz", url,), dest)
+            download_tar_gz(client, name, &format!("{url}.gz"), dest)
         }
         res => res,
     }

From 5d5d7169d3cb8768c72a566156ff8e0405d19ec0 Mon Sep 17 00:00:00 2001
From: kraktus <kraktus@users.noreply.github.com>
Date: Sun, 8 May 2022 13:36:04 +0200
Subject: [PATCH 16/22] Use implicit error conversion when possible

Made possible with using `thiserror`
---
 src/toolchains.rs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/toolchains.rs b/src/toolchains.rs
index 345296e..cae2c74 100644
--- a/src/toolchains.rs
+++ b/src/toolchains.rs
@@ -453,14 +453,12 @@ pub(crate) fn download_progress(
 ) -> Result<TeeReader<Response, ProgressBar<io::Stdout>>, DownloadError> {
     debug!("downloading <{}>...", url);
 
-    let response = client.get(url).send().map_err(DownloadError::Reqwest)?;
+    let response = client.get(url).send()?;
 
     if response.status() == reqwest::StatusCode::NOT_FOUND {
         return Err(DownloadError::NotFound(url.to_string()));
     }
-    let response = response
-        .error_for_status()
-        .map_err(DownloadError::Reqwest)?;
+    let response = response.error_for_status()?;
 
     let length = response
         .headers()

From 014b12da34a3280d4b9304c2ba52a955cfe29477 Mon Sep 17 00:00:00 2001
From: kraktus <kraktus@users.noreply.github.com>
Date: Fri, 13 May 2022 13:05:31 +0200
Subject: [PATCH 17/22] use `clap` to validate `--script` and `--test-dir`

---
 src/main.rs | 58 ++++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 49 insertions(+), 9 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index d5fad02..54ba42c 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -110,7 +110,8 @@ struct Opts {
         long,
         help = "Root directory for tests",
         default_value = ".",
-        parse(from_os_str)
+        parse(from_os_str),
+        validator = validate_dir
     )]
     test_dir: PathBuf,
 
@@ -164,7 +165,8 @@ a date (YYYY-MM-DD), git tag name (e.g. 1.58.0) or git commit SHA."
     #[clap(
         long,
         help = "Script replacement for `cargo build` command",
-        parse(from_os_str)
+        parse(from_os_str),
+        validator = validate_file,
     )]
     script: Option<PathBuf>,
 
@@ -174,6 +176,27 @@ a date (YYYY-MM-DD), git tag name (e.g. 1.58.0) or git commit SHA."
 
 pub type GitDate = Date<Utc>;
 
+fn validate_dir(s: &str) -> anyhow::Result<()> {
+    let path: PathBuf = s.parse()?;
+    if path.is_dir() {
+        Ok(())
+    } else {
+        bail!(
+            "{} is not an existing directory",
+            path.canonicalize()?.display()
+        )
+    }
+}
+
+fn validate_file(s: &str) -> anyhow::Result<()> {
+    let path: PathBuf = s.parse()?;
+    if path.is_file() {
+        Ok(())
+    } else {
+        bail!("{} is not an existing file", path.canonicalize()?.display())
+    }
+}
+
 #[derive(Clone, Debug)]
 enum Bound {
     Commit(String),
@@ -416,13 +439,6 @@ impl Config {
             );
         }
 
-        if !args.test_dir.is_dir() {
-            bail!(
-                "`{}` is not a directory. Please make sure --test-dir is correct",
-                args.test_dir.display()
-            );
-        }
-
         let is_commit = match (args.start.clone(), args.end.clone()) {
             (Some(Bound::Commit(_)) | None, Some(Bound::Commit(_)))
             | (Some(Bound::Commit(_)), None) => Some(true),
@@ -1186,4 +1202,28 @@ mod tests {
             assert_eq!(start_date - Duration::days(i), date)
         }
     }
+
+    #[test]
+    fn test_validate_dir() {
+        let current_dir = ".";
+        assert!(validate_dir(current_dir).is_ok());
+        let main = "src/main.rs";
+        assert!(
+            validate_dir(main).is_err(),
+            "{}",
+            validate_dir(main).unwrap_err()
+        )
+    }
+
+    #[test]
+    fn test_validate_file() {
+        let current_dir = ".";
+        assert!(validate_file(current_dir).is_err());
+        let main = "src/main.rs";
+        assert!(
+            validate_file(main).is_ok(),
+            "{}",
+            validate_dir(main).unwrap_err()
+        )
+    }
 }

From 4e4e3694e00403d8eb58e1c7667e4b7cb6b41f7a Mon Sep 17 00:00:00 2001
From: kraktus <kraktus@users.noreply.github.com>
Date: Fri, 13 May 2022 13:31:41 +0200
Subject: [PATCH 18/22] validate `--host` with `clap`

This will also allow to display the correct default value with `--help`

`--host` and `--target` have the same goal and probably `--host` should be removed but for a later work
---
 src/main.rs           | 27 ++++++++++++++++-----------
 tests/cmd/h.stdout    |  2 +-
 tests/cmd/help.stdout |  2 +-
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 54ba42c..66855ff 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -85,7 +85,12 @@ struct Opts {
     #[clap(short, long, help = "Download the alt build instead of normal build")]
     alt: bool,
 
-    #[clap(long, help = "Host triple for the compiler", default_value = "unknown")]
+    #[clap(
+        long,
+        help = "Host triple for the compiler",
+        default_value_t = option_env!("HOST").unwrap_or("unkown").to_string(),
+        validator = validate_host
+        )]
     host: String,
 
     #[clap(long, help = "Cross-compilation target platform")]
@@ -197,6 +202,16 @@ fn validate_file(s: &str) -> anyhow::Result<()> {
     }
 }
 
+fn validate_host(s: &str) -> anyhow::Result<()> {
+    if s == "unknown" {
+        bail!(
+            "Failed to auto-detect host triple and was not specified. Please provide it via --host"
+        )
+    } else {
+        Ok(())
+    }
+}
+
 #[derive(Clone, Debug)]
 enum Bound {
     Commit(String),
@@ -409,16 +424,6 @@ struct Config {
 
 impl Config {
     fn from_args(mut args: Opts) -> anyhow::Result<Config> {
-        if args.host == "unknown" {
-            if let Some(host) = option_env!("HOST") {
-                args.host = host.to_string();
-            } else {
-                bail!(
-                    "Failed to auto-detect host triple and was not specified. Please provide it via --host"
-                );
-            }
-        }
-
         let target = args.target.clone().unwrap_or_else(|| args.host.clone());
 
         let mut toolchains_path = home::rustup_home()?;
diff --git a/tests/cmd/h.stdout b/tests/cmd/h.stdout
index cb84887..898b4d5 100644
--- a/tests/cmd/h.stdout
+++ b/tests/cmd/h.stdout
@@ -18,7 +18,7 @@ OPTIONS:
                                     (YYYY-MM-DD), git tag name (e.g. 1.58.0) or git commit SHA.
         --force-install             Force installation over existing artifacts
     -h, --help                      Print help information
-        --host <HOST>               Host triple for the compiler [default: unknown]
+        --host <HOST>               Host triple for the compiler [default: [..]]
         --install <INSTALL>         Install the given artifact
         --preserve                  Preserve the downloaded artifacts
         --preserve-target           Preserve the target directory used for builds
diff --git a/tests/cmd/help.stdout b/tests/cmd/help.stdout
index cb84887..898b4d5 100644
--- a/tests/cmd/help.stdout
+++ b/tests/cmd/help.stdout
@@ -18,7 +18,7 @@ OPTIONS:
                                     (YYYY-MM-DD), git tag name (e.g. 1.58.0) or git commit SHA.
         --force-install             Force installation over existing artifacts
     -h, --help                      Print help information
-        --host <HOST>               Host triple for the compiler [default: unknown]
+        --host <HOST>               Host triple for the compiler [default: [..]]
         --install <INSTALL>         Install the given artifact
         --preserve                  Preserve the downloaded artifacts
         --preserve-target           Preserve the target directory used for builds

From 34b2923fc2078d9199b81b467644bb26f6cfc9ea Mon Sep 17 00:00:00 2001
From: kraktus <kraktus@users.noreply.github.com>
Date: Fri, 13 May 2022 14:25:54 +0200
Subject: [PATCH 19/22] use `io::Result` alias

---
 src/toolchains.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/toolchains.rs b/src/toolchains.rs
index cae2c74..bdd31f8 100644
--- a/src/toolchains.rs
+++ b/src/toolchains.rs
@@ -208,7 +208,7 @@ impl Toolchain {
         fs::rename(tmpdir.into_path(), dest).map_err(InstallError::Move)
     }
 
-    pub(crate) fn remove(&self, dl_params: &DownloadParams) -> Result<(), io::Error> {
+    pub(crate) fn remove(&self, dl_params: &DownloadParams) -> io::Result<()> {
         eprintln!("uninstalling {}", self);
         self.do_remove(dl_params)
     }
@@ -217,7 +217,7 @@ impl Toolchain {
     ///
     /// The main reason to call this (instead of `fs::remove_dir_all` directly)
     /// is to guard against deleting state not managed by `cargo-bisect-rustc`.
-    fn do_remove(&self, dl_params: &DownloadParams) -> Result<(), io::Error> {
+    fn do_remove(&self, dl_params: &DownloadParams) -> io::Result<()> {
         let rustup_name = self.rustup_name();
 
         // Guard against destroying directories that this tool didn't create.

From e22a7826ab9a7791cec51d7760ddb869f3c4e3a5 Mon Sep 17 00:00:00 2001
From: kraktus <kraktus@users.noreply.github.com>
Date: Fri, 13 May 2022 14:06:09 +0200
Subject: [PATCH 20/22] Refactor most `main.rs` functions to methods

Not to pass `Config` and `Client` every time
---
 src/main.rs | 694 ++++++++++++++++++++++++++--------------------------
 1 file changed, 348 insertions(+), 346 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 66855ff..7655111 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -420,6 +420,7 @@ struct Config {
     toolchains_path: PathBuf,
     target: String,
     is_commit: bool,
+    client: Client,
 }
 
 impl Config {
@@ -478,6 +479,7 @@ impl Config {
             target,
             toolchains_path,
             rustup_tmp_path,
+            client: Client::new(),
         })
     }
 }
@@ -521,77 +523,78 @@ fn run() -> anyhow::Result<()> {
     check_bounds(&args.start, &args.end)?;
     let cfg = Config::from_args(args)?;
 
-    let client = Client::new();
-
     if let Some(ref bound) = cfg.args.install {
-        install(&cfg, &client, bound)
+        cfg.install(bound)
     } else {
-        bisect(&cfg, &client)
+        cfg.bisect()
     }
 }
 
-fn install(cfg: &Config, client: &Client, bound: &Bound) -> anyhow::Result<()> {
-    match *bound {
-        Bound::Commit(ref sha) => {
-            let sha = cfg.args.access.repo().commit(sha)?.sha;
-            let mut t = Toolchain {
-                spec: ToolchainSpec::Ci {
-                    commit: sha,
-                    alt: cfg.args.alt,
-                },
-                host: cfg.args.host.clone(),
-                std_targets: vec![cfg.args.host.clone(), cfg.target.clone()],
-            };
-            t.std_targets.sort();
-            t.std_targets.dedup();
-            let dl_params = DownloadParams::for_ci(cfg);
-            t.install(client, &dl_params)?;
-        }
-        Bound::Date(date) => {
-            let mut t = Toolchain {
-                spec: ToolchainSpec::Nightly { date },
-                host: cfg.args.host.clone(),
-                std_targets: vec![cfg.args.host.clone(), cfg.target.clone()],
-            };
-            t.std_targets.sort();
-            t.std_targets.dedup();
-            let dl_params = DownloadParams::for_nightly(cfg);
-            t.install(client, &dl_params)?;
+impl Config {
+    fn install(&self, bound: &Bound) -> anyhow::Result<()> {
+        match *bound {
+            Bound::Commit(ref sha) => {
+                let sha = self.args.access.repo().commit(sha)?.sha;
+                let mut t = Toolchain {
+                    spec: ToolchainSpec::Ci {
+                        commit: sha,
+                        alt: self.args.alt,
+                    },
+                    host: self.args.host.clone(),
+                    std_targets: vec![self.args.host.clone(), self.target.clone()],
+                };
+                t.std_targets.sort();
+                t.std_targets.dedup();
+                let dl_params = DownloadParams::for_ci(self);
+                t.install(&self.client, &dl_params)?;
+            }
+            Bound::Date(date) => {
+                let mut t = Toolchain {
+                    spec: ToolchainSpec::Nightly { date },
+                    host: self.args.host.clone(),
+                    std_targets: vec![self.args.host.clone(), self.target.clone()],
+                };
+                t.std_targets.sort();
+                t.std_targets.dedup();
+                let dl_params = DownloadParams::for_nightly(self);
+                t.install(&self.client, &dl_params)?;
+            }
         }
-    }
 
-    Ok(())
-}
+        Ok(())
+    }
 
-// bisection entry point
-fn bisect(cfg: &Config, client: &Client) -> anyhow::Result<()> {
-    if cfg.is_commit {
-        let bisection_result = bisect_ci(cfg, client)?;
-        print_results(cfg, client, &bisection_result);
-    } else {
-        let nightly_bisection_result = bisect_nightlies(cfg, client)?;
-        print_results(cfg, client, &nightly_bisection_result);
-        let nightly_regression = &nightly_bisection_result.searched[nightly_bisection_result.found];
+    // bisection entry point
+    fn bisect(&self) -> anyhow::Result<()> {
+        if self.is_commit {
+            let bisection_result = self.bisect_ci()?;
+            self.print_results(&bisection_result);
+        } else {
+            let nightly_bisection_result = self.bisect_nightlies()?;
+            self.print_results(&nightly_bisection_result);
+            let nightly_regression =
+                &nightly_bisection_result.searched[nightly_bisection_result.found];
 
-        if let ToolchainSpec::Nightly { date } = nightly_regression.spec {
-            let previous_date = date.pred();
+            if let ToolchainSpec::Nightly { date } = nightly_regression.spec {
+                let previous_date = date.pred();
 
-            let working_commit = Bound::Date(previous_date).sha()?;
-            let bad_commit = Bound::Date(date).sha()?;
-            eprintln!(
-                "looking for regression commit between {} and {}",
-                previous_date.format(YYYY_MM_DD),
-                date.format(YYYY_MM_DD),
-            );
+                let working_commit = Bound::Date(previous_date).sha()?;
+                let bad_commit = Bound::Date(date).sha()?;
+                eprintln!(
+                    "looking for regression commit between {} and {}",
+                    previous_date.format(YYYY_MM_DD),
+                    date.format(YYYY_MM_DD),
+                );
 
-            let ci_bisection_result = bisect_ci_via(cfg, client, &working_commit, &bad_commit)?;
+                let ci_bisection_result = self.bisect_ci_via(&working_commit, &bad_commit)?;
 
-            print_results(cfg, client, &ci_bisection_result);
-            print_final_report(cfg, &nightly_bisection_result, &ci_bisection_result);
+                self.print_results(&ci_bisection_result);
+                print_final_report(self, &nightly_bisection_result, &ci_bisection_result);
+            }
         }
-    }
 
-    Ok(())
+        Ok(())
+    }
 }
 
 fn searched_range(
@@ -621,50 +624,54 @@ fn searched_range(
     }
 }
 
-fn print_results(cfg: &Config, client: &Client, bisection_result: &BisectionResult) {
-    let BisectionResult {
-        searched: toolchains,
-        dl_spec,
-        found,
-    } = bisection_result;
-
-    let (start, end) = searched_range(cfg, toolchains);
-
-    eprintln!("searched toolchains {} through {}", start, end);
-
-    if toolchains[*found] == *toolchains.last().unwrap() {
-        let t = &toolchains[*found];
-        let r = match t.install(client, dl_spec) {
-            Ok(()) => {
-                let outcome = t.test(cfg);
-                remove_toolchain(cfg, t, dl_spec);
-                // we want to fail, so a successful build doesn't satisfy us
-                match outcome {
-                    TestOutcome::Baseline => Satisfies::No,
-                    TestOutcome::Regressed => Satisfies::Yes,
+impl Config {
+    fn print_results(&self, bisection_result: &BisectionResult) {
+        let BisectionResult {
+            searched: toolchains,
+            dl_spec,
+            found,
+        } = bisection_result;
+
+        let (start, end) = searched_range(self, toolchains);
+
+        eprintln!("searched toolchains {} through {}", start, end);
+
+        if toolchains[*found] == *toolchains.last().unwrap() {
+            let t = &toolchains[*found];
+            let r = match t.install(&self.client, dl_spec) {
+                Ok(()) => {
+                    let outcome = t.test(self);
+                    remove_toolchain(self, t, dl_spec);
+                    // we want to fail, so a successful build doesn't satisfy us
+                    match outcome {
+                        TestOutcome::Baseline => Satisfies::No,
+                        TestOutcome::Regressed => Satisfies::Yes,
+                    }
+                }
+                Err(_) => {
+                    let _ = t.remove(dl_spec);
+                    Satisfies::Unknown
+                }
+            };
+            match r {
+                Satisfies::Yes => {}
+                Satisfies::No | Satisfies::Unknown => {
+                    eprintln!(
+                        "error: The regression was not found. Expanding the bounds may help."
+                    );
+                    return;
                 }
-            }
-            Err(_) => {
-                let _ = t.remove(dl_spec);
-                Satisfies::Unknown
-            }
-        };
-        match r {
-            Satisfies::Yes => {}
-            Satisfies::No | Satisfies::Unknown => {
-                eprintln!("error: The regression was not found. Expanding the bounds may help.");
-                return;
             }
         }
-    }
 
-    let tc_found = format!("Regression in {}", toolchains[*found]);
-    eprintln!();
-    eprintln!();
-    eprintln!("{}", "*".repeat(80).dimmed().bold());
-    eprintln!("{}", tc_found.red());
-    eprintln!("{}", "*".repeat(80).dimmed().bold());
-    eprintln!();
+        let tc_found = format!("Regression in {}", toolchains[*found]);
+        eprintln!();
+        eprintln!();
+        eprintln!("{}", "*".repeat(80).dimmed().bold());
+        eprintln!("{}", tc_found.red());
+        eprintln!("{}", "*".repeat(80).dimmed().bold());
+        eprintln!();
+    }
 }
 
 fn remove_toolchain(cfg: &Config, toolchain: &Toolchain, dl_params: &DownloadParams) {
@@ -805,41 +812,38 @@ impl Iterator for NightlyFinderIter {
     }
 }
 
-fn install_and_test(
-    t: &Toolchain,
-    cfg: &Config,
-    client: &Client,
-    dl_spec: &DownloadParams,
-) -> Result<Satisfies, InstallError> {
-    match t.install(client, dl_spec) {
-        Ok(()) => {
-            let outcome = t.test(cfg);
-            // we want to fail, so a successful build doesn't satisfy us
-            let r = match outcome {
-                TestOutcome::Baseline => Satisfies::No,
-                TestOutcome::Regressed => Satisfies::Yes,
-            };
-            eprintln!("RESULT: {}, ===> {}", t, r);
-            remove_toolchain(cfg, t, dl_spec);
-            eprintln!();
-            Ok(r)
-        }
-        Err(error) => {
-            remove_toolchain(cfg, t, dl_spec);
-            Err(error)
+impl Config {
+    fn install_and_test(
+        &self,
+        t: &Toolchain,
+        dl_spec: &DownloadParams,
+    ) -> Result<Satisfies, InstallError> {
+        match t.install(&self.client, dl_spec) {
+            Ok(()) => {
+                let outcome = t.test(self);
+                // we want to fail, so a successful build doesn't satisfy us
+                let r = match outcome {
+                    TestOutcome::Baseline => Satisfies::No,
+                    TestOutcome::Regressed => Satisfies::Yes,
+                };
+                eprintln!("RESULT: {}, ===> {}", t, r);
+                remove_toolchain(self, t, dl_spec);
+                eprintln!();
+                Ok(r)
+            }
+            Err(error) => {
+                remove_toolchain(self, t, dl_spec);
+                Err(error)
+            }
         }
     }
-}
 
-fn bisect_to_regression(
-    toolchains: &[Toolchain],
-    cfg: &Config,
-    client: &Client,
-    dl_spec: &DownloadParams,
-) -> usize {
-    least_satisfying(toolchains, |t| {
-        install_and_test(t, cfg, client, dl_spec).unwrap_or(Satisfies::Unknown)
-    })
+    fn bisect_to_regression(&self, toolchains: &[Toolchain], dl_spec: &DownloadParams) -> usize {
+        least_satisfying(toolchains, |t| {
+            self.install_and_test(t, dl_spec)
+                .unwrap_or(Satisfies::Unknown)
+        })
+    }
 }
 
 fn get_start_date(cfg: &Config) -> Date<Utc> {
@@ -864,132 +868,134 @@ fn date_is_future(test_date: Date<Utc>) -> bool {
     test_date > Utc::today()
 }
 
-// nightlies branch of bisect execution
-fn bisect_nightlies(cfg: &Config, client: &Client) -> anyhow::Result<BisectionResult> {
-    if cfg.args.alt {
-        bail!("cannot bisect nightlies with --alt: not supported");
-    }
+impl Config {
+    // nightlies branch of bisect execution
+    fn bisect_nightlies(&self) -> anyhow::Result<BisectionResult> {
+        if self.args.alt {
+            bail!("cannot bisect nightlies with --alt: not supported");
+        }
 
-    let dl_spec = DownloadParams::for_nightly(cfg);
+        let dl_spec = DownloadParams::for_nightly(self);
 
-    // before this date we didn't have -std packages
-    let end_at = Date::from_utc(NaiveDate::from_ymd(2015, 10, 20), Utc);
-    let mut first_success = None;
+        // before this date we didn't have -std packages
+        let end_at = Date::from_utc(NaiveDate::from_ymd(2015, 10, 20), Utc);
+        let mut first_success = None;
 
-    let mut nightly_date = get_start_date(cfg);
-    let mut last_failure = get_end_date(cfg);
-    let has_start = cfg.args.start.is_some();
+        let mut nightly_date = get_start_date(self);
+        let mut last_failure = get_end_date(self);
+        let has_start = self.args.start.is_some();
 
-    // validate start and end dates to confirm that they are not future dates
-    // start date validation
-    if has_start && date_is_future(nightly_date) {
-        bail!(
-            "start date must be on or before the current date. received start date request {}",
-            nightly_date
-        )
-    }
-    // end date validation
-    if date_is_future(last_failure) {
-        bail!(
-            "end date must be on or before the current date. received end date request {}",
-            nightly_date
-        )
-    }
-
-    let mut nightly_iter = NightlyFinderIter::new(nightly_date);
-
-    // this loop tests nightly toolchains to:
-    // (1) validate that start date does not have regression (if defined on command line)
-    // (2) identify a nightly date range for the bisection routine
-    //
-    // The tests here must be constrained to dates after 2015-10-20 (`end_at` date)
-    // because -std packages were not available prior
-    while nightly_date > end_at {
-        let mut t = Toolchain {
-            spec: ToolchainSpec::Nightly { date: nightly_date },
-            host: cfg.args.host.clone(),
-            std_targets: vec![cfg.args.host.clone(), cfg.target.clone()],
-        };
-        t.std_targets.sort();
-        t.std_targets.dedup();
-        if t.is_current_nightly() {
-            eprintln!(
-                "checking {} from the currently installed default nightly \
-                       toolchain as the last failure",
-                t
-            );
+        // validate start and end dates to confirm that they are not future dates
+        // start date validation
+        if has_start && date_is_future(nightly_date) {
+            bail!(
+                "start date must be on or before the current date. received start date request {}",
+                nightly_date
+            )
+        }
+        // end date validation
+        if date_is_future(last_failure) {
+            bail!(
+                "end date must be on or before the current date. received end date request {}",
+                nightly_date
+            )
         }
 
-        match install_and_test(&t, cfg, client, &dl_spec) {
-            Ok(r) => {
-                // If Satisfies::No, then the regression was not identified in this nightly.
-                // Break out of the loop and use this as the start date for the
-                // bisection range
-                if r == Satisfies::No {
-                    first_success = Some(nightly_date);
-                    break;
-                } else if has_start {
-                    // If this date was explicitly defined on the command line &
-                    // has regression, then this is an error in the test definition.
-                    // The user must re-define the start date and try again
-                    bail!(
-                        "the start of the range ({}) must not reproduce the regression",
-                        t
-                    );
-                }
-                last_failure = nightly_date;
-                nightly_date = nightly_iter.next().unwrap();
-            }
-            Err(InstallError::NotFound { .. }) => {
-                // go back just one day, presumably missing a nightly
-                nightly_date = nightly_date.pred();
+        let mut nightly_iter = NightlyFinderIter::new(nightly_date);
+
+        // this loop tests nightly toolchains to:
+        // (1) validate that start date does not have regression (if defined on command line)
+        // (2) identify a nightly date range for the bisection routine
+        //
+        // The tests here must be constrained to dates after 2015-10-20 (`end_at` date)
+        // because -std packages were not available prior
+        while nightly_date > end_at {
+            let mut t = Toolchain {
+                spec: ToolchainSpec::Nightly { date: nightly_date },
+                host: self.args.host.clone(),
+                std_targets: vec![self.args.host.clone(), self.target.clone()],
+            };
+            t.std_targets.sort();
+            t.std_targets.dedup();
+            if t.is_current_nightly() {
                 eprintln!(
-                    "*** unable to install {}. roll back one day and try again...",
+                    "checking {} from the currently installed default nightly \
+                       toolchain as the last failure",
                     t
                 );
-                if has_start {
-                    bail!("could not find {}", t);
+            }
+
+            match self.install_and_test(&t, &dl_spec) {
+                Ok(r) => {
+                    // If Satisfies::No, then the regression was not identified in this nightly.
+                    // Break out of the loop and use this as the start date for the
+                    // bisection range
+                    if r == Satisfies::No {
+                        first_success = Some(nightly_date);
+                        break;
+                    } else if has_start {
+                        // If this date was explicitly defined on the command line &
+                        // has regression, then this is an error in the test definition.
+                        // The user must re-define the start date and try again
+                        bail!(
+                            "the start of the range ({}) must not reproduce the regression",
+                            t
+                        );
+                    }
+                    last_failure = nightly_date;
+                    nightly_date = nightly_iter.next().unwrap();
+                }
+                Err(InstallError::NotFound { .. }) => {
+                    // go back just one day, presumably missing a nightly
+                    nightly_date = nightly_date.pred();
+                    eprintln!(
+                        "*** unable to install {}. roll back one day and try again...",
+                        t
+                    );
+                    if has_start {
+                        bail!("could not find {}", t);
+                    }
                 }
+                Err(error) => return Err(error.into()),
             }
-            Err(error) => return Err(error.into()),
         }
-    }
 
-    let first_success = first_success.context("could not find a nightly that built")?;
+        let first_success = first_success.context("could not find a nightly that built")?;
 
-    // confirm that the end of the date range has the regression
-    let mut t_end = Toolchain {
-        spec: ToolchainSpec::Nightly { date: last_failure },
-        host: cfg.args.host.clone(),
-        std_targets: vec![cfg.args.host.clone(), cfg.target.clone()],
-    };
-    t_end.std_targets.sort();
-    t_end.std_targets.dedup();
+        // confirm that the end of the date range has the regression
+        let mut t_end = Toolchain {
+            spec: ToolchainSpec::Nightly { date: last_failure },
+            host: self.args.host.clone(),
+            std_targets: vec![self.args.host.clone(), self.target.clone()],
+        };
+        t_end.std_targets.sort();
+        t_end.std_targets.dedup();
 
-    let result_nightly = install_and_test(&t_end, cfg, client, &dl_spec)?;
-    // The regression was not identified in this nightly.
-    if result_nightly == Satisfies::No {
-        bail!(
-            "the end of the range ({}) does not reproduce the regression",
-            t_end
-        );
-    }
+        let result_nightly = self.install_and_test(&t_end, &dl_spec)?;
+        // The regression was not identified in this nightly.
+        if result_nightly == Satisfies::No {
+            bail!(
+                "the end of the range ({}) does not reproduce the regression",
+                t_end
+            );
+        }
 
-    let toolchains = toolchains_between(
-        cfg,
-        ToolchainSpec::Nightly {
-            date: first_success,
-        },
-        ToolchainSpec::Nightly { date: last_failure },
-    );
+        let toolchains = toolchains_between(
+            self,
+            ToolchainSpec::Nightly {
+                date: first_success,
+            },
+            ToolchainSpec::Nightly { date: last_failure },
+        );
 
-    let found = bisect_to_regression(&toolchains, cfg, client, &dl_spec);
+        let found = self.bisect_to_regression(&toolchains, &dl_spec);
 
-    Ok(BisectionResult {
-        dl_spec,
-        searched: toolchains,
-        found,
-    })
+        Ok(BisectionResult {
+            dl_spec,
+            searched: toolchains,
+            found,
+        })
+    }
 }
 
 fn toolchains_between(cfg: &Config, a: ToolchainSpec, b: ToolchainSpec) -> Vec<Toolchain> {
@@ -1015,133 +1021,129 @@ fn toolchains_between(cfg: &Config, a: ToolchainSpec, b: ToolchainSpec) -> Vec<T
     }
 }
 
-// CI branch of bisect execution
-fn bisect_ci(cfg: &Config, client: &Client) -> anyhow::Result<BisectionResult> {
-    eprintln!("bisecting ci builds");
-    let start = if let Some(Bound::Commit(ref sha)) = cfg.args.start {
-        sha
-    } else {
-        EPOCH_COMMIT
-    };
-
-    let end = if let Some(Bound::Commit(ref sha)) = cfg.args.end {
-        sha
-    } else {
-        "origin/master"
-    };
+impl Config {
+    // CI branch of bisect execution
+    fn bisect_ci(&self) -> anyhow::Result<BisectionResult> {
+        eprintln!("bisecting ci builds");
+        let start = if let Some(Bound::Commit(ref sha)) = self.args.start {
+            sha
+        } else {
+            EPOCH_COMMIT
+        };
 
-    eprintln!("starting at {}, ending at {}", start, end);
+        let end = if let Some(Bound::Commit(ref sha)) = self.args.end {
+            sha
+        } else {
+            "origin/master"
+        };
 
-    bisect_ci_via(cfg, client, start, end)
-}
+        eprintln!("starting at {}, ending at {}", start, end);
 
-fn bisect_ci_via(
-    cfg: &Config,
-    client: &Client,
-    start_sha: &str,
-    end_ref: &str,
-) -> anyhow::Result<BisectionResult> {
-    let access = cfg.args.access.repo();
-    let end_sha = access.commit(end_ref)?.sha;
-    let commits = access.commits(start_sha, &end_sha)?;
-
-    assert_eq!(commits.last().expect("at least one commit").sha, end_sha);
-
-    commits.iter().zip(commits.iter().skip(1)).all(|(a, b)| {
-        let sorted_by_date = a.date <= b.date;
-        assert!(
-            sorted_by_date,
-            "commits must chronologically ordered,\
-                                 but {:?} comes after {:?}",
-            a, b
-        );
-        sorted_by_date
-    });
-
-    for (j, commit) in commits.iter().enumerate() {
-        eprintln!(
-            "  commit[{}] {}: {}",
-            j,
-            commit.date,
-            commit.summary.split('\n').next().unwrap()
-        )
+        self.bisect_ci_via(start, end)
     }
 
-    bisect_ci_in_commits(cfg, client, start_sha, &end_sha, commits)
-}
+    fn bisect_ci_via(&self, start_sha: &str, end_ref: &str) -> anyhow::Result<BisectionResult> {
+        let access = self.args.access.repo();
+        let end_sha = access.commit(end_ref)?.sha;
+        let commits = access.commits(start_sha, &end_sha)?;
 
-fn bisect_ci_in_commits(
-    cfg: &Config,
-    client: &Client,
-    start: &str,
-    end: &str,
-    mut commits: Vec<Commit>,
-) -> anyhow::Result<BisectionResult> {
-    let dl_spec = DownloadParams::for_ci(cfg);
-    commits.retain(|c| Utc::today() - c.date < Duration::days(167));
-
-    if commits.is_empty() {
-        bail!(
-            "no CI builds available between {} and {} within last 167 days",
-            start,
-            end
-        );
-    }
+        assert_eq!(commits.last().expect("at least one commit").sha, end_sha);
 
-    if let Some(c) = commits.last() {
-        if end != "origin/master" && !c.sha.starts_with(end) {
-            bail!("expected to end with {}, but ended with {}", end, c.sha);
+        commits.iter().zip(commits.iter().skip(1)).all(|(a, b)| {
+            let sorted_by_date = a.date <= b.date;
+            assert!(
+                sorted_by_date,
+                "commits must chronologically ordered,\
+                                 but {:?} comes after {:?}",
+                a, b
+            );
+            sorted_by_date
+        });
+
+        for (j, commit) in commits.iter().enumerate() {
+            eprintln!(
+                "  commit[{}] {}: {}",
+                j,
+                commit.date,
+                commit.summary.split('\n').next().unwrap()
+            )
         }
+
+        self.bisect_ci_in_commits(start_sha, &end_sha, commits)
     }
 
-    eprintln!("validated commits found, specifying toolchains");
-    eprintln!();
+    fn bisect_ci_in_commits(
+        &self,
+        start: &str,
+        end: &str,
+        mut commits: Vec<Commit>,
+    ) -> anyhow::Result<BisectionResult> {
+        let dl_spec = DownloadParams::for_ci(self);
+        commits.retain(|c| Utc::today() - c.date < Duration::days(167));
 
-    let toolchains = commits
-        .into_iter()
-        .map(|commit| {
-            let mut t = Toolchain {
-                spec: ToolchainSpec::Ci {
-                    commit: commit.sha,
-                    alt: cfg.args.alt,
-                },
-                host: cfg.args.host.clone(),
-                std_targets: vec![cfg.args.host.clone(), cfg.target.clone()],
-            };
-            t.std_targets.sort();
-            t.std_targets.dedup();
-            t
-        })
-        .collect::<Vec<_>>();
-
-    if !toolchains.is_empty() {
-        // validate commit at start of range
-        let start_range_result = install_and_test(&toolchains[0], cfg, client, &dl_spec)?;
-        if start_range_result == Satisfies::Yes {
+        if commits.is_empty() {
             bail!(
-                "the commit at the start of the range ({}) includes the regression",
-                &toolchains[0]
+                "no CI builds available between {} and {} within last 167 days",
+                start,
+                end
             );
         }
 
-        // validate commit at end of range
-        let end_range_result =
-            install_and_test(&toolchains[toolchains.len() - 1], cfg, client, &dl_spec)?;
-        if end_range_result == Satisfies::No {
-            bail!(
-                "the commit at the end of the range ({}) does not reproduce the regression",
-                &toolchains[toolchains.len() - 1]
-            );
+        if let Some(c) = commits.last() {
+            if end != "origin/master" && !c.sha.starts_with(end) {
+                bail!("expected to end with {}, but ended with {}", end, c.sha);
+            }
+        }
+
+        eprintln!("validated commits found, specifying toolchains");
+        eprintln!();
+
+        let toolchains = commits
+            .into_iter()
+            .map(|commit| {
+                let mut t = Toolchain {
+                    spec: ToolchainSpec::Ci {
+                        commit: commit.sha,
+                        alt: self.args.alt,
+                    },
+                    host: self.args.host.clone(),
+                    std_targets: vec![self.args.host.clone(), self.target.clone()],
+                };
+                t.std_targets.sort();
+                t.std_targets.dedup();
+                t
+            })
+            .collect::<Vec<_>>();
+
+        if !toolchains.is_empty() {
+            // validate commit at start of range
+            let start_range_result = self.install_and_test(&toolchains[0], &dl_spec)?;
+            if start_range_result == Satisfies::Yes {
+                bail!(
+                    "the commit at the start of the range ({}) includes the regression",
+                    &toolchains[0]
+                );
+            }
+
+            // validate commit at end of range
+            let end_range_result =
+                self.install_and_test(&toolchains[toolchains.len() - 1], &dl_spec)?;
+            if end_range_result == Satisfies::No {
+                bail!(
+                    "the commit at the end of the range ({}) does not reproduce the regression",
+                    &toolchains[toolchains.len() - 1]
+                );
+            }
         }
-    }
 
-    let found = bisect_to_regression(&toolchains, cfg, client, &dl_spec);
+        let found = self.bisect_to_regression(&toolchains, &dl_spec);
 
-    Ok(BisectionResult {
-        searched: toolchains,
-        found,
-        dl_spec,
-    })
+        Ok(BisectionResult {
+            searched: toolchains,
+            found,
+            dl_spec,
+        })
+    }
 }
 
 #[derive(Clone)]

From 6718f3be7549e006fe6fa95a17179d721b0d65d5 Mon Sep 17 00:00:00 2001
From: kraktus <kraktus@users.noreply.github.com>
Date: Wed, 18 May 2022 14:48:35 +0200
Subject: [PATCH 21/22] Refactor CI

---
 .github/workflows/ci.yml        | 26 ++++++++++++++++++++++++++
 .github/workflows/linuxci.yml   | 29 -----------------------------
 .github/workflows/macosci.yml   | 29 -----------------------------
 .github/workflows/windowsci.yml | 20 --------------------
 4 files changed, 26 insertions(+), 78 deletions(-)
 create mode 100644 .github/workflows/ci.yml
 delete mode 100644 .github/workflows/linuxci.yml
 delete mode 100644 .github/workflows/macosci.yml
 delete mode 100644 .github/workflows/windowsci.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..568eb2d
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,26 @@
+name: CI
+on:
+  pull_request:
+  push:
+jobs:
+  test:
+    name: Test
+    strategy:
+      matrix:
+        os: ["ubuntu-latest", "windows-latest", "macos-latest"]
+        rust: ["stable"]
+    runs-on: ${{ matrix.os }}
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+    - name: Install Rust
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: ${{ matrix.rust }}
+        profile: minimal
+        override: true
+    - uses: Swatinem/rust-cache@v1
+    - name: Build
+      run: cargo test --no-run
+    - name: Test
+      run: cargo test
\ No newline at end of file
diff --git a/.github/workflows/linuxci.yml b/.github/workflows/linuxci.yml
deleted file mode 100644
index 9c368b4..0000000
--- a/.github/workflows/linuxci.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-on: [push, pull_request]
-
-name: GNU/Linux CI
-
-jobs:
-  check:
-    name: GNU/Linux CI
-    runs-on: ubuntu-latest
-    steps:
-      - name: Cache cargo
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.cargo/git
-            ~/.cargo/registry
-            target
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-
-      - uses: actions/checkout@v2
-      - name: Install latest stable toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-
-      - name: Run cargo test
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
diff --git a/.github/workflows/macosci.yml b/.github/workflows/macosci.yml
deleted file mode 100644
index 78aaf64..0000000
--- a/.github/workflows/macosci.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-on: [push, pull_request]
-
-name: macOS CI
-
-jobs:
-  check:
-    name: macOS CI
-    runs-on: macos-latest
-    steps:
-      - name: Cache cargo
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.cargo/git
-            ~/.cargo/registry
-            target
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-
-      - uses: actions/checkout@v2
-      - name: Install latest stable toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-
-      - name: Run cargo test
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
diff --git a/.github/workflows/windowsci.yml b/.github/workflows/windowsci.yml
deleted file mode 100644
index 99f1490..0000000
--- a/.github/workflows/windowsci.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-on: [push, pull_request]
-
-name: Windows CI
-
-jobs:
-  check:
-    name: Windows CI
-    runs-on: windows-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Install latest stable toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-
-      - name: Run cargo test
-        uses: actions-rs/cargo@v1
-        with:
-          command: test

From 7189f069522b19f25f6eb9ed2445cabf0585b2e5 Mon Sep 17 00:00:00 2001
From: kraktus <kraktus@users.noreply.github.com>
Date: Wed, 18 May 2022 15:20:09 +0200
Subject: [PATCH 22/22] try to fix test for windows

---
 tests/cmd/h.stdout    | 2 +-
 tests/cmd/help.stdout | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/cmd/h.stdout b/tests/cmd/h.stdout
index 898b4d5..9afd2d6 100644
--- a/tests/cmd/h.stdout
+++ b/tests/cmd/h.stdout
@@ -2,7 +2,7 @@ cargo-bisect-rustc 0.6.3
 Bisects rustc toolchains with rustup
 
 USAGE:
-    cargo-bisect-rustc [OPTIONS] [-- <COMMAND_ARGS>...]
+    cargo-bisect-rustc[EXE] [OPTIONS] [-- <COMMAND_ARGS>...]
 
 ARGS:
     <COMMAND_ARGS>...    Arguments to pass to cargo or the file specified by --script during
diff --git a/tests/cmd/help.stdout b/tests/cmd/help.stdout
index 898b4d5..9afd2d6 100644
--- a/tests/cmd/help.stdout
+++ b/tests/cmd/help.stdout
@@ -2,7 +2,7 @@ cargo-bisect-rustc 0.6.3
 Bisects rustc toolchains with rustup
 
 USAGE:
-    cargo-bisect-rustc [OPTIONS] [-- <COMMAND_ARGS>...]
+    cargo-bisect-rustc[EXE] [OPTIONS] [-- <COMMAND_ARGS>...]
 
 ARGS:
     <COMMAND_ARGS>...    Arguments to pass to cargo or the file specified by --script during