Skip to content

Instantly share code, notes, and snippets.

@Xanewok

Xanewok/diff.diff

Created May 2, 2021 12:05
Show Gist options
  • Save Xanewok/915261b154e941db5733aa6fd0f11a50 to your computer and use it in GitHub Desktop.
Save Xanewok/915261b154e941db5733aa6fd0f11a50 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
diff.diff
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7856de4..56aeef8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,7 +15,7 @@ jobs:
cargo_cmd: fmt -- --check
os: ubuntu-latest
- component: clippy
- cargo_cmd: clippy --locked --all-targets -- -D warnings -A clippy::unknown-clippy-lints -A clippy::type_complexity -A clippy::new-without-default
+ cargo_cmd: clippy --locked --all-targets -- -D warnings
steps:
- name: Clone repository
uses: actions/checkout@v1
diff --git a/Cargo.lock b/Cargo.lock
index 4fa6833..9d630aa 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -11,9 +11,9 @@ dependencies = [
[[package]]
name = "adler"
-version = "1.0.2"
+version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e"
[[package]]
name = "aead"
@@ -89,9 +89,9 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.40"
+version = "1.0.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b"
+checksum = "ee67c11feeac938fae061b232e38e0b6d94f97a9df10e6271319325ac4c56a86"
[[package]]
name = "ar"
@@ -113,17 +113,16 @@ checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
[[package]]
name = "ascii"
-version = "1.0.0"
+version = "0.8.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbf56136a5198c7b01a49e3afcbef6cf84597273d298f54432926024107b0109"
+checksum = "97be891acc47ca214468e09425d02cef3af2c94d0d82081cd02061f996802f14"
[[package]]
name = "assert_cmd"
-version = "1.0.3"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2475b58cd94eb4f70159f4fd8844ba3b807532fe3131b3373fae060bbe30396"
+checksum = "3dc1679af9a1ab4bea16f228b05d18f8363f8327b1fa8db00d2760cfafc6b61e"
dependencies = [
- "bstr",
"doc-comment",
"predicates",
"predicates-core",
@@ -131,17 +130,124 @@ dependencies = [
"wait-timeout",
]
+[[package]]
+name = "async-channel"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59740d83946db6a5af71ae25ddf9562c2b176b2ca42cf99a455f09f4a220d6b9"
+dependencies = [
+ "concurrent-queue",
+ "event-listener",
+ "futures-core",
+]
+
+[[package]]
+name = "async-executor"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb877970c7b440ead138f6321a3b5395d6061183af779340b65e20c0fede9146"
+dependencies = [
+ "async-task",
+ "concurrent-queue",
+ "fastrand",
+ "futures-lite",
+ "once_cell",
+ "vec-arena",
+]
+
+[[package]]
+name = "async-global-executor"
+version = "1.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73079b49cd26b8fd5a15f68fc7707fc78698dc2a3d61430f2a7a9430230dfa04"
+dependencies = [
+ "async-executor",
+ "async-io",
+ "futures-lite",
+ "num_cpus",
+ "once_cell",
+]
+
+[[package]]
+name = "async-io"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9315f8f07556761c3e48fec2e6b276004acf426e6dc068b2c2251854d65ee0fd"
+dependencies = [
+ "concurrent-queue",
+ "fastrand",
+ "futures-lite",
+ "libc",
+ "log 0.4.11",
+ "nb-connect",
+ "once_cell",
+ "parking",
+ "polling",
+ "vec-arena",
+ "waker-fn",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "async-mutex"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "479db852db25d9dbf6204e6cb6253698f175c15726470f78af0d918e99d6156e"
+dependencies = [
+ "event-listener",
+]
+
+[[package]]
+name = "async-std"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f9f84f1280a2b436a2c77c2582602732b6c2f4321d5494d6e799e6c367859a8"
+dependencies = [
+ "async-channel",
+ "async-global-executor",
+ "async-io",
+ "async-mutex",
+ "blocking",
+ "crossbeam-utils 0.8.1",
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-lite",
+ "gloo-timers",
+ "kv-log-macro",
+ "log 0.4.11",
+ "memchr",
+ "num_cpus",
+ "once_cell",
+ "pin-project-lite 0.2.1",
+ "pin-utils",
+ "slab",
+ "wasm-bindgen-futures",
+]
+
+[[package]]
+name = "async-task"
+version = "4.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0"
+
[[package]]
name = "async-trait"
-version = "0.1.50"
+version = "0.1.42"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b98e84bbb4cbcdd97da190ba0c58a1bb0de2c1fdf67d159e192ed766aeca722"
+checksum = "8d3a45e77e34375a7923b1e8febb049bb011f064714a8e17a1a616fef01da13d"
dependencies = [
"proc-macro2",
- "quote 1.0.9",
- "syn 1.0.71",
+ "quote 1.0.8",
+ "syn 1.0.58",
]
+[[package]]
+name = "atomic-waker"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a"
+
[[package]]
name = "atty"
version = "0.2.14"
@@ -167,12 +273,11 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
[[package]]
name = "backtrace"
-version = "0.3.58"
+version = "0.3.55"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88fb5a785d6b44fd9d6700935608639af1b8356de1e55d5f7c2740f4faa15d82"
+checksum = "ef5140344c85b01f9bbb4d4b7288a8aa4b3287ccef913a14bcc78a1063623598"
dependencies = [
"addr2line",
- "cc",
"cfg-if 1.0.0",
"libc",
"miniz_oxide",
@@ -224,19 +329,14 @@ dependencies = [
[[package]]
name = "bincode"
-version = "1.3.3"
+version = "1.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
+checksum = "f30d3a39baa26f9651f17b375061f3233dde33424a8b72b0dbe93a68a0bc896d"
dependencies = [
+ "byteorder",
"serde",
]
-[[package]]
-name = "bit-vec"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
-
[[package]]
name = "bitflags"
version = "1.2.1"
@@ -295,21 +395,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
[[package]]
-name = "boxfnonce"
-version = "0.1.1"
+name = "blocking"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5988cb1d626264ac94100be357308f29ff7cbdd3b36bda27f450a4ee3f713426"
+checksum = "c5e170dbede1f740736619b776d7251cb1b9095c435c34d8ca9f57fcd2f335e9"
+dependencies = [
+ "async-channel",
+ "async-task",
+ "atomic-waker",
+ "fastrand",
+ "futures-lite",
+ "once_cell",
+]
[[package]]
-name = "bstr"
-version = "0.2.15"
+name = "boxfnonce"
+version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a40b47ad93e1a5404e6c18dec46b628214fee441c70f4ab5d6942142cc268a3d"
-dependencies = [
- "lazy_static",
- "memchr",
- "regex-automata",
-]
+checksum = "5988cb1d626264ac94100be357308f29ff7cbdd3b36bda27f450a4ee3f713426"
[[package]]
name = "buf_redux"
@@ -329,15 +432,15 @@ checksum = "40e38929add23cdf8a366df9b0e088953150724bcbe5fc330b0d8eb3b328eec8"
[[package]]
name = "bumpalo"
-version = "3.6.1"
+version = "3.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe"
+checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820"
[[package]]
name = "byteorder"
-version = "1.4.3"
+version = "1.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
[[package]]
name = "bytes"
@@ -358,9 +461,15 @@ checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
[[package]]
name = "bytes"
-version = "1.0.1"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad1f8e949d755f9d79112b5bb46938e0ef9d3804a0b16dfab13aafcaa5f0fa72"
+
+[[package]]
+name = "cache-padded"
+version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040"
+checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba"
[[package]]
name = "case"
@@ -370,9 +479,9 @@ checksum = "e88b166b48e29667f5443df64df3c61dc07dc2b1a0b0d231800e07f09a33ecc1"
[[package]]
name = "cc"
-version = "1.0.67"
+version = "1.0.66"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd"
+checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48"
dependencies = [
"jobserver",
]
@@ -404,9 +513,9 @@ dependencies = [
[[package]]
name = "chunked_transfer"
-version = "1.4.0"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fff857943da45f546682664a79488be82e69e43c1a7a2307679ab9afb3a66d2e"
+checksum = "498d20a7aaf62625b9bf26e637cf7736417cde1d0c99f1d04d1170229a85cf87"
[[package]]
name = "clap"
@@ -438,11 +547,21 @@ version = "4.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cc4369b5e4c0cddf64ad8981c0111e7df4f7078f4d6ba98fb31f2e17c4c57b7e"
dependencies = [
- "bytes 1.0.1",
+ "bytes 0.5.6",
+ "bytes 1.0.0",
"futures-util",
"memchr",
- "pin-project-lite 0.2.6",
- "tokio 1.5.0",
+ "pin-project-lite 0.2.1",
+ "tokio 0.2.24",
+]
+
+[[package]]
+name = "concurrent-queue"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3"
+dependencies = [
+ "cache-padded",
]
[[package]]
@@ -451,7 +570,7 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "99d6364d028778d0d98b6014fa5882da377cd10d3492b7734d266a428e9b1fca"
dependencies = [
- "log 0.4.14",
+ "log 0.4.11",
"md5",
]
@@ -480,7 +599,7 @@ dependencies = [
"cookie",
"failure",
"idna 0.1.5",
- "log 0.4.14",
+ "log 0.4.11",
"publicsuffix",
"serde",
"serde_json",
@@ -601,9 +720,9 @@ dependencies = [
[[package]]
name = "crossbeam-utils"
-version = "0.8.4"
+version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4feb231f0d4d6af81aed15928e58ecf5816aa62a2393e2c82f46973e92a9a278"
+checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d"
dependencies = [
"autocfg 1.0.1",
"cfg-if 1.0.0",
@@ -677,9 +796,9 @@ dependencies = [
[[package]]
name = "directories"
-version = "3.0.2"
+version = "3.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e69600ff1703123957937708eb27f7a564e48885c537782722ed0ba3189ce1d7"
+checksum = "f8fed639d60b58d0f53498ab13d26f621fd77569cc6edb031f4cc36a2ad9da0f"
dependencies = [
"dirs-sys",
]
@@ -691,18 +810,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901"
dependencies = [
"libc",
- "redox_users 0.3.5",
+ "redox_users",
"winapi 0.3.9",
]
[[package]]
name = "dirs-sys"
-version = "0.3.6"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780"
+checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a"
dependencies = [
"libc",
- "redox_users 0.4.0",
+ "redox_users",
"winapi 0.3.9",
]
@@ -714,9 +833,9 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
[[package]]
name = "dtoa"
-version = "0.4.8"
+version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0"
+checksum = "88d7ed2934d741c6b37e33e3832298e8850b53fd2d2bea03873375596c7cea4e"
[[package]]
name = "either"
@@ -726,22 +845,22 @@ checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
[[package]]
name = "encoding_rs"
-version = "0.8.28"
+version = "0.8.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065"
+checksum = "801bbab217d7f79c0062f4f7205b5d4427c6d1a7bd7aafdd1475f7c59d62b283"
dependencies = [
"cfg-if 1.0.0",
]
[[package]]
name = "env_logger"
-version = "0.8.3"
+version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17392a012ea30ef05a610aa97dfb49496e71c9f676b27879922ea5bdf60d9d3f"
+checksum = "f26ecb66b4bdca6c1409b40fb255eefc2bd4f6d135dab3c3124f80ffa2a9661e"
dependencies = [
"atty",
"humantime",
- "log 0.4.14",
+ "log 0.4.11",
"regex",
"termcolor",
]
@@ -752,9 +871,15 @@ version = "0.12.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc"
dependencies = [
- "version_check 0.9.3",
+ "version_check 0.9.2",
]
+[[package]]
+name = "event-listener"
+version = "2.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59"
+
[[package]]
name = "failure"
version = "0.1.8"
@@ -772,33 +897,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
dependencies = [
"proc-macro2",
- "quote 1.0.9",
- "syn 1.0.71",
+ "quote 1.0.8",
+ "syn 1.0.58",
"synstructure",
]
+[[package]]
+name = "fastrand"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca5faf057445ce5c9d4329e382b2ce7ca38550ef3b73a5348362d5f24e0c7fe3"
+dependencies = [
+ "instant",
+]
+
[[package]]
name = "filetime"
-version = "0.2.14"
+version = "0.2.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d34cfa13a63ae058bfa601fe9e313bbdb3746427c1459185464ce0fcf62e1e8"
+checksum = "0c122a393ea57648015bf06fbd3d372378992e86b9ff5a7a497b076a28c79efe"
dependencies = [
"cfg-if 1.0.0",
"libc",
- "redox_syscall 0.2.7",
+ "redox_syscall",
"winapi 0.3.9",
]
[[package]]
name = "flate2"
-version = "1.0.20"
+version = "1.0.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd3aec53de10fe96d7d8c565eb17f2c687bb5518a2ec453b5b1252964526abe0"
+checksum = "7411863d55df97a419aa64cb4d2f167103ea9d767e2c54a1868b7ac3f6b47129"
dependencies = [
"cfg-if 1.0.0",
"crc32fast",
"libc",
- "libz-sys",
"miniz_oxide",
]
@@ -834,9 +967,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
[[package]]
name = "form_urlencoded"
-version = "1.0.1"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"
+checksum = "ece68d15c92e84fa4f19d3780f1294e5ca82a78a6d515f1efaabcc144688be00"
dependencies = [
"matches",
"percent-encoding 2.1.0",
@@ -866,15 +999,15 @@ checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
[[package]]
name = "futures"
-version = "0.1.31"
+version = "0.1.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678"
+checksum = "4c7e4c2612746b0df8fed4ce0c69156021b704c9aefa360311c04e6e9e002eed"
[[package]]
name = "futures"
-version = "0.3.14"
+version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9d5813545e459ad3ca1bff9915e9ad7f1a47dc6a91b627ce321d5863b7dd253"
+checksum = "c70be434c505aee38639abccb918163b63158a4b4bb791b45b7023044bdc3c9c"
dependencies = [
"futures-channel",
"futures-core",
@@ -887,9 +1020,9 @@ dependencies = [
[[package]]
name = "futures-channel"
-version = "0.3.14"
+version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce79c6a52a299137a6013061e0cf0e688fce5d7f1bc60125f520912fdb29ec25"
+checksum = "f01c61843314e95f96cc9245702248733a3a3d744e43e2e755e3c7af8348a0a9"
dependencies = [
"futures-core",
"futures-sink",
@@ -897,9 +1030,9 @@ dependencies = [
[[package]]
name = "futures-core"
-version = "0.3.14"
+version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "098cd1c6dda6ca01650f1a37a794245eb73181d0d4d4e955e2f3c37db7af1815"
+checksum = "db8d3b0917ff63a2a96173133c02818fac4a746b0a57569d3baca9ec0e945e08"
[[package]]
name = "futures-cpupool"
@@ -907,15 +1040,15 @@ version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4"
dependencies = [
- "futures 0.1.31",
+ "futures 0.1.30",
"num_cpus",
]
[[package]]
name = "futures-executor"
-version = "0.3.14"
+version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10f6cb7042eda00f0049b1d2080aa4b93442997ee507eb3828e8bd7577f94c9d"
+checksum = "9ee9ca2f7eb4475772cf39dd1cd06208dce2670ad38f4d9c7262b3e15f127068"
dependencies = [
"futures-core",
"futures-task",
@@ -925,41 +1058,59 @@ dependencies = [
[[package]]
name = "futures-io"
-version = "0.3.14"
+version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "365a1a1fb30ea1c03a830fdb2158f5236833ac81fa0ad12fe35b29cddc35cb04"
+checksum = "e37c1a51b037b80922864b8eed90692c5cd8abd4c71ce49b77146caa47f3253b"
+
+[[package]]
+name = "futures-lite"
+version = "1.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4481d0cd0de1d204a4fa55e7d45f07b1d958abcb06714b3446438e2eff695fb"
+dependencies = [
+ "fastrand",
+ "futures-core",
+ "futures-io",
+ "memchr",
+ "parking",
+ "pin-project-lite 0.2.1",
+ "waker-fn",
+]
[[package]]
name = "futures-macro"
-version = "0.3.14"
+version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "668c6733a182cd7deb4f1de7ba3bf2120823835b3bcfbeacf7d2c4a773c1bb8b"
+checksum = "0f8719ca0e1f3c5e34f3efe4570ef2c0610ca6da85ae7990d472e9cbfba13664"
dependencies = [
"proc-macro-hack",
"proc-macro2",
- "quote 1.0.9",
- "syn 1.0.71",
+ "quote 1.0.8",
+ "syn 1.0.58",
]
[[package]]
name = "futures-sink"
-version = "0.3.14"
+version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c5629433c555de3d82861a7a4e3794a4c40040390907cfbfd7143a92a426c23"
+checksum = "f6adabac1290109cfa089f79192fb6244ad2c3f1cc2281f3e1dd987592b71feb"
[[package]]
name = "futures-task"
-version = "0.3.14"
+version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba7aa51095076f3ba6d9a1f702f74bd05ec65f555d70d2033d55ba8d69f581bc"
+checksum = "a92a0843a2ff66823a8f7c77bffe9a09be2b64e533562c412d63075643ec0038"
+dependencies = [
+ "once_cell",
+]
[[package]]
name = "futures-util"
-version = "0.3.14"
+version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c144ad54d60f23927f0a6b6d816e4271278b64f005ad65e4e35291d2de9c025"
+checksum = "036a2107cdeb57f6d7322f1b6c363dad67cd63ca3b7d1b925bdf75bd5d96cda9"
dependencies = [
- "futures 0.1.31",
+ "futures 0.1.30",
"futures-channel",
"futures-core",
"futures-io",
@@ -967,7 +1118,7 @@ dependencies = [
"futures-sink",
"futures-task",
"memchr",
- "pin-project-lite 0.2.6",
+ "pin-project-lite 0.2.1",
"pin-utils",
"proc-macro-hack",
"proc-macro-nested",
@@ -981,7 +1132,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817"
dependencies = [
"typenum",
- "version_check 0.9.3",
+ "version_check 0.9.2",
]
[[package]]
@@ -1012,7 +1163,7 @@ checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8"
dependencies = [
"cfg-if 1.0.0",
"libc",
- "wasi 0.10.2+wasi-snapshot-preview1",
+ "wasi 0.10.0+wasi-snapshot-preview1",
]
[[package]]
@@ -1031,6 +1182,25 @@ version = "0.23.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce"
+[[package]]
+name = "glob"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
+
+[[package]]
+name = "gloo-timers"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47204a46aaff920a1ea58b11d03dec6f704287d27561724a4631e450654a891f"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "js-sys",
+ "wasm-bindgen",
+ "web-sys",
+]
+
[[package]]
name = "h2"
version = "0.1.26"
@@ -1040,10 +1210,10 @@ dependencies = [
"byteorder",
"bytes 0.4.12",
"fnv",
- "futures 0.1.31",
+ "futures 0.1.30",
"http 0.1.21",
"indexmap",
- "log 0.4.14",
+ "log 0.4.11",
"slab",
"string",
"tokio-io",
@@ -1057,9 +1227,9 @@ checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
[[package]]
name = "hermit-abi"
-version = "0.1.18"
+version = "0.1.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
+checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8"
dependencies = [
"libc",
]
@@ -1091,7 +1261,7 @@ version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11"
dependencies = [
- "bytes 1.0.1",
+ "bytes 1.0.0",
"fnv",
"itoa",
]
@@ -1103,31 +1273,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d"
dependencies = [
"bytes 0.4.12",
- "futures 0.1.31",
+ "futures 0.1.30",
"http 0.1.21",
"tokio-buf",
]
[[package]]
name = "httparse"
-version = "1.4.0"
+version = "1.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a1ce40d6fc9764887c2fdc7305c3dcc429ba11ff981c1509416afd5697e4437"
+checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
[[package]]
name = "humantime"
-version = "2.1.0"
+version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+checksum = "3c1ad908cc71012b7bea4d0c53ba96a8cba9962f048fa68d143376143d863b7a"
[[package]]
name = "hyper"
-version = "0.12.36"
+version = "0.12.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c843caf6296fc1f93444735205af9ed4e109a539005abb2564ae1d6fad34c52"
+checksum = "9dbe6ed1438e1f8ad955a4701e9a944938e9519f6888d12d8558b645e247d5f6"
dependencies = [
"bytes 0.4.12",
- "futures 0.1.31",
+ "futures 0.1.30",
"futures-cpupool",
"h2",
"http 0.1.21",
@@ -1135,7 +1305,7 @@ dependencies = [
"httparse",
"iovec",
"itoa",
- "log 0.4.14",
+ "log 0.4.11",
"net2",
"rustc_version",
"time",
@@ -1158,7 +1328,7 @@ checksum = "719d85c7df4a7f309a77d145340a063ea929dcb2e025bae46a80345cffec2952"
dependencies = [
"bytes 0.4.12",
"ct-logs",
- "futures 0.1.31",
+ "futures 0.1.30",
"hyper",
"rustls",
"tokio-io",
@@ -1174,7 +1344,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3a800d6aa50af4b5850b2b0f659625ce9504df908e9733b635720483be26174f"
dependencies = [
"bytes 0.4.12",
- "futures 0.1.31",
+ "futures 0.1.30",
"hyper",
"native-tls",
"tokio-io",
@@ -1191,7 +1361,7 @@ dependencies = [
"http 0.1.21",
"httparse",
"language-tags",
- "log 0.4.14",
+ "log 0.4.11",
"mime 0.3.16",
"percent-encoding 1.0.1",
"time",
@@ -1211,9 +1381,9 @@ dependencies = [
[[package]]
name = "idna"
-version = "0.2.3"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
+checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
dependencies = [
"matches",
"unicode-bidi",
@@ -1222,14 +1392,23 @@ dependencies = [
[[package]]
name = "indexmap"
-version = "1.6.2"
+version = "1.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "824845a0bf897a9042383849b02c1bc219c2383772efcd5c6f9766fa4b81aef3"
+checksum = "4fb1fa934250de4de8aef298d81c729a7d33d8c239daa3a7575e6b92bfc7313b"
dependencies = [
"autocfg 1.0.1",
"hashbrown",
]
+[[package]]
+name = "instant"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec"
+dependencies = [
+ "cfg-if 1.0.0",
+]
+
[[package]]
name = "iovec"
version = "0.1.4"
@@ -1239,6 +1418,15 @@ dependencies = [
"libc",
]
+[[package]]
+name = "itertools"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
+dependencies = [
+ "either",
+]
+
[[package]]
name = "itertools"
version = "0.10.0"
@@ -1256,18 +1444,18 @@ checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
[[package]]
name = "jobserver"
-version = "0.1.22"
+version = "0.1.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "972f5ae5d1cb9c6ae417789196c803205313edde988685da5e3aae0827b9e7fd"
+checksum = "5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2"
dependencies = [
"libc",
]
[[package]]
name = "js-sys"
-version = "0.3.50"
+version = "0.3.46"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d99f9e3e84b8f67f846ef5b4cbbc3b1c29f6c759fcbce6f01aa0e73d932a24c"
+checksum = "cf3d7383929f7c9c7c2d0fa596f325832df98c3704f2c60553080f7127a58175"
dependencies = [
"wasm-bindgen",
]
@@ -1302,6 +1490,15 @@ dependencies = [
"winapi-build",
]
+[[package]]
+name = "kv-log-macro"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f"
+dependencies = [
+ "log 0.4.11",
+]
+
[[package]]
name = "language-tags"
version = "0.2.2"
@@ -1319,9 +1516,9 @@ dependencies = [
[[package]]
name = "libc"
-version = "0.2.94"
+version = "0.2.82"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e"
+checksum = "89203f3fba0a3795506acaad8ebce3c80c0af93f994d5a1d7a0b1eeb23271929"
[[package]]
name = "libm"
@@ -1340,22 +1537,11 @@ dependencies = [
"quick-error",
]
-[[package]]
-name = "libz-sys"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66"
-dependencies = [
- "cc",
- "pkg-config",
- "vcpkg",
-]
-
[[package]]
name = "linked-hash-map"
-version = "0.5.4"
+version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"
+checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a"
[[package]]
name = "local-encoding"
@@ -1383,16 +1569,16 @@ version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
dependencies = [
- "log 0.4.14",
+ "log 0.4.11",
]
[[package]]
name = "log"
-version = "0.4.14"
+version = "0.4.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
+checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if 0.1.10",
]
[[package]]
@@ -1433,7 +1619,7 @@ dependencies = [
"bufstream",
"byteorder",
"conhash",
- "log 0.4.14",
+ "log 0.4.11",
"rand 0.7.3",
"semver",
"unix_socket",
@@ -1493,9 +1679,9 @@ dependencies = [
[[package]]
name = "miniz_oxide"
-version = "0.4.4"
+version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
+checksum = "0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d"
dependencies = [
"adler",
"autocfg 1.0.1",
@@ -1513,35 +1699,22 @@ dependencies = [
"iovec",
"kernel32-sys",
"libc",
- "log 0.4.14",
+ "log 0.4.11",
"miow 0.2.2",
"net2",
"slab",
"winapi 0.2.8",
]
-[[package]]
-name = "mio"
-version = "0.7.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf80d3e903b34e0bd7282b218398aec54e082c840d9baf8339e0080a0c542956"
-dependencies = [
- "libc",
- "log 0.4.14",
- "miow 0.3.7",
- "ntapi",
- "winapi 0.3.9",
-]
-
[[package]]
name = "mio-named-pipes"
version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656"
dependencies = [
- "log 0.4.14",
- "mio 0.6.23",
- "miow 0.3.7",
+ "log 0.4.11",
+ "mio",
+ "miow 0.3.6",
"winapi 0.3.9",
]
@@ -1553,7 +1726,7 @@ checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0"
dependencies = [
"iovec",
"libc",
- "mio 0.6.23",
+ "mio",
]
[[package]]
@@ -1570,28 +1743,29 @@ dependencies = [
[[package]]
name = "miow"
-version = "0.3.7"
+version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21"
+checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897"
dependencies = [
+ "socket2",
"winapi 0.3.9",
]
[[package]]
name = "multipart"
-version = "0.16.1"
+version = "0.15.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "136eed74cadb9edd2651ffba732b19a450316b680e4f48d6c79e905799e19d01"
+checksum = "adba94490a79baf2d6a23eac897157047008272fa3eecb3373ae6377b91eca28"
dependencies = [
"buf_redux",
"httparse",
- "log 0.4.14",
+ "log 0.4.11",
"mime 0.2.6",
"mime_guess 1.8.8",
"quick-error",
- "rand 0.6.5",
+ "rand 0.4.6",
"safemem",
- "tempfile",
+ "tempdir",
"twoway",
]
@@ -1603,7 +1777,7 @@ checksum = "b8d96b2e1c8da3957d58100b09f102c6d9cfdfced01b7ec5a8974044bb09dbd4"
dependencies = [
"lazy_static",
"libc",
- "log 0.4.14",
+ "log 0.4.11",
"openssl",
"openssl-probe",
"openssl-sys",
@@ -1613,6 +1787,16 @@ dependencies = [
"tempfile",
]
+[[package]]
+name = "nb-connect"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8123a81538e457d44b933a02faf885d3fe8408806b23fa700e8f01c6c3a98998"
+dependencies = [
+ "libc",
+ "winapi 0.3.9",
+]
+
[[package]]
name = "net2"
version = "0.2.37"
@@ -1655,15 +1839,6 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
-[[package]]
-name = "ntapi"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"
-dependencies = [
- "winapi 0.3.9",
-]
-
[[package]]
name = "num-bigint"
version = "0.2.6"
@@ -1705,6 +1880,24 @@ dependencies = [
"zeroize",
]
+[[package]]
+name = "num-bigint-dig"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4547ee5541c18742396ae2c895d0717d0f886d8823b8399cdaf7b07d63ad0480"
+dependencies = [
+ "autocfg 0.1.7",
+ "byteorder",
+ "lazy_static",
+ "libm",
+ "num-integer",
+ "num-iter",
+ "num-traits 0.2.14",
+ "rand 0.8.3",
+ "smallvec 1.6.1",
+ "zeroize",
+]
+
[[package]]
name = "num-integer"
version = "0.1.44"
@@ -1742,6 +1935,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
dependencies = [
"autocfg 1.0.1",
+ "libm",
]
[[package]]
@@ -1762,9 +1956,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
[[package]]
name = "object"
-version = "0.23.0"
+version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4"
+checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397"
[[package]]
name = "oid"
@@ -1777,9 +1971,9 @@ dependencies = [
[[package]]
name = "once_cell"
-version = "1.7.2"
+version = "1.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3"
+checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"
[[package]]
name = "opaque-debug"
@@ -1795,15 +1989,15 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
[[package]]
name = "openssl"
-version = "0.10.34"
+version = "0.10.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d7830286ad6a3973c0f1d9b73738f69c76b739301d0229c4b96501695cbe4c8"
+checksum = "038d43985d1ddca7a9900630d8cd031b56e4794eecc2e9ea39dd17aa04399a70"
dependencies = [
"bitflags",
"cfg-if 1.0.0",
"foreign-types",
+ "lazy_static",
"libc",
- "once_cell",
"openssl-sys",
]
@@ -1815,9 +2009,9 @@ checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
[[package]]
name = "openssl-sys"
-version = "0.9.62"
+version = "0.9.60"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa52160d45fa2e7608d504b7c3a3355afed615e6d8b627a74458634ba21b69bd"
+checksum = "921fc71883267538946025deffb622905ecad223c28efbfdef9bb59a0175f3e6"
dependencies = [
"autocfg 1.0.1",
"cc",
@@ -1826,6 +2020,12 @@ dependencies = [
"vcpkg",
]
+[[package]]
+name = "parking"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72"
+
[[package]]
name = "parking_lot"
version = "0.9.0"
@@ -1846,17 +2046,17 @@ dependencies = [
"cfg-if 0.1.10",
"cloudabi",
"libc",
- "redox_syscall 0.1.57",
+ "redox_syscall",
"rustc_version",
- "smallvec 0.6.14",
+ "smallvec 0.6.13",
"winapi 0.3.9",
]
[[package]]
name = "pem"
-version = "0.8.3"
+version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd56cbd21fea48d0c440b41cd69c589faacade08c992d9a54e471b79d0fd13eb"
+checksum = "f4c220d01f863d13d96ca82359d1e81e64a7c6bf0637bcde7b2349630addf0c6"
dependencies = [
"base64 0.13.0",
"once_cell",
@@ -1924,13 +2124,13 @@ dependencies = [
"base64 0.12.3",
"digest",
"http 0.2.4",
- "num-bigint-dig",
+ "num-bigint-dig 0.6.1",
"oid",
"picky-asn1",
"picky-asn1-der",
"picky-asn1-x509",
"rand 0.7.3",
- "rsa",
+ "rsa 0.3.0",
"serde",
"serde_json",
"sha-1",
@@ -1968,7 +2168,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7c40870d0d056271c2976f7c1747b1df4332f979ab78634574ef5b534e6b0f0f"
dependencies = [
"base64 0.12.3",
- "num-bigint-dig",
+ "num-bigint-dig 0.6.1",
"oid",
"picky-asn1",
"picky-asn1-der",
@@ -1977,15 +2177,15 @@ dependencies = [
[[package]]
name = "pin-project-lite"
-version = "0.1.12"
+version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777"
+checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b"
[[package]]
name = "pin-project-lite"
-version = "0.2.6"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905"
+checksum = "e36743d754ccdf9954c2e352ce2d4b106e024c814f6499c2dadff80da9a442d8"
[[package]]
name = "pin-utils"
@@ -1999,6 +2199,19 @@ version = "0.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c"
+[[package]]
+name = "polling"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2a7bc6b2a29e632e45451c941832803a18cce6781db04de8a04696cdca8bde4"
+dependencies = [
+ "cfg-if 0.1.10",
+ "libc",
+ "log 0.4.11",
+ "wepoll-sys",
+ "winapi 0.3.9",
+]
+
[[package]]
name = "polyval"
version = "0.4.5"
@@ -2018,9 +2231,9 @@ checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
[[package]]
name = "predicates"
-version = "1.0.8"
+version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f49cfaf7fdaa3bfacc6fa3e7054e65148878354a5cfddcf661df4c851f8021df"
+checksum = "73dd9b7b200044694dfede9edf907c1ca19630908443e9447e624993700c6932"
dependencies = [
"difference",
"float-cmp",
@@ -2031,15 +2244,15 @@ dependencies = [
[[package]]
name = "predicates-core"
-version = "1.0.2"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57e35a3326b75e49aa85f5dc6ec15b41108cf5aee58eabb1f274dd18b73c2451"
+checksum = "fb3dbeaaf793584e29c58c7e3a82bbb3c7c06b63cea68d13b0e3cddc124104dc"
[[package]]
name = "predicates-tree"
-version = "1.0.2"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15f553275e5721409451eb85e15fd9a860a6e5ab4496eb215987502b5f5391f2"
+checksum = "aee95d988ee893cb35c06b148c80ed2cd52c8eea927f50ba7a0be1a786aeab73"
dependencies = [
"predicates-core",
"treeline",
@@ -2053,27 +2266,30 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
[[package]]
name = "proc-macro-nested"
-version = "0.1.7"
+version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"
+checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a"
[[package]]
name = "proc-macro2"
-version = "1.0.26"
+version = "1.0.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec"
+checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
dependencies = [
- "unicode-xid 0.2.2",
+ "unicode-xid 0.2.1",
]
[[package]]
name = "publicsuffix"
-version = "1.5.6"
+version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95b4ce31ff0a27d93c8de1849cf58162283752f065a90d508f1105fa6c9a213f"
+checksum = "3bbaa49075179162b49acac1c6aa45fb4dafb5f13cf6794276d77bc7fd95757b"
dependencies = [
- "idna 0.2.3",
- "url 2.2.1",
+ "error-chain",
+ "idna 0.2.0",
+ "lazy_static",
+ "regex",
+ "url 2.2.0",
]
[[package]]
@@ -2099,9 +2315,9 @@ checksum = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
[[package]]
name = "quote"
-version = "1.0.9"
+version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
+checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df"
dependencies = [
"proc-macro2",
]
@@ -2119,6 +2335,19 @@ dependencies = [
"winapi 0.3.9",
]
+[[package]]
+name = "rand"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9"
+dependencies = [
+ "cloudabi",
+ "fuchsia-cprng",
+ "libc",
+ "rand_core 0.3.1",
+ "winapi 0.3.9",
+]
+
[[package]]
name = "rand"
version = "0.6.5"
@@ -2317,22 +2546,23 @@ dependencies = [
[[package]]
name = "redis"
-version = "0.20.0"
+version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eeb8f8d059ead7805e171fc22de8348a3d611c0f985aaa4f5cf6c0dfc7645407"
+checksum = "95357caf2640abc54651b93c98a8df4fe1ccbf44b8e601ccdf43d5c1451f29ac"
dependencies = [
+ "async-std",
"async-trait",
- "bytes 1.0.1",
+ "bytes 0.5.6",
"combine",
"dtoa",
"futures-util",
"itoa",
"percent-encoding 2.1.0",
- "pin-project-lite 0.2.6",
+ "pin-project-lite 0.1.11",
"sha1",
- "tokio 1.5.0",
+ "tokio 0.2.24",
"tokio-util",
- "url 2.2.1",
+ "url 2.2.0",
]
[[package]]
@@ -2341,15 +2571,6 @@ version = "0.1.57"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
-[[package]]
-name = "redox_syscall"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85dd92e586f7355c633911e11f77f3d12f04b1b1bd76a198bd34ae3af8341ef2"
-dependencies = [
- "bitflags",
-]
-
[[package]]
name = "redox_users"
version = "0.3.5"
@@ -2357,45 +2578,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d"
dependencies = [
"getrandom 0.1.16",
- "redox_syscall 0.1.57",
+ "redox_syscall",
"rust-argon2",
]
-[[package]]
-name = "redox_users"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64"
-dependencies = [
- "getrandom 0.2.2",
- "redox_syscall 0.2.7",
-]
-
[[package]]
name = "regex"
-version = "1.4.6"
+version = "1.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a26af418b574bd56588335b3a3659a65725d4e636eb1016c2f9e3b38c7cc759"
+checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c"
dependencies = [
"aho-corasick",
"memchr",
"regex-syntax",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae1ded71d66a4a97f5e961fd0cb25a5f366a42a41570d16a763a69c092c26ae4"
-dependencies = [
- "byteorder",
+ "thread_local",
]
[[package]]
name = "regex-syntax"
-version = "0.6.23"
+version = "0.6.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548"
+checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189"
[[package]]
name = "remove_dir_all"
@@ -2418,12 +2621,12 @@ dependencies = [
"cookie_store",
"encoding_rs",
"flate2",
- "futures 0.1.31",
+ "futures 0.1.30",
"http 0.1.21",
"hyper",
"hyper-rustls",
"hyper-tls",
- "log 0.4.14",
+ "log 0.4.11",
"mime 0.3.16",
"mime_guess 2.0.3",
"native-tls",
@@ -2446,9 +2649,9 @@ dependencies = [
[[package]]
name = "retry"
-version = "1.2.1"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0ee4a654b43dd7e3768be7a1c0fc20e90f0a84b72a60ffb6c11e1cae2545c2e"
+checksum = "c15ef4789108d066d7fd85dcec330eab9b8e51244275922a9b7161afc4f46dda"
dependencies = [
"rand 0.7.3",
]
@@ -2470,17 +2673,16 @@ dependencies = [
[[package]]
name = "rouille"
-version = "3.1.0"
+version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67b0bcae5288ce22b0f2acc33651e915f5f4c79258e41df1e1bfcc7bab1c6bca"
+checksum = "112568052ec17fa26c6c11c40acbb30d3ad244bf3d6da0be181f5e7e42e5004f"
dependencies = [
- "base64 0.10.1",
+ "base64 0.9.3",
"chrono",
"filetime",
"multipart",
"num_cpus",
- "percent-encoding 2.1.0",
- "rand 0.7.3",
+ "rand 0.5.6",
"serde",
"serde_derive",
"serde_json",
@@ -2489,7 +2691,7 @@ dependencies = [
"threadpool",
"time",
"tiny_http",
- "url 2.2.1",
+ "url 1.7.2",
]
[[package]]
@@ -2501,7 +2703,7 @@ dependencies = [
"byteorder",
"digest",
"lazy_static",
- "num-bigint-dig",
+ "num-bigint-dig 0.6.1",
"num-integer",
"num-iter",
"num-traits 0.2.14",
@@ -2515,42 +2717,23 @@ dependencies = [
]
[[package]]
-name = "rsa-der"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1170c86c683547fa781a0e39e6e281ebaedd4515be8a806022984f427ea3d44d"
-dependencies = [
- "simple_asn1 0.4.1",
-]
-
-[[package]]
-name = "rsa-export"
-version = "0.2.0"
+name = "rsa"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a29a64b407c67f1f7a605538dc0975d40f5f1479fc1b04f7568c78120993f7f7"
+checksum = "68ef841a26fc5d040ced0417c6c6a64ee851f42489df11cdf0218e545b6f8d28"
dependencies = [
- "num-bigint-dig",
+ "byteorder",
+ "digest",
+ "lazy_static",
+ "num-bigint-dig 0.7.0",
"num-integer",
- "pem",
- "rsa",
- "simple_asn1 0.5.2",
-]
-
-[[package]]
-name = "rsa-pem"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ee7d87640dab9972e4d05503aad4c30a107ca50912d10596d44f8555b7da4ce"
-dependencies = [
- "bit-vec",
- "log 0.4.14",
- "num-bigint 0.2.6",
- "num-bigint-dig",
+ "num-iter",
"num-traits 0.2.14",
"pem",
- "rsa",
- "thiserror",
- "yasna",
+ "rand 0.8.3",
+ "simple_asn1 0.5.2",
+ "subtle",
+ "zeroize",
]
[[package]]
@@ -2562,7 +2745,7 @@ dependencies = [
"base64 0.13.0",
"blake2b_simd",
"constant_time_eq",
- "crossbeam-utils 0.8.4",
+ "crossbeam-utils 0.8.1",
]
[[package]]
@@ -2587,7 +2770,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b25a18b1bf7387f0145e7f8324e700805aade3842dd3db2e74e4cdeb4677c09e"
dependencies = [
"base64 0.10.1",
- "log 0.4.14",
+ "log 0.4.11",
"ring",
"sct",
"webpki",
@@ -2623,26 +2806,26 @@ dependencies = [
"assert_cmd",
"atty",
"base64 0.13.0",
- "bincode 1.3.3",
+ "bincode 1.3.1",
"blake3",
"byteorder",
"cc",
"chrono",
"clap",
"counted-array",
- "crossbeam-utils 0.8.4",
+ "crossbeam-utils 0.8.1",
"daemonize",
"directories",
"env_logger",
"filetime",
"flate2",
- "futures 0.1.31",
- "futures 0.3.14",
+ "futures 0.1.30",
+ "futures 0.3.9",
"hmac",
"http 0.1.21",
"hyper",
"hyperx",
- "itertools",
+ "itertools 0.10.0",
"jobserver",
"jsonwebtoken",
"lazy_static",
@@ -2650,29 +2833,25 @@ dependencies = [
"libmount",
"linked-hash-map",
"local-encoding",
- "log 0.4.14",
+ "log 0.4.11",
"md-5",
"memcached-rs",
"nix 0.19.1",
"num_cpus",
"number_prefix",
- "oid",
"openssl",
"percent-encoding 2.1.0",
"picky",
"picky-asn1-x509",
"predicates",
- "rand 0.7.3",
+ "rand 0.8.3",
"redis",
"regex",
"reqwest",
"retry",
"ring",
"rouille",
- "rsa",
- "rsa-der",
- "rsa-export",
- "rsa-pem",
+ "rsa 0.4.0",
"selenium-rs",
"serde",
"serde_derive",
@@ -2695,8 +2874,8 @@ dependencies = [
"toml",
"tower",
"untrusted",
- "url 2.2.1",
- "uuid 0.8.2",
+ "url 2.2.0",
+ "uuid 0.8.1",
"version-compare",
"void",
"walkdir",
@@ -2734,9 +2913,9 @@ dependencies = [
[[package]]
name = "security-framework"
-version = "2.2.0"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3670b1d2fdf6084d192bc71ead7aabe6c06aa2ea3fbd9cc3ac111fa5c2b1bd84"
+checksum = "c1759c2e3c8580017a484a7ac56d3abc5a6c1feadf88db2f3633f12ae4268c69"
dependencies = [
"bitflags",
"core-foundation",
@@ -2747,9 +2926,9 @@ dependencies = [
[[package]]
name = "security-framework-sys"
-version = "2.2.0"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3676258fd3cfe2c9a0ec99ce3038798d847ce3e4bb17746373eb9f0f1ac16339"
+checksum = "f99b9d5e26d2a71633cc4f2ebae7cc9f874044e0c351a27e17892d76dce5678b"
dependencies = [
"core-foundation-sys",
"libc",
@@ -2785,9 +2964,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
[[package]]
name = "serde"
-version = "1.0.125"
+version = "1.0.118"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171"
+checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800"
dependencies = [
"serde_derive",
]
@@ -2803,20 +2982,20 @@ dependencies = [
[[package]]
name = "serde_derive"
-version = "1.0.125"
+version = "1.0.118"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d"
+checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df"
dependencies = [
"proc-macro2",
- "quote 1.0.9",
- "syn 1.0.71",
+ "quote 1.0.8",
+ "syn 1.0.58",
]
[[package]]
name = "serde_json"
-version = "1.0.64"
+version = "1.0.61"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79"
+checksum = "4fceb2595057b6891a4ee808f70054bd2d12f0e97f1cbb78689b59f676df325a"
dependencies = [
"itoa",
"ryu",
@@ -2837,9 +3016,9 @@ dependencies = [
[[package]]
name = "sha-1"
-version = "0.9.4"
+version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfebf75d25bd900fd1e7d11501efab59bc846dbc76196839663e6637bba9f25f"
+checksum = "ce3cdf1b5e620a498ee6f2a171885ac7e22f0e12089ec4b3d22b84921792507c"
dependencies = [
"block-buffer",
"cfg-if 1.0.0",
@@ -2856,9 +3035,9 @@ checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
[[package]]
name = "sha2"
-version = "0.9.3"
+version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa827a14b29ab7f44778d14a88d3cb76e949c45083f7dbfa507d0cb699dc12de"
+checksum = "6e7aab86fe2149bad8c507606bdb3f4ef5e7b2380eb92350f56122cca72a42a8"
dependencies = [
"block-buffer",
"cfg-if 1.0.0",
@@ -2929,15 +3108,15 @@ dependencies = [
[[package]]
name = "slab"
-version = "0.4.3"
+version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f173ac3d1a7e3b28003f40de0b5ce7fe2710f9b9dc3fc38664cebee46b3b6527"
+checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
[[package]]
name = "smallvec"
-version = "0.6.14"
+version = "0.6.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b97fcaeba89edba30f044a10c6a3cc39df9c3f17d7cd829dd1446cab35f890e0"
+checksum = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6"
dependencies = [
"maybe-uninit",
]
@@ -2948,6 +3127,17 @@ version = "1.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
+[[package]]
+name = "socket2"
+version = "0.3.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e"
+dependencies = [
+ "cfg-if 1.0.0",
+ "libc",
+ "winapi 0.3.9",
+]
+
[[package]]
name = "spin"
version = "0.5.2"
@@ -2997,13 +3187,13 @@ dependencies = [
[[package]]
name = "syn"
-version = "1.0.71"
+version = "1.0.58"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad184cc9470f9117b2ac6817bfe297307418819ba40552f9b3846f05c33d5373"
+checksum = "cc60a3d73ea6594cd712d830cc1f0390fd71542d8c8cd24e70cc54cdfd5e05d5"
dependencies = [
"proc-macro2",
- "quote 1.0.9",
- "unicode-xid 0.2.2",
+ "quote 1.0.8",
+ "unicode-xid 0.2.1",
]
[[package]]
@@ -3022,9 +3212,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701"
dependencies = [
"proc-macro2",
- "quote 1.0.9",
- "syn 1.0.71",
- "unicode-xid 0.2.2",
+ "quote 1.0.8",
+ "syn 1.0.58",
+ "unicode-xid 0.2.1",
]
[[package]]
@@ -3035,18 +3225,19 @@ checksum = "9a5d8ef1b679c07976f3ee336a436453760c470f54b5e7237556728b8589515d"
dependencies = [
"error-chain",
"libc",
- "log 0.4.14",
+ "log 0.4.11",
"time",
]
[[package]]
name = "tar"
-version = "0.4.33"
+version = "0.4.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0bcfbd6a598361fda270d82469fff3d65089dc33e175c9a131f7b4cd395f228"
+checksum = "489997b7557e9a43e192c527face4feacc78bfbe6eed67fd55c4c9e381cba290"
dependencies = [
"filetime",
"libc",
+ "redox_syscall",
"xattr",
]
@@ -3062,14 +3253,14 @@ dependencies = [
[[package]]
name = "tempfile"
-version = "3.2.0"
+version = "3.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22"
+checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if 0.1.10",
"libc",
- "rand 0.8.3",
- "redox_syscall 0.2.7",
+ "rand 0.7.3",
+ "redox_syscall",
"remove_dir_all",
"winapi 0.3.9",
]
@@ -3105,22 +3296,31 @@ dependencies = [
[[package]]
name = "thiserror"
-version = "1.0.24"
+version = "1.0.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e"
+checksum = "76cc616c6abf8c8928e2fdcc0dbfab37175edd8fb49a4641066ad1364fdab146"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.24"
+version = "1.0.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0"
+checksum = "9be73a2caec27583d0046ef3796c3794f868a5bc813db689eed00c7631275cd1"
dependencies = [
"proc-macro2",
- "quote 1.0.9",
- "syn 1.0.71",
+ "quote 1.0.8",
+ "syn 1.0.58",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb9bc092d0d51e76b2b19d9d85534ffc9ec2db959a2523cdae0697e2972cd447"
+dependencies = [
+ "lazy_static",
]
[[package]]
@@ -3134,33 +3334,34 @@ dependencies = [
[[package]]
name = "time"
-version = "0.1.43"
+version = "0.1.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438"
+checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
dependencies = [
"libc",
+ "wasi 0.10.0+wasi-snapshot-preview1",
"winapi 0.3.9",
]
[[package]]
name = "tiny_http"
-version = "0.8.1"
+version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04c9d60c25d1134335a1f29852c0b0dd93e329054f826c87c69a1cc688edbdff"
+checksum = "1661fa0a44c95d01604bd05c66732a446c657efb62b5164a7a083a3b552b4951"
dependencies = [
"ascii",
"chrono",
"chunked_transfer",
- "log 0.4.14",
+ "log 0.4.11",
"openssl",
- "url 2.2.1",
+ "url 1.7.2",
]
[[package]]
name = "tinyvec"
-version = "1.2.0"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b5220f05bb7de7f3f53c7c065e1199b3172696fe2db9f9c4d8ad9b4ee74c342"
+checksum = "ccf8dbc19eb42fba10e8feaaec282fb50e2c14b2726d6301dbfeed0f73306a6f"
dependencies = [
"tinyvec_macros",
]
@@ -3178,8 +3379,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6"
dependencies = [
"bytes 0.4.12",
- "futures 0.1.31",
- "mio 0.6.23",
+ "futures 0.1.30",
+ "mio",
"num_cpus",
"tokio-codec",
"tokio-current-thread",
@@ -3197,32 +3398,22 @@ dependencies = [
[[package]]
name = "tokio"
-version = "0.2.25"
+version = "0.2.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092"
+checksum = "099837d3464c16a808060bb3f02263b412f6fafcb5d01c533d309985fbeebe48"
dependencies = [
"bytes 0.5.6",
"fnv",
"futures-core",
+ "iovec",
"lazy_static",
- "mio 0.6.23",
- "num_cpus",
- "pin-project-lite 0.1.12",
- "slab",
-]
-
-[[package]]
-name = "tokio"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83f0c8e7c0addab50b663055baf787d0af7f413a46e6e7fb9559a4e4db7137a5"
-dependencies = [
- "autocfg 1.0.1",
- "bytes 1.0.1",
"libc",
"memchr",
- "mio 0.7.11",
- "pin-project-lite 0.2.6",
+ "mio",
+ "mio-uds",
+ "num_cpus",
+ "pin-project-lite 0.1.11",
+ "slab",
]
[[package]]
@@ -3233,7 +3424,7 @@ checksum = "8fb220f46c53859a4b7ec083e41dec9778ff0b1851c0942b211edb89e0ccdc46"
dependencies = [
"bytes 0.4.12",
"either",
- "futures 0.1.31",
+ "futures 0.1.30",
]
[[package]]
@@ -3243,7 +3434,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "25b2998660ba0e70d18684de5d06b70b70a3a747469af9dea7618cc59e75976b"
dependencies = [
"bytes 0.4.12",
- "futures 0.1.31",
+ "futures 0.1.30",
"tokio-io",
]
@@ -3253,11 +3444,11 @@ version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "107b625135aa7b9297dd2d99ccd6ca6ab124a5d1230778e159b9095adca4c722"
dependencies = [
- "futures 0.1.31",
+ "futures 0.1.30",
"futures-core",
"futures-util",
- "pin-project-lite 0.1.12",
- "tokio 0.2.25",
+ "pin-project-lite 0.1.11",
+ "tokio 0.2.24",
"tokio-current-thread",
"tokio-executor",
"tokio-reactor",
@@ -3270,7 +3461,7 @@ version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b1de0e32a83f131e002238d7ccde18211c0a5397f60cbfffcb112868c2e0e20e"
dependencies = [
- "futures 0.1.31",
+ "futures 0.1.30",
"tokio-executor",
]
@@ -3281,7 +3472,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671"
dependencies = [
"crossbeam-utils 0.7.2",
- "futures 0.1.31",
+ "futures 0.1.30",
]
[[package]]
@@ -3290,7 +3481,7 @@ version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "297a1206e0ca6302a0eed35b700d292b275256f596e2f3fea7729d5e629b6ff4"
dependencies = [
- "futures 0.1.31",
+ "futures 0.1.30",
"tokio-io",
"tokio-threadpool",
]
@@ -3302,8 +3493,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674"
dependencies = [
"bytes 0.4.12",
- "futures 0.1.31",
- "log 0.4.14",
+ "futures 0.1.30",
+ "log 0.4.11",
]
[[package]]
@@ -3313,8 +3504,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9d282d483052288b2308ba5ee795f5673b159c9bdf63c385a05609da782a5eae"
dependencies = [
"bytes 0.4.12",
- "futures 0.1.31",
- "mio 0.6.23",
+ "futures 0.1.30",
+ "mio",
"mio-named-pipes",
"tokio 0.1.22",
]
@@ -3326,11 +3517,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "382d90f43fa31caebe5d3bc6cfd854963394fff3b8cb59d5146607aaae7e7e43"
dependencies = [
"crossbeam-queue 0.1.2",
- "futures 0.1.31",
+ "futures 0.1.30",
"lazy_static",
"libc",
- "log 0.4.14",
- "mio 0.6.23",
+ "log 0.4.11",
+ "mio",
"mio-named-pipes",
"tokio-io",
"tokio-reactor",
@@ -3345,10 +3536,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09bc590ec4ba8ba87652da2068d150dcada2cfa2e07faae270a5e0409aa51351"
dependencies = [
"crossbeam-utils 0.7.2",
- "futures 0.1.31",
+ "futures 0.1.30",
"lazy_static",
- "log 0.4.14",
- "mio 0.6.23",
+ "log 0.4.11",
+ "mio",
"num_cpus",
"parking_lot",
"slab",
@@ -3364,7 +3555,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d7cf08f990090abd6c6a73cab46fed62f85e8aef8b99e4b918a9f4a637f0676"
dependencies = [
"bytes 0.4.12",
- "futures 0.1.31",
+ "futures 0.1.30",
"iovec",
"rustls",
"tokio-io",
@@ -3378,7 +3569,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "894168193c4f80862a2244ff953b69145a9961a9efba39500e0970b083d0649c"
dependencies = [
"bytes 0.4.12",
- "futures 0.1.31",
+ "futures 0.1.30",
]
[[package]]
@@ -3390,7 +3581,7 @@ dependencies = [
"bincode 0.8.0",
"bytes 0.4.12",
"derive-error",
- "futures 0.1.31",
+ "futures 0.1.30",
"serde",
"tokio-serde",
]
@@ -3401,9 +3592,9 @@ version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d0c34c6e548f101053321cba3da7cbb87a610b85555884c41b07da2eb91aff12"
dependencies = [
- "futures 0.1.31",
+ "futures 0.1.30",
"libc",
- "mio 0.6.23",
+ "mio",
"mio-uds",
"signal-hook-registry",
"tokio-executor",
@@ -3419,7 +3610,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "edfe50152bc8164fcc456dab7891fa9bf8beaf01c5ee7e1dd43a397c3cf87dee"
dependencies = [
"fnv",
- "futures 0.1.31",
+ "futures 0.1.30",
]
[[package]]
@@ -3429,9 +3620,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "98df18ed66e3b72e742f185882a9e201892407957e45fbff8da17ae7a7c51f72"
dependencies = [
"bytes 0.4.12",
- "futures 0.1.31",
+ "futures 0.1.30",
"iovec",
- "mio 0.6.23",
+ "mio",
"tokio-io",
"tokio-reactor",
]
@@ -3445,9 +3636,9 @@ dependencies = [
"crossbeam-deque",
"crossbeam-queue 0.2.3",
"crossbeam-utils 0.7.2",
- "futures 0.1.31",
+ "futures 0.1.30",
"lazy_static",
- "log 0.4.14",
+ "log 0.4.11",
"num_cpus",
"slab",
"tokio-executor",
@@ -3460,7 +3651,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296"
dependencies = [
"crossbeam-utils 0.7.2",
- "futures 0.1.31",
+ "futures 0.1.30",
"slab",
"tokio-executor",
]
@@ -3472,9 +3663,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2a0b10e610b39c38b031a2fcab08e4b82f16ece36504988dcbd81dbba650d82"
dependencies = [
"bytes 0.4.12",
- "futures 0.1.31",
- "log 0.4.14",
- "mio 0.6.23",
+ "futures 0.1.30",
+ "log 0.4.11",
+ "mio",
"tokio-codec",
"tokio-io",
"tokio-reactor",
@@ -3487,11 +3678,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab57a4ac4111c8c9dbcf70779f6fc8bc35ae4b2454809febac840ad19bd7e4e0"
dependencies = [
"bytes 0.4.12",
- "futures 0.1.31",
+ "futures 0.1.30",
"iovec",
"libc",
- "log 0.4.14",
- "mio 0.6.23",
+ "log 0.4.11",
+ "mio",
"mio-uds",
"tokio-codec",
"tokio-io",
@@ -3500,16 +3691,16 @@ dependencies = [
[[package]]
name = "tokio-util"
-version = "0.6.6"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "940a12c99365c31ea8dd9ba04ec1be183ffe4920102bb7122c2f515437601e8e"
+checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499"
dependencies = [
- "bytes 1.0.1",
+ "bytes 0.5.6",
"futures-core",
"futures-sink",
- "log 0.4.14",
- "pin-project-lite 0.2.6",
- "tokio 1.5.0",
+ "log 0.4.11",
+ "pin-project-lite 0.1.11",
+ "tokio 0.2.24",
]
[[package]]
@@ -3527,7 +3718,7 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc72f33b6a72c75c9df0037afce313018bae845f0ec7fdb9201b8768427a917f"
dependencies = [
- "futures 0.1.31",
+ "futures 0.1.30",
"tower-buffer",
"tower-discover",
"tower-layer",
@@ -3545,7 +3736,7 @@ version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c7b83e1ccf5b23dd109dd6ae2c07b8e2beec7a51a21f29da2dba576317370e0"
dependencies = [
- "futures 0.1.31",
+ "futures 0.1.30",
"tokio-executor",
"tokio-sync",
"tower-layer",
@@ -3559,7 +3750,7 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73a7632286f78164d65d18fd0e570307acde9362489aa5c8c53e6315cc2bde47"
dependencies = [
- "futures 0.1.31",
+ "futures 0.1.30",
"tower-service",
]
@@ -3569,7 +3760,7 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ddf07e10c07dcc8f41da6de036dc66def1a85b70eb8a385159e3908bb258328"
dependencies = [
- "futures 0.1.31",
+ "futures 0.1.30",
"tower-service",
]
@@ -3579,7 +3770,7 @@ version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c21ba835a08fd54b63cd91ae0548a7b6e2a91075147dfa3dc8e1a940c1b6f18f"
dependencies = [
- "futures 0.1.31",
+ "futures 0.1.30",
"tokio-sync",
"tokio-timer",
"tower-layer",
@@ -3593,7 +3784,7 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04fbaf5bfb63d84204db87b9b2aeec61549613f2bbb8706dcc36f5f3ea8cd769"
dependencies = [
- "futures 0.1.31",
+ "futures 0.1.30",
"tower-layer",
"tower-service",
]
@@ -3604,7 +3795,7 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09e80588125061f276ed2a7b0939988b411e570a2dbb2965b1382ef4f71036f7"
dependencies = [
- "futures 0.1.31",
+ "futures 0.1.30",
"tokio-timer",
"tower-layer",
"tower-service",
@@ -3616,7 +3807,7 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2cc0c98637d23732f8de6dfd16494c9f1559c3b9e20b4a46462c8f9b9e827bfa"
dependencies = [
- "futures 0.1.31",
+ "futures 0.1.30",
]
[[package]]
@@ -3625,7 +3816,7 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c06bbc2fbd056f810940a8c6f0cc194557d36da3c22999a755a7a6612447da9"
dependencies = [
- "futures 0.1.31",
+ "futures 0.1.30",
"tokio-timer",
"tower-layer",
"tower-service",
@@ -3637,7 +3828,7 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4792342fac093db5d2558655055a89a04ca909663467a4310c7739d9f8b64698"
dependencies = [
- "futures 0.1.31",
+ "futures 0.1.30",
"tokio-io",
"tower-layer",
"tower-service",
@@ -3645,26 +3836,26 @@ dependencies = [
[[package]]
name = "tracing"
-version = "0.1.25"
+version = "0.1.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01ebdc2bb4498ab1ab5f5b73c5803825e60199229ccba0698170e3be0e7f959f"
+checksum = "9f47026cdc4080c07e49b37087de021820269d996f581aac150ef9e5583eefe3"
dependencies = [
"cfg-if 1.0.0",
- "log 0.4.14",
- "pin-project-lite 0.2.6",
+ "log 0.4.11",
+ "pin-project-lite 0.2.1",
"tracing-attributes",
"tracing-core",
]
[[package]]
name = "tracing-attributes"
-version = "0.1.15"
+version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c42e6fa53307c8a17e4ccd4dc81cf5ec38db9209f59b222210375b54ee40d1e2"
+checksum = "80e0ccfc3378da0cce270c946b676a376943f5cd16aeba64568e7939806f4ada"
dependencies = [
"proc-macro2",
- "quote 1.0.9",
- "syn 1.0.71",
+ "quote 1.0.8",
+ "syn 1.0.58",
]
[[package]]
@@ -3708,9 +3899,9 @@ dependencies = [
[[package]]
name = "typenum"
-version = "1.13.0"
+version = "1.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06"
+checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33"
[[package]]
name = "unicase"
@@ -3727,23 +3918,23 @@ version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
dependencies = [
- "version_check 0.9.3",
+ "version_check 0.9.2",
]
[[package]]
name = "unicode-bidi"
-version = "0.3.5"
+version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eeb8be209bb1c96b7c177c7420d26e04eccacb0eeae6b980e35fcb74678107e0"
+checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
dependencies = [
"matches",
]
[[package]]
name = "unicode-normalization"
-version = "0.1.17"
+version = "0.1.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef"
+checksum = "a13e63ab62dbe32aeee58d1c5408d35c36c392bba5d9d3142287219721afe606"
dependencies = [
"tinyvec",
]
@@ -3762,9 +3953,9 @@ checksum = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc"
[[package]]
name = "unicode-xid"
-version = "0.2.2"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
+checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
[[package]]
name = "universal-hash"
@@ -3805,12 +3996,12 @@ dependencies = [
[[package]]
name = "url"
-version = "2.2.1"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ccd964113622c8e9322cfac19eb1004a07e636c545f325da085d5cdde6f1f8b"
+checksum = "5909f2b0817350449ed73e8bcd81c8c3c8d9a7a5d8acba4b27db277f1868976e"
dependencies = [
"form_urlencoded",
- "idna 0.2.3",
+ "idna 0.2.0",
"matches",
"percent-encoding 2.1.0",
]
@@ -3832,18 +4023,24 @@ dependencies = [
[[package]]
name = "uuid"
-version = "0.8.2"
+version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
+checksum = "9fde2f6a4bea1d6e007c4ad38c6839fa71cbb63b6dbf5b595aa38dc9b1093c11"
dependencies = [
- "getrandom 0.2.2",
+ "rand 0.7.3",
]
[[package]]
name = "vcpkg"
-version = "0.2.12"
+version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbdbff6266a24120518560b5dc983096efb98462e51d0d68169895b237be3e5d"
+checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb"
+
+[[package]]
+name = "vec-arena"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eafc1b9b2dfc6f5529177b62cf806484db55b32dc7c9658a118e11bbeb33061d"
[[package]]
name = "vec_map"
@@ -3865,9 +4062,9 @@ checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
[[package]]
name = "version_check"
-version = "0.9.3"
+version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
+checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed"
[[package]]
name = "void"
@@ -3893,11 +4090,17 @@ dependencies = [
"libc",
]
+[[package]]
+name = "waker-fn"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
+
[[package]]
name = "walkdir"
-version = "2.3.2"
+version = "2.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
+checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
dependencies = [
"same-file",
"winapi 0.3.9",
@@ -3910,8 +4113,8 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230"
dependencies = [
- "futures 0.1.31",
- "log 0.4.14",
+ "futures 0.1.30",
+ "log 0.4.11",
"try-lock",
]
@@ -3923,15 +4126,15 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
[[package]]
name = "wasi"
-version = "0.10.2+wasi-snapshot-preview1"
+version = "0.10.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
+checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
[[package]]
name = "wasm-bindgen"
-version = "0.2.73"
+version = "0.2.69"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83240549659d187488f91f33c0f8547cbfef0b2088bc470c116d1d260ef623d9"
+checksum = "3cd364751395ca0f68cafb17666eee36b63077fb5ecd972bbcd74c90c4bf736e"
dependencies = [
"cfg-if 1.0.0",
"wasm-bindgen-macro",
@@ -3939,53 +4142,65 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.73"
+version = "0.2.69"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae70622411ca953215ca6d06d3ebeb1e915f0f6613e3b495122878d7ebec7dae"
+checksum = "1114f89ab1f4106e5b55e688b828c0ab0ea593a1ea7c094b141b14cbaaec2d62"
dependencies = [
"bumpalo",
"lazy_static",
- "log 0.4.14",
+ "log 0.4.11",
"proc-macro2",
- "quote 1.0.9",
- "syn 1.0.71",
+ "quote 1.0.8",
+ "syn 1.0.58",
"wasm-bindgen-shared",
]
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fe9756085a84584ee9457a002b7cdfe0bfff169f45d2591d8be1345a6780e35"
+dependencies = [
+ "cfg-if 1.0.0",
+ "js-sys",
+ "wasm-bindgen",
+ "web-sys",
+]
+
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.73"
+version = "0.2.69"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e734d91443f177bfdb41969de821e15c516931c3c3db3d318fa1b68975d0f6f"
+checksum = "7a6ac8995ead1f084a8dea1e65f194d0973800c7f571f6edd70adf06ecf77084"
dependencies = [
- "quote 1.0.9",
+ "quote 1.0.8",
"wasm-bindgen-macro-support",
]
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.73"
+version = "0.2.69"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d53739ff08c8a68b0fdbcd54c372b8ab800b1449ab3c9d706503bc7dd1621b2c"
+checksum = "b5a48c72f299d80557c7c62e37e7225369ecc0c963964059509fbafe917c7549"
dependencies = [
"proc-macro2",
- "quote 1.0.9",
- "syn 1.0.71",
+ "quote 1.0.8",
+ "syn 1.0.58",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.73"
+version = "0.2.69"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9a543ae66aa233d14bb765ed9af4a33e81b8b58d1584cf1b47ff8cd0b9e4489"
+checksum = "7e7811dd7f9398f14cc76efd356f98f03aa30419dea46aa810d71e819fc97158"
[[package]]
name = "web-sys"
-version = "0.3.50"
+version = "0.3.46"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a905d57e488fec8861446d3393670fb50d27a262344013181c2cdf9fff5481be"
+checksum = "222b1ef9334f92a21d3fb53dc3fd80f30836959a90f9274a626d7e06315ba3c3"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -4010,14 +4225,23 @@ dependencies = [
"webpki",
]
+[[package]]
+name = "wepoll-sys"
+version = "3.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fcb14dea929042224824779fbc82d9fab8d2e6d3cbc0ac404de8edf489e77ff"
+dependencies = [
+ "cc",
+]
+
[[package]]
name = "which"
-version = "4.1.0"
+version = "4.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b55551e42cbdf2ce2bedd2203d0cc08dba002c27510f86dab6d0ce304cba3dfe"
+checksum = "87c14ef7e1b8b8ecfc75d5eca37949410046e66f15d185c01d70824f1f8111ef"
dependencies = [
- "either",
"libc",
+ "thiserror",
]
[[package]]
@@ -4091,16 +4315,6 @@ dependencies = [
"libc",
]
-[[package]]
-name = "yasna"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0de7bff972b4f2a06c85f6d8454b09df153af7e3a4ec2aac81db1b105b684ddb"
-dependencies = [
- "bit-vec",
- "num-bigint 0.2.6",
-]
-
[[package]]
name = "zeroize"
version = "1.3.0"
@@ -4117,37 +4331,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2c1e130bebaeab2f23886bf9acbaca14b092408c452543c857f66399cd6dab1"
dependencies = [
"proc-macro2",
- "quote 1.0.9",
- "syn 1.0.71",
+ "quote 1.0.8",
+ "syn 1.0.58",
"synstructure",
]
[[package]]
name = "zip"
-version = "0.5.12"
+version = "0.5.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c83dc9b784d252127720168abd71ea82bf8c3d96b17dc565b5e2a02854f2b27"
+checksum = "cc2896475a242c41366941faa27264df2cb935185a92e059a004d0048feb2ac5"
dependencies = [
"byteorder",
"crc32fast",
- "flate2",
"thiserror",
]
[[package]]
name = "zstd"
-version = "0.6.1+zstd.1.4.9"
+version = "0.6.0+zstd.1.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5de55e77f798f205d8561b8fe2ef57abfb6e0ff2abe7fd3c089e119cdb5631a3"
+checksum = "d4e44664feba7f2f1a9f300c1f6157f2d1bfc3c15c6f3cf4beabf3f5abe9c237"
dependencies = [
"zstd-safe",
]
[[package]]
name = "zstd-safe"
-version = "3.0.1+zstd.1.4.9"
+version = "3.0.0+zstd.1.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1387cabcd938127b30ce78c4bf00b30387dddf704e3f0881dbc4ff62b5566f8c"
+checksum = "d9447afcd795693ad59918c7bbffe42fdd6e467d708f3537e3dc14dc598c573f"
dependencies = [
"libc",
"zstd-sys",
@@ -4155,10 +4368,12 @@ dependencies = [
[[package]]
name = "zstd-sys"
-version = "1.4.20+zstd.1.4.9"
+version = "1.4.19+zstd.1.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebd5b733d7cf2d9447e2c3e76a5589b4f5e5ae065c22a2bc0b023cbc331b6c8e"
+checksum = "ec24a9273d24437afb8e71b16f3d9a5d569193cccdb7896213b59f552f387674"
dependencies = [
"cc",
+ "glob",
+ "itertools 0.9.0",
"libc",
]
diff --git a/Cargo.toml b/Cargo.toml
index 1e51010..2129151 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,7 +7,7 @@ description = "Sccache is a ccache-like tool. It is used as a compiler wrapper a
repository = "https://github.com/mozilla/sccache/"
readme = "README.md"
categories = ["command-line-utilities", "development-tools::build-utils"]
-keywords = ["ccache", "compile", "cache"]
+keywords = ["ccache"]
edition = "2018"
[badges]
@@ -25,17 +25,17 @@ required-features = ["dist-server"]
anyhow = "1.0"
ar = { version = "0.8", optional = true }
atty = "0.2.6"
-base64 = { version = "0.13.0", features = ["std"] }
+base64 = "0.13"
bincode = "1"
blake3 = "0.3"
-byteorder = "1"
+byteorder = "1.0"
chrono = { version = "0.4", optional = true }
clap = "2.23.0"
counted-array = "0.1"
directories = "3"
env_logger = "0.8"
filetime = "0.2"
-flate2 = { version = "1.0.14", optional = true, default-features = false, features = ["rust_backend"] }
+flate2 = { version = "1.0", optional = true, default-features = false, features = ["rust_backend"] }
futures = "0.1.11"
futures_03 = { package = "futures", version = "0.3", features = ["compat", "thread-pool"] }
hmac = { version = "0.10", optional = true }
@@ -44,33 +44,26 @@ hyper = { version = "0.12", optional = true }
hyperx = { version = "0.12", optional = true }
jobserver = "0.1"
jsonwebtoken = { version = "7", optional = true }
-lazy_static = "1.4"
-libc = "^0.2.10"
-linked-hash-map = "0.5.4"
+lazy_static = "1.0.0"
+libc = "0.2.10"
+linked-hash-map = "0.5"
local-encoding = "0.2.0"
log = "0.4"
md-5 = { version = "0.9", optional = true }
-rsa = "0.3"
-# both are pkcs8 only
-rsa-pem = "0.2"
-rsa-der = "0.2"
-# exports pkcs#1
-rsa-export = "0.2"
-# avoid duplicate dependency by sticking to 0.1
-oid = "0.1"
+rsa = "0.4"
# Pin exact versions to make sure we use the exact same picky-asn1-x509 version
picky = "=6.2.0"
picky-asn1-x509 = "=0.5.0"
memcached-rs = { version = "0.4" , optional = true }
-num_cpus = "1.13"
+num_cpus = "1.0"
number_prefix = "0.4"
percent-encoding = { version = "2", optional = true }
-rand = "0.7"
-redis = { version = "0.20", features = ["aio", "tokio-comp"], optional = true }
+rand = "0.8"
+redis = { version = "0.17", optional = true }
regex = "1"
-reqwest = { version = "0.9", features = ["rustls-tls"], optional = true }
+reqwest = { version = "0.9.11", optional = true, features = ["rustls-tls"] }
retry = "1"
-ring = { version = "0.16.15", features = ["std"], optional = true }
+ring = { version = "0.16", optional = true, features = ["std"] }
sha-1 = { version = "0.9", optional = true }
sha2 = { version = "0.9", optional = true }
serde = "1.0"
@@ -93,7 +86,7 @@ uuid = { version = "0.8", features = ["v4"] }
walkdir = "2"
# by default which pulls in an outdated failure version
which = { version = "4", default-features = false }
-zip = { version = "0.5", default-features = false, features = ["deflate"] }
+zip = { version = "0.5", default-features = false }
zstd = "0.6"
# dist-server only
@@ -114,7 +107,6 @@ cc = "1.0"
chrono = "0.4"
itertools = "0.10"
predicates = "1"
-regex = "1"
selenium-rs = "0.1"
[target.'cfg(unix)'.dependencies]
@@ -134,24 +126,20 @@ features = [
]
[features]
-default = ["redis", "s3", "memcached", "gcs", "azure", "dist-client", "dist-server"]
-# legacy compat, do not use
-all = ["redis", "s3", "memcached", "gcs", "azure", "dist-client", "dist-server"]
-
+default = ["all"]
+all = ["dist-client", "redis", "s3", "memcached", "gcs", "azure"]
azure = ["chrono", "hyper", "hyperx", "url", "hmac", "md-5", "sha2"]
s3 = ["chrono", "hyper", "hyperx", "reqwest", "simple-s3", "hmac", "sha-1"]
simple-s3 = []
gcs = ["chrono", "hyper", "hyperx", "percent-encoding", "reqwest", "ring", "untrusted", "url"]
memcached = ["memcached-rs"]
-
-native-zlib = ["zip/deflate-zlib"]
+native-zlib = []
# Enable features that require unstable features of Nightly Rust.
unstable = []
-
# Enables distributed support in the sccache client
dist-client = ["ar", "flate2", "hyper", "hyperx", "reqwest", "url", "sha2"]
# Enables the sccache-dist binary
-dist-server = ["crossbeam-utils", "jsonwebtoken", "flate2", "libmount", "nix", "reqwest", "rouille", "syslog", "void", "version-compare"]
+dist-server = ["chrono", "crossbeam-utils", "jsonwebtoken", "flate2", "hyperx", "libmount", "nix", "reqwest", "rouille", "sha2", "syslog", "void", "version-compare"]
# Enables dist tests with external requirements
dist-tests = ["dist-client", "dist-server"]
# Run JWK token crypto against openssl ref impl
diff --git a/README.md b/README.md
index 9b5474d..86e4cd2 100644
--- a/README.md
+++ b/README.md
@@ -141,7 +141,7 @@ Build with `cargo` and use `otool -L` to check that the resulting binary does no
#### Windows
-On Windows the binary might also depend on a few MSVC CRT DLLs that are not available on older Windows versions.
+On Windows, the binary might also depend on a few MSVC CRT DLLs that are not available on older Windows versions.
It is possible to statically link against the CRT using a `.cargo/config` file with the following contents.
diff --git a/docs/DistributedQuickstart.md b/docs/DistributedQuickstart.md
index d861e16..81b7ede 100644
--- a/docs/DistributedQuickstart.md
+++ b/docs/DistributedQuickstart.md
@@ -146,8 +146,6 @@ $ sccache --dist-status
{"SchedulerStatus":["https://sccache1.corpdmz.ber3.mozilla.com/",{"num_servers":3,"num_cpus":56,"in_progress":24}]}
```
-For diagnostics, advice for scheduler/server does not work with `RUSTC_WRAPPER`. Therefore following approach is advised: `SCCACHE_LOG=trace RUSTC_WRAPPER=... cargo build`.
-
Using custom toolchains
-----------------------
diff --git a/src/azure/blobstore.rs b/src/azure/blobstore.rs
index 8b84c13..b85897f 100644
--- a/src/azure/blobstore.rs
+++ b/src/azure/blobstore.rs
@@ -75,7 +75,8 @@ impl BlobContainer {
pub fn get(&self, key: &str, creds: &AzureCredentials) -> SFuture<Vec<u8>> {
let url_string = format!("{}{}", self.url, key);
let uri = Url::from_str(&url_string).unwrap();
- let date = chrono::offset::Utc::now().to_rfc2822();
+ let dt = chrono::Utc::now();
+ let date = format!("{}", dt.format("%a, %d %b %Y %T GMT"));
let canonical_headers = format!("x-ms-date:{}\nx-ms-version:{}\n", date, BLOB_API_VERSION);
@@ -149,7 +150,8 @@ impl BlobContainer {
pub fn put(&self, key: &str, content: Vec<u8>, creds: &AzureCredentials) -> SFuture<()> {
let url_string = format!("{}{}", self.url, key);
let uri = Url::from_str(&url_string).unwrap();
- let date = chrono::offset::Utc::now().to_rfc2822();
+ let dt = chrono::Utc::now();
+ let date = format!("{}", dt.format("%a, %d %b %Y %T GMT"));
let content_type = "application/octet-stream";
let content_md5 = md5(&content);
diff --git a/src/bin/sccache-dist/build.rs b/src/bin/sccache-dist/build.rs
index 4c5a4a8..9f8b80a 100644
--- a/src/bin/sccache-dist/build.rs
+++ b/src/bin/sccache-dist/build.rs
@@ -416,7 +416,7 @@ impl OverlayBuilder {
.join()
.unwrap_or_else(|_e| Err(anyhow!("Build thread exited unsuccessfully")))
})
- .map_err(|_e| anyhow!("Failed to join thread"))?
+ .unwrap_or_else(|e| Err(anyhow!("Error joining build thread: {:?}", e)))
}
// Failing during cleanup is pretty unexpected, but we can still return the successful compile
diff --git a/src/bin/sccache-dist/main.rs b/src/bin/sccache-dist/main.rs
index f65b306..3f30afa 100644
--- a/src/bin/sccache-dist/main.rs
+++ b/src/bin/sccache-dist/main.rs
@@ -1,5 +1,5 @@
-#![allow(clippy::complexity)]
#![deny(clippy::perf)]
+#![allow(clippy::complexity, clippy::new_without_default)]
#[macro_use]
extern crate clap;
@@ -272,8 +272,7 @@ fn run(command: Command) -> Result<i32> {
match command {
Command::Auth(AuthSubcommand::Base64 { num_bytes }) => {
let mut bytes = vec![0; num_bytes];
- let mut rng = OsRng;
- rng.fill_bytes(&mut bytes);
+ OsRng.fill_bytes(&mut bytes);
// As long as it can be copied, it doesn't matter if this is base64 or hex etc
println!("{}", base64::encode_config(&bytes, base64::URL_SAFE_NO_PAD));
Ok(0)
@@ -440,7 +439,6 @@ struct JobDetail {
// To avoid deadlicking, make sure to do all locking at once (i.e. no further locking in a downward scope),
// in alphabetical order
-#[derive(Default)]
pub struct Scheduler {
job_count: AtomicUsize,
@@ -464,7 +462,11 @@ struct ServerDetails {
impl Scheduler {
pub fn new() -> Self {
- Scheduler::default()
+ Scheduler {
+ job_count: AtomicUsize::new(0),
+ jobs: Mutex::new(BTreeMap::new()),
+ servers: Mutex::new(HashMap::new()),
+ }
}
fn prune_servers(
diff --git a/src/bin/sccache-dist/token_check.rs b/src/bin/sccache-dist/token_check.rs
index ba4db56..3d4b08b 100644
--- a/src/bin/sccache-dist/token_check.rs
+++ b/src/bin/sccache-dist/token_check.rs
@@ -38,9 +38,7 @@ impl Jwk {
let e = rsa::BigUint::from_bytes_be(&e);
let pk = rsa::RSAPublicKey::new(n, e)?;
- let pk = rsa_export::RsaKey::new(pk);
- let pkcs1_der: Vec<u8> = pk
- .as_pkcs1()
+ let pkcs1_der: Vec<u8> = rsa::PublicKeyEncoding::to_pkcs1(&pk)
.map_err(|e| anyhow::anyhow!("{}", e))
.context("Failed to create rsa pub key from (n, e)")?;
@@ -374,6 +372,7 @@ impl ValidJWTCheck {
#[cfg(all(test, feature = "vs_openssl"))]
mod tests {
+ use super::*;
#[test]
fn der_repr() {
@@ -382,7 +381,7 @@ mod tests {
let n = base64::encode_config(n_be_bytes.as_slice(), base64::URL_SAFE);
let e = base64::encode_config(e_be_bytes.as_slice(), base64::URL_SAFE);
- let jwk = crate::token_check::Jwk {
+ let jwk = Jwk {
kty: "RSA".to_owned(),
kid: "XXX".to_owned(),
n,
diff --git a/src/cache/gcs.rs b/src/cache/gcs.rs
index 649ab59..1efe4e0 100644
--- a/src/cache/gcs.rs
+++ b/src/cache/gcs.rs
@@ -559,7 +559,7 @@ impl Storage for GCSCache {
#[test]
fn test_gcs_credential_provider() {
const EXPIRE_TIME: &str = "3000-01-01T00:00:00.0Z";
- let addr = ([127, 0, 0, 1], 23535).into();
+ let addr = ([127, 0, 0, 1], 0).into();
let make_service = || {
hyper::service::service_fn_ok(|_| {
let token = serde_json::json!({
@@ -574,7 +574,7 @@ fn test_gcs_credential_provider() {
let credential_provider = GCSCredentialProvider::new(
RWMode::ReadWrite,
- ServiceAccountInfo::URL(format!("http://{}/", addr)),
+ ServiceAccountInfo::URL(format!("http://{}/", server.local_addr())),
);
let client = Client::new();
@@ -590,7 +590,7 @@ fn test_gcs_credential_provider() {
.timestamp(),
);
})
- .map_err(move |err| panic!("{}", err));
+ .map_err(|err| panic!("{}", err));
server.with_graceful_shutdown(cred_fut);
}
diff --git a/src/compiler/args.rs b/src/compiler/args.rs
index e2cca90..a82ae35 100644
--- a/src/compiler/args.rs
+++ b/src/compiler/args.rs
@@ -1,5 +1,3 @@
-#![allow(clippy::unnecessary_lazy_evaluations)]
-
use std::cmp::Ordering;
use std::error::Error;
use std::ffi::OsString;
diff --git a/src/compiler/compiler.rs b/src/compiler/compiler.rs
index dca6db7..6d0007d 100644
--- a/src/compiler/compiler.rs
+++ b/src/compiler/compiler.rs
@@ -12,8 +12,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#![allow(clippy::complexity)]
-
use crate::cache::{Cache, CacheWrite, DecompressionFailure, Storage};
use crate::compiler::c::{CCompiler, CCompilerKind};
use crate::compiler::clang::Clang;
@@ -1449,7 +1447,7 @@ LLVM version: 6.0",
}))
.unwrap();
// Ensure that the object file was created.
- assert!(0 < fs::metadata(&obj).unwrap().len());
+ assert!(fs::metadata(&obj).map(|m| m.len() > 0).unwrap());
match cached {
CompileResult::CacheMiss(MissType::Normal, DistType::NoDist, _, f) => {
// wait on cache write future so we don't race with it!
@@ -1483,7 +1481,7 @@ LLVM version: 6.0",
}))
.unwrap();
// Ensure that the object file was created.
- assert!(0 < fs::metadata(&obj).unwrap().len());
+ assert!(fs::metadata(&obj).map(|m| m.len() > 0).unwrap());
assert_eq!(CompileResult::CacheHit(Duration::new(0, 0)), cached);
assert_eq!(exit_status(0), res.status);
assert_eq!(COMPILER_STDOUT, res.stdout.as_slice());
@@ -1550,7 +1548,7 @@ LLVM version: 6.0",
}))
.unwrap();
// Ensure that the object file was created.
- assert!(0 < fs::metadata(&obj).unwrap().len());
+ assert!(fs::metadata(&obj).map(|m| m.len() > 0).unwrap());
match cached {
CompileResult::CacheMiss(MissType::Normal, DistType::Ok(_), _, f) => {
// wait on cache write future so we don't race with it!
@@ -1658,7 +1656,7 @@ LLVM version: 6.0",
}))
.unwrap();
// Ensure that the object file was created.
- assert!(0 < fs::metadata(&obj).unwrap().len());
+ assert!(fs::metadata(&obj).map(|m| m.len() > 0).unwrap());
match cached {
CompileResult::CacheMiss(MissType::CacheReadError, DistType::NoDist, _, f) => {
// wait on cache write future so we don't race with it!
@@ -1740,7 +1738,7 @@ LLVM version: 6.0",
}))
.unwrap();
// Ensure that the object file was created.
- assert!(0 < fs::metadata(&obj).unwrap().len());
+ assert!(fs::metadata(&obj).map(|m| m.len() > 0).unwrap());
match cached {
CompileResult::CacheMiss(MissType::Normal, DistType::NoDist, _, f) => {
// wait on cache write future so we don't race with it!
@@ -1767,7 +1765,7 @@ LLVM version: 6.0",
.wait()
.unwrap();
// Ensure that the object file was created.
- assert!(0 < fs::metadata(&obj).unwrap().len());
+ assert!(fs::metadata(&obj).map(|m| m.len() > 0).unwrap());
match cached {
CompileResult::CacheMiss(MissType::ForcedRecache, DistType::NoDist, _, f) => {
// wait on cache write future so we don't race with it!
@@ -1928,7 +1926,7 @@ LLVM version: 6.0",
.wait()
.unwrap();
// Ensure that the object file was created.
- assert!(0 < fs::metadata(&obj).unwrap().len());
+ assert!(fs::metadata(&obj).map(|m| m.len() > 0).unwrap());
match cached {
CompileResult::CacheMiss(MissType::ForcedRecache, DistType::Error, _, f) => {
// wait on cache write future so we don't race with it!
diff --git a/src/compiler/rust.rs b/src/compiler/rust.rs
index 96052cb..a1267cb 100644
--- a/src/compiler/rust.rs
+++ b/src/compiler/rust.rs
@@ -626,7 +626,7 @@ impl RustupProxy {
})
.and_then(move |state| {
let state = match state {
- ProxyPath::Candidate(_) => { unreachable!("Q.E.D.") }
+ ProxyPath::Candidate(_) => { unreachable!("qed") }
ProxyPath::ToBeDiscovered => {
// simple check: is there a rustup in the same parent dir as rustc?
// that would be the prefered one
@@ -1132,7 +1132,6 @@ fn parse_arguments(arguments: &[OsString], cwd: &Path) -> CompilerArguments<Pars
};
};
}
-
// We don't actually save the input value, but there needs to be one.
req!(input);
drop(input);
@@ -1248,8 +1247,7 @@ where
},
} = *self;
trace!("[{}]: generate_hash_key", crate_name);
- // TODO: this doesn't produce correct arguments if they
- // TODO: should be concatenated - should use iter_os_strings
+ // TODO: this doesn't produce correct arguments if they should be concatenated - should use iter_os_strings
let os_string_arguments: Vec<(OsString, Option<OsString>)> = arguments
.iter()
.map(|arg| {
diff --git a/src/dist/client_auth.rs b/src/dist/client_auth.rs
index 06337ef..2a050ff 100644
--- a/src/dist/client_auth.rs
+++ b/src/dist/client_auth.rs
@@ -131,7 +131,7 @@ mod code_grant_pkce {
use futures::future;
use futures::sync::oneshot;
use hyper::{Body, Method, Request, Response, StatusCode};
- use rand::RngCore;
+ use rand::{rngs::OsRng, RngCore};
use sha2::{Digest, Sha256};
use std::collections::HashMap;
use std::sync::mpsc;
@@ -187,8 +187,7 @@ mod code_grant_pkce {
pub fn generate_verifier_and_challenge() -> Result<(String, String)> {
let mut code_verifier_bytes = vec![0; NUM_CODE_VERIFIER_BYTES];
- let mut rng = rand::rngs::OsRng;
- rng.fill_bytes(&mut code_verifier_bytes);
+ OsRng.fill_bytes(&mut code_verifier_bytes);
let code_verifier = base64::encode_config(&code_verifier_bytes, base64::URL_SAFE_NO_PAD);
let mut hasher = Sha256::new();
hasher.update(&code_verifier);
diff --git a/src/dist/http.rs b/src/dist/http.rs
index 60a23b6..10bc5c6 100644
--- a/src/dist/http.rs
+++ b/src/dist/http.rs
@@ -319,7 +319,6 @@ mod server {
use picky::x509::name::{DirectoryName, GeneralNames};
use picky::x509::Extensions;
use picky::{hash::HashAlgorithm, signature::SignatureAlgorithm};
- use rsa_pem::KeyExt;
use sha2::Digest;
use std::net::{IpAddr, SocketAddr};
use std::ops::DerefMut;
@@ -331,8 +330,8 @@ mod server {
let bits = 2048;
let rsa_key = rsa::RSAPrivateKey::new(&mut rng, bits)?;
- let sk_pkcs8 = <rsa::RSAPrivateKey>::to_pem_pkcs8(&rsa_key)?;
- let pk_pkcs8 = <rsa::RSAPublicKey>::to_pem_pkcs8(&rsa_key)?;
+ let sk_pkcs8 = rsa::PrivateKeyPemEncoding::to_pem_pkcs8(&rsa_key)?;
+ let pk_pkcs8 = rsa::PublicKeyPemEncoding::to_pem_pkcs8(&*rsa_key)?;
// convert to picky
let sk = PrivateKey::from_pem_str(sk_pkcs8.as_str())?;
@@ -647,14 +646,14 @@ mod server {
impl dist::JobAuthorizer for JWTJobAuthorizer {
fn generate_token(&self, job_id: JobId) -> Result<String> {
let claims = JobJwt { job_id };
- let encoding_key = &jwt::EncodingKey::from_secret(&self.server_key);
- jwt::encode(&JWT_HEADER, &claims, encoding_key)
+ let key = jwt::EncodingKey::from_secret(&self.server_key);
+ jwt::encode(&JWT_HEADER, &claims, &key)
.map_err(|e| anyhow!("Failed to create JWT for job: {}", e))
}
fn verify_token(&self, job_id: JobId, token: &str) -> Result<()> {
let valid_claims = JobJwt { job_id };
- let decoding_key = jwt::DecodingKey::from_secret(&self.server_key);
- jwt::decode(&token, &decoding_key, &JWT_VALIDATION)
+ let key = jwt::DecodingKey::from_secret(&self.server_key);
+ jwt::decode(&token, &key, &JWT_VALIDATION)
.map_err(|e| anyhow!("JWT decode failed: {}", e))
.and_then(|res| {
fn identical_t<T>(_: &T, _: &T) {}
@@ -933,9 +932,8 @@ mod server {
create_https_cert_and_privkey(public_addr)
.context("failed to create HTTPS certificate for server")?;
let mut jwt_key = vec![0; JWT_KEY_LENGTH];
- let mut rng = OsRng;
- rng.fill_bytes(&mut jwt_key);
- let server_nonce = ServerNonce::from_rng(&mut rng);
+ OsRng.fill_bytes(&mut jwt_key);
+ let server_nonce = ServerNonce::new();
Ok(Self {
public_addr,
@@ -1475,8 +1473,7 @@ mod tests {
.open(format!("./{}.cert.pem", tag))
.unwrap();
f.write_all(pem.to_string().as_bytes()).unwrap();
- let cert = picky::x509::Cert::from_pem(&pem).expect("Cert from PEM must be ok. Q.E.D.");
- cert
+ picky::x509::Cert::from_pem(&pem).expect("Cert from PEM must be ok. Q.E.D.")
};
let generated: Triple = create_https_cert_and_privkey(addr).unwrap().into();
diff --git a/src/dist/mod.rs b/src/dist/mod.rs
index 508f4ad..d91c96e 100644
--- a/src/dist/mod.rs
+++ b/src/dist/mod.rs
@@ -13,7 +13,7 @@
// limitations under the License.
use crate::compiler;
-use rand::RngCore;
+use rand::{rngs::OsRng, RngCore};
use std::ffi::OsString;
use std::fmt;
use std::io::{self, Read};
@@ -370,8 +370,8 @@ impl FromStr for ServerId {
#[serde(deny_unknown_fields)]
pub struct ServerNonce(u64);
impl ServerNonce {
- pub fn from_rng<G: RngCore>(rng: &mut G) -> Self {
- ServerNonce(rng.next_u64())
+ pub fn new() -> Self {
+ ServerNonce(OsRng.next_u64())
}
}
diff --git a/src/dist/pkg.rs b/src/dist/pkg.rs
index 616c5d3..25e39bd 100644
--- a/src/dist/pkg.rs
+++ b/src/dist/pkg.rs
@@ -64,7 +64,6 @@ mod toolchain_imp {
use crate::errors::*;
- #[derive(Default, Debug)]
pub struct ToolchainPackageBuilder {
// Put dirs and file in a deterministic order (map from tar_path -> real_path)
dir_set: BTreeMap<PathBuf, PathBuf>,
diff --git a/src/lib.rs b/src/lib.rs
index c486902..4f05324 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -12,9 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#![allow(clippy::complexity)]
-#![deny(clippy::perf)]
#![deny(rust_2018_idioms)]
+#![deny(clippy::perf)]
+#![allow(
+ clippy::complexity,
+ clippy::type_complexity,
+ clippy::new_without_default
+)]
#![recursion_limit = "256"]
#[macro_use]
diff --git a/src/main.rs b/src/main.rs
index 36354b4..75b49ed 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -12,9 +12,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#![allow(clippy::complexity)]
-#![deny(clippy::perf)]
-
fn main() {
sccache::main();
}
diff --git a/src/server.rs b/src/server.rs
index da2f01a..a032c35 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -14,7 +14,6 @@
// For tokio_io::codec::length_delimited::Framed;
#![allow(deprecated)]
-#![allow(clippy::complexity)]
use crate::cache::{storage_from_config, Storage};
use crate::compiler::{
@@ -129,13 +128,11 @@ fn notify_server_startup(name: &Option<OsString>, status: ServerStartup) -> Resu
#[cfg(unix)]
fn get_signal(status: ExitStatus) -> i32 {
use std::os::unix::prelude::*;
- status
- .signal()
- .expect("Signals must exist on unix platforms. Q.E.D.")
+ status.signal().expect("must have signal")
}
#[cfg(windows)]
fn get_signal(_status: ExitStatus) -> i32 {
- unreachable!("Signals do not exists on windows. Q.E.D.")
+ panic!("no signals on windows")
}
pub struct DistClientContainer {
@@ -603,10 +600,10 @@ impl<C: CommandCreatorSync> SccacheServer<C> {
}
}
-/// maps a compiler proxy path to a compiler proxy and it's last modification time
+/// Maps a compiler proxy path to a compiler proxy and its last modification time
type CompilerProxyMap<C> = HashMap<PathBuf, (Box<dyn CompilerProxy<C>>, FileTime)>;
-/// maps a compiler path to a compiler cache entry
+/// Maps a compiler path to a compiler cache entry
type CompilerMap<C> = HashMap<PathBuf, Option<CompilerCacheEntry<C>>>;
/// entry of the compiler cache
@@ -1286,7 +1283,7 @@ impl PerLanguageCount {
}
/// Statistics about the server.
-#[derive(Serialize, Deserialize, Clone, Debug, Default)]
+#[derive(Serialize, Deserialize, Clone, Debug)]
pub struct ServerStats {
/// The count of client compile requests.
pub compile_requests: u64,
@@ -1352,6 +1349,34 @@ pub enum DistInfo {
SchedulerStatus(Option<config::HTTPUrl>, dist::SchedulerStatusResult),
}
+impl Default for ServerStats {
+ fn default() -> ServerStats {
+ ServerStats {
+ compile_requests: u64::default(),
+ requests_unsupported_compiler: u64::default(),
+ requests_not_compile: u64::default(),
+ requests_not_cacheable: u64::default(),
+ requests_executed: u64::default(),
+ cache_errors: PerLanguageCount::new(),
+ cache_hits: PerLanguageCount::new(),
+ cache_misses: PerLanguageCount::new(),
+ cache_timeouts: u64::default(),
+ cache_read_errors: u64::default(),
+ non_cacheable_compilations: u64::default(),
+ forced_recaches: u64::default(),
+ cache_write_errors: u64::default(),
+ cache_writes: u64::default(),
+ cache_write_duration: Duration::new(0, 0),
+ cache_read_hit_duration: Duration::new(0, 0),
+ cache_read_miss_duration: Duration::new(0, 0),
+ compile_fails: u64::default(),
+ not_cached: HashMap::new(),
+ dist_compiles: HashMap::new(),
+ dist_errors: u64::default(),
+ }
+ }
+}
+
impl ServerStats {
/// Print stats to stdout in a human-readable format.
///
diff --git a/tests/dist.rs b/tests/dist.rs
index b8bae74..69b5087 100644
--- a/tests/dist.rs
+++ b/tests/dist.rs
@@ -33,11 +33,8 @@ fn basic_compile(tmpdir: &Path, sccache_cfg_path: &Path, sccache_cached_cfg_path
let obj_file = "x.o";
write_source(tmpdir, source_file, "#if !defined(SCCACHE_TEST_DEFINE)\n#error SCCACHE_TEST_DEFINE is not defined\n#endif\nint x() { return 5; }");
sccache_command()
- .args(&[
- std::env::var("CC").unwrap_or("gcc".to_string()).as_str(),
- "-c",
- "-DSCCACHE_TEST_DEFINE",
- ])
+ .arg(std::env::var("CC").unwrap_or_else(|_| "gcc".to_string()))
+ .args(&["-c", "-DSCCACHE_TEST_DEFINE"])
.arg(tmpdir.join(source_file))
.arg("-o")
.arg(tmpdir.join(obj_file))
diff --git a/tests/sccache_cargo.rs b/tests/sccache_cargo.rs
index e89878f..199207d 100644
--- a/tests/sccache_cargo.rs
+++ b/tests/sccache_cargo.rs
@@ -4,51 +4,29 @@
//! http://creativecommons.org/publicdomain/zero/1.0/
#![deny(rust_2018_idioms)]
-#![allow(dead_code, unused_imports)]
-
-mod harness;
-
-use crate::harness::get_stats;
#[cfg(all(not(target_os = "windows"), not(target_os = "macos")))]
#[macro_use]
extern crate log;
-use std::io::Write;
-
/// Test that building a simple Rust crate with cargo using sccache results in a cache hit
/// when built a second time.
#[test]
#[cfg(all(not(target_os = "windows"), not(target_os = "macos")))]
fn test_rust_cargo() {
- let _ = env_logger::Builder::new()
- .format(|f, record| {
- writeln!(
- f,
- "{} [{}] - {}",
- chrono::Local::now().format("%Y-%m-%dT%H:%M:%S%.3f"),
- record.level(),
- record.args()
- )
- })
- .is_test(true)
- .filter_level(log::LevelFilter::Trace)
- .try_init();
-
- trace!("cargo check");
test_rust_cargo_cmd("check");
-
- trace!("cargo build");
test_rust_cargo_cmd("build");
}
#[cfg(all(not(target_os = "windows"), not(target_os = "macos")))]
fn test_rust_cargo_cmd(cmd: &str) {
use assert_cmd::prelude::*;
+ use chrono::Local;
use predicates::prelude::*;
use std::env;
use std::ffi::OsStr;
use std::fs;
+ use std::io::Write;
use std::path::Path;
use std::process::{Command, Stdio};
@@ -72,7 +50,7 @@ fn test_rust_cargo_cmd(cmd: &str) {
write!(
f,
"{} [{}] - {}",
- chrono::Local::now().format("%Y-%m-%dT%H:%M:%S%.3f"),
+ Local::now().format("%Y-%m-%dT%H:%M:%S%.3f"),
record.level(),
record.args()
)
@@ -143,9 +121,10 @@ fn test_rust_cargo_cmd(cmd: &str) {
// The test crate has one dependency (itoa) so there are two separate
// compilations.
trace!("sccache --show-stats");
- get_stats(|info: sccache::server::ServerInfo| {
- assert_eq!(dbg!(dbg!(info.stats).cache_hits).get("Rust"), Some(&2));
- });
-
+ sccache_command()
+ .args(&["--show-stats", "--stats-format=json"])
+ .assert()
+ .stdout(predicates::str::contains(r#""cache_hits":{"counts":{"Rust":2}}"#).from_utf8())
+ .success();
stop();
}
diff --git a/tests/system.rs b/tests/system.rs
index 824589a..f45299f 100644
--- a/tests/system.rs
+++ b/tests/system.rs
@@ -111,7 +111,7 @@ fn test_basic_compile(compiler: Compiler, tempdir: &Path) {
.envs(env_vars.clone())
.assert()
.success();
- assert!(0 < fs::metadata(&out_file).unwrap().len());
+ assert!(fs::metadata(&out_file).map(|m| m.len() > 0).unwrap());
trace!("request stats");
get_stats(|info| {
assert_eq!(1, info.stats.compile_requests);
@@ -128,7 +128,7 @@ fn test_basic_compile(compiler: Compiler, tempdir: &Path) {
.envs(env_vars)
.assert()
.success();
- assert!(0 < fs::metadata(&out_file).unwrap().len());
+ assert!(fs::metadata(&out_file).map(|m| m.len() > 0).unwrap());
trace!("request stats");
get_stats(|info| {
assert_eq!(2, info.stats.compile_requests);
@@ -414,10 +414,7 @@ fn find_compilers() -> Vec<Compiler> {
#[test]
#[cfg(any(unix, target_env = "msvc"))]
fn test_sccache_command() {
- let _ = env_logger::Builder::new()
- .filter_level(log::LevelFilter::Trace)
- .is_test(true)
- .try_init();
+ let _ = env_logger::Builder::new().is_test(true).try_init();
let tempdir = tempfile::Builder::new()
.prefix("sccache_system_test")
.tempdir()
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment