From 78698ac96d620248a0dd02a65634506c2b555f0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Sat, 8 Apr 2023 18:37:21 +0200 Subject: [PATCH] bandwhich: fix build on Rust 1.64+ --- .../0001-Upgrade-resolv-conf-version.patch | 3214 +++++++++++++++++ ...-socket2-for-Rust-1.64-compatibility.patch | 37 + ...d-trust-dns-resoler-replace-failure-.patch | 2070 +++++++++++ .../0004-upgrade-compatible-deps.patch | 2325 ++++++++++++ .../0005-upgrade-tui-and-crossterm.patch | 606 ++++ .../0006-upgrade-pnet-and-ipnetwork.patch | 1550 ++++++++ srcpkgs/bandwhich/template | 4 +- 7 files changed, 9805 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/bandwhich/patches/0001-Upgrade-resolv-conf-version.patch create mode 100644 srcpkgs/bandwhich/patches/0002-update-socket2-for-Rust-1.64-compatibility.patch create mode 100644 srcpkgs/bandwhich/patches/0003-upgrade-tokio-and-trust-dns-resoler-replace-failure-.patch create mode 100644 srcpkgs/bandwhich/patches/0004-upgrade-compatible-deps.patch create mode 100644 srcpkgs/bandwhich/patches/0005-upgrade-tui-and-crossterm.patch create mode 100644 srcpkgs/bandwhich/patches/0006-upgrade-pnet-and-ipnetwork.patch diff --git a/srcpkgs/bandwhich/patches/0001-Upgrade-resolv-conf-version.patch b/srcpkgs/bandwhich/patches/0001-Upgrade-resolv-conf-version.patch new file mode 100644 index 000000000000..0ead9b0e6729 --- /dev/null +++ b/srcpkgs/bandwhich/patches/0001-Upgrade-resolv-conf-version.patch @@ -0,0 +1,3214 @@ +From f0c9abceac731953a27a930e1755ebfc78623cd4 Mon Sep 17 00:00:00 2001 +From: Brooks J Rady +Date: Sat, 26 Dec 2020 17:13:55 +0000 +Subject: [PATCH 1/6] Upgrade resolv-conf version + +--- + Cargo.lock | 1632 ++++++++++++++++++++++++++-------------------------- + Cargo.toml | 2 +- + 2 files changed, 820 insertions(+), 814 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index 8244d96..bcaf9da 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -4,1482 +4,1651 @@ + name = "adler" + version = "0.2.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" + + [[package]] + name = "adler32" + version = "1.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" + + [[package]] + name = "aho-corasick" + version = "0.7.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" + dependencies = [ +- "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr", + ] + + [[package]] + name = "ansi_term" + version = "0.11.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" + dependencies = [ +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8", + ] + + [[package]] + name = "arc-swap" + version = "0.4.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f1a1eca3195b729bbd64e292ef2f5fff6b1c28504fed762ce2b1013dde4d8e92" + + [[package]] + name = "async-trait" + version = "0.1.21" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8b6dd385bb33043b833ba049048d57bdbb4d654a121ed68c71871ca51ff67070" + dependencies = [ +- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.6", ++ "quote 1.0.2", ++ "syn 1.0.11", + ] + + [[package]] + name = "atty" + version = "0.2.13" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90" + dependencies = [ +- "libc 0.2.76 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "winapi 0.3.8", + ] + + [[package]] + name = "autocfg" + version = "0.1.7" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" + + [[package]] + name = "autocfg" + version = "1.0.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" + + [[package]] + name = "backtrace" + version = "0.3.40" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea" + dependencies = [ +- "backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", +- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.76 (registry+https://github.com/rust-lang/crates.io-index)", +- "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", ++ "backtrace-sys", ++ "cfg-if", ++ "libc", ++ "rustc-demangle", + ] + + [[package]] + name = "backtrace-sys" + version = "0.1.32" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491" + dependencies = [ +- "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.76 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc", ++ "libc", + ] + + [[package]] + name = "bandwhich" + version = "0.20.0" + dependencies = [ +- "async-trait 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", +- "cargo-insta 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "crossterm 0.17.7 (registry+https://github.com/rust-lang/crates.io-index)", +- "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "http_req 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "insta 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "ipnetwork 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "netstat2 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "packet-builder 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "pnet 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "pnet_base 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "procfs 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "resolv-conf 0.6.3 (git+https://github.com/tailhook/resolv-conf?rev=83c0f25ebcb0615550488692c5213ca1ae4acd8f)", +- "structopt 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "sysinfo 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "trust-dns-resolver 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "tui 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-width 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "zip 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "async-trait", ++ "cargo-insta", ++ "chrono", ++ "crossterm", ++ "failure", ++ "http_req", ++ "insta 0.12.0", ++ "ipnetwork 0.16.0", ++ "lazy_static", ++ "netstat2", ++ "packet-builder", ++ "pnet", ++ "pnet_base", ++ "procfs", ++ "regex", ++ "resolv-conf 0.7.0", ++ "structopt 0.3.4", ++ "sysinfo", ++ "tokio", ++ "trust-dns-resolver", ++ "tui", ++ "unicode-width", ++ "zip", + ] + + [[package]] + name = "bitflags" + version = "0.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4f67931368edf3a9a51d29886d245f1c3db2f1ef0dcc9e35ff70341b78c10d23" + + [[package]] + name = "bitflags" + version = "1.2.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" + + [[package]] + name = "block-buffer" + version = "0.7.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" + dependencies = [ +- "block-padding 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "block-padding", ++ "byte-tools", ++ "byteorder", ++ "generic-array", + ] + + [[package]] + name = "block-padding" + version = "0.1.5" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" + dependencies = [ +- "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "byte-tools", + ] + + [[package]] + name = "byte-tools" + version = "0.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" + + [[package]] + name = "byteorder" + version = "1.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" + + [[package]] + name = "bytes" + version = "0.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "549c8cf9befa7948bfd9ebb0ed84c6b25b0400046b6db1b73c026e4117c26c12" + + [[package]] + name = "bzip2" + version = "0.3.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "42b7c3cbf0fa9c1b82308d57191728ca0256cb821220f4e2fd410a72ade26e3b" + dependencies = [ +- "bzip2-sys 0.1.9+1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.76 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bzip2-sys", ++ "libc", + ] + + [[package]] + name = "bzip2-sys" + version = "0.1.9+1.0.8" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ad3b39a260062fca31f7b0b12f207e8f2590a67d32ec7d59c20484b07ea7285e" + dependencies = [ +- "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.76 (registry+https://github.com/rust-lang/crates.io-index)", +- "pkg-config 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc", ++ "libc", ++ "pkg-config", + ] + + [[package]] + name = "c2-chacha" + version = "0.2.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb" + dependencies = [ +- "ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ppv-lite86", + ] + + [[package]] + name = "cargo-insta" + version = "0.11.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e22a28c661f0fb0474ef90d63b4bc834bf2c179550608783594f358f5ac74cc2" + dependencies = [ +- "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "console 0.7.7 (registry+https://github.com/rust-lang/crates.io-index)", +- "difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", +- "insta 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", +- "structopt 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", +- "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "clap", ++ "console 0.7.7", ++ "difference", ++ "glob", ++ "insta 0.11.0", ++ "proc-macro2 0.4.30", ++ "serde", ++ "serde_json", ++ "structopt 0.2.18", ++ "syn 0.15.44", ++ "walkdir", + ] + + [[package]] + name = "cassowary" + version = "0.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" + + [[package]] + name = "cc" + version = "1.0.47" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aa87058dce70a3ff5621797f1506cb837edd02ac4c0ae642b4542dce802908b8" + + [[package]] + name = "cfg-if" + version = "0.1.9" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" + + [[package]] + name = "chrono" + version = "0.4.9" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e8493056968583b0193c1bb04d6f7684586f3726992d6c573261941a895dbd68" + dependencies = [ +- "libc 0.2.76 (registry+https://github.com/rust-lang/crates.io-index)", +- "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", +- "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "num-integer", ++ "num-traits", ++ "time", + ] + + [[package]] + name = "clap" + version = "2.33.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" + dependencies = [ +- "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", +- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-width 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ansi_term", ++ "atty", ++ "bitflags 1.2.1", ++ "strsim", ++ "textwrap", ++ "unicode-width", ++ "vec_map", + ] + + [[package]] + name = "clicolors-control" + version = "1.0.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "90082ee5dcdd64dc4e9e0d37fbf3ee325419e39c0092191e0393df65518f741e" + dependencies = [ +- "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.76 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "atty", ++ "lazy_static", ++ "libc", ++ "winapi 0.3.8", + ] + + [[package]] + name = "cloudabi" + version = "0.0.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" + dependencies = [ +- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.2.1", + ] + + [[package]] + name = "console" + version = "0.7.7" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8ca57c2c14b8a2bf3105bc9d15574aad80babf6a9c44b1058034cdf8bd169628" + dependencies = [ +- "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", +- "clicolors-control 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "encode_unicode 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.76 (registry+https://github.com/rust-lang/crates.io-index)", +- "parking_lot 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "termios 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-width 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "atty", ++ "clicolors-control", ++ "encode_unicode", ++ "lazy_static", ++ "libc", ++ "parking_lot", ++ "regex", ++ "termios", ++ "unicode-width", ++ "winapi 0.3.8", + ] + + [[package]] + name = "console" + version = "0.8.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b147390a412132d75d10dd3b7b175a69cf5fd95032f7503c7091b8831ba10242" + dependencies = [ +- "clicolors-control 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "encode_unicode 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.76 (registry+https://github.com/rust-lang/crates.io-index)", +- "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "termios 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-width 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "clicolors-control", ++ "encode_unicode", ++ "lazy_static", ++ "libc", ++ "regex", ++ "termios", ++ "unicode-width", ++ "winapi 0.3.8", + ] + + [[package]] + name = "console" + version = "0.9.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f5d540c2d34ac9dd0deb5f3b5f54c36c79efa78f6b3ad19106a554d07a7b5d9f" + dependencies = [ +- "clicolors-control 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "encode_unicode 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.76 (registry+https://github.com/rust-lang/crates.io-index)", +- "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "termios 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "clicolors-control", ++ "encode_unicode", ++ "lazy_static", ++ "libc", ++ "regex", ++ "termios", ++ "winapi 0.3.8", + ] + + [[package]] + name = "core-foundation" + version = "0.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" + dependencies = [ +- "core-foundation-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.76 (registry+https://github.com/rust-lang/crates.io-index)", ++ "core-foundation-sys", ++ "libc", + ] + + [[package]] + name = "core-foundation-sys" + version = "0.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" + + [[package]] + name = "crc32fast" + version = "1.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" + dependencies = [ +- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", + ] + + [[package]] + name = "crossbeam-channel" + version = "0.4.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cced8691919c02aac3cb0a1bc2e9b73d89e832bf9a06fc579d4e71b68a2da061" + dependencies = [ +- "crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils", ++ "maybe-uninit", + ] + + [[package]] + name = "crossbeam-deque" + version = "0.7.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285" + dependencies = [ +- "crossbeam-epoch 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-epoch", ++ "crossbeam-utils", ++ "maybe-uninit", + ] + + [[package]] + name = "crossbeam-epoch" + version = "0.8.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" + dependencies = [ +- "autocfg 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "memoffset 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 1.0.1", ++ "cfg-if", ++ "crossbeam-utils", ++ "lazy_static", ++ "maybe-uninit", ++ "memoffset", ++ "scopeguard", + ] + + [[package]] + name = "crossbeam-utils" + version = "0.7.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" + dependencies = [ +- "autocfg 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 1.0.1", ++ "cfg-if", ++ "lazy_static", + ] + + [[package]] + name = "crossterm" + version = "0.17.7" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6f4919d60f26ae233e14233cc39746c8c8bb8cd7b05840ace83604917b51b6c7" + dependencies = [ +- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "crossterm_winapi 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.76 (registry+https://github.com/rust-lang/crates.io-index)", +- "mio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "parking_lot 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "signal-hook 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.2.1", ++ "crossterm_winapi", ++ "lazy_static", ++ "libc", ++ "mio 0.7.0", ++ "parking_lot", ++ "signal-hook", ++ "winapi 0.3.8", + ] + + [[package]] + name = "crossterm_winapi" + version = "0.6.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "057b7146d02fb50175fd7dbe5158f6097f33d02831f43b4ee8ae4ddf67b68f5c" + dependencies = [ +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8", + ] + + [[package]] + name = "derive-new" + version = "0.5.8" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "71f31892cd5c62e414316f2963c5689242c43d8e7bbcaaeca97e5e28c95d91d9" + dependencies = [ +- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.6", ++ "quote 1.0.2", ++ "syn 1.0.11", + ] + + [[package]] + name = "difference" + version = "2.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" + + [[package]] + name = "digest" + version = "0.8.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" + dependencies = [ +- "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "generic-array", + ] + + [[package]] + name = "doc-comment" + version = "0.3.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" + + [[package]] + name = "dtoa" + version = "0.4.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e" + + [[package]] + name = "either" + version = "1.5.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" + + [[package]] + name = "encode_unicode" + version = "0.3.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + + [[package]] + name = "enum-as-inner" + version = "0.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "900a6c7fbe523f4c2884eaf26b57b81bb69b6810a01a236390a7ac021d09492e" + dependencies = [ +- "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "heck", ++ "proc-macro2 1.0.6", ++ "quote 1.0.2", ++ "syn 1.0.11", + ] + + [[package]] + name = "failure" + version = "0.1.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9" + dependencies = [ +- "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)", +- "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "backtrace", ++ "failure_derive", + ] + + [[package]] + name = "failure_derive" + version = "0.1.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08" + dependencies = [ +- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", +- "synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.6", ++ "quote 1.0.2", ++ "syn 1.0.11", ++ "synstructure", + ] + + [[package]] + name = "fake-simd" + version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" + + [[package]] + name = "flate2" + version = "1.0.17" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "766d0e77a2c1502169d4a93ff3b8c15a71fd946cd0126309752104e5f3c46d94" + dependencies = [ +- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.76 (registry+https://github.com/rust-lang/crates.io-index)", +- "miniz_oxide 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "crc32fast", ++ "libc", ++ "miniz_oxide", + ] + + [[package]] + name = "fnv" + version = "1.0.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" + + [[package]] + name = "foreign-types" + version = "0.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" + dependencies = [ +- "foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "foreign-types-shared", + ] + + [[package]] + name = "foreign-types-shared" + version = "0.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + + [[package]] + name = "fuchsia-cprng" + version = "0.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" + + [[package]] + name = "fuchsia-zircon" + version = "0.3.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" + dependencies = [ +- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.2.1", ++ "fuchsia-zircon-sys", + ] + + [[package]] + name = "fuchsia-zircon-sys" + version = "0.3.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" + + [[package]] + name = "futures" + version = "0.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b6f16056ecbb57525ff698bb955162d0cd03bee84e6241c27ff75c08d8ca5987" + dependencies = [ +- "futures-channel 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-executor 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-io 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-sink 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-task 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures-channel", ++ "futures-core", ++ "futures-executor", ++ "futures-io", ++ "futures-sink", ++ "futures-task", ++ "futures-util", + ] + + [[package]] + name = "futures-channel" + version = "0.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fcae98ca17d102fd8a3603727b9259fcf7fa4239b603d2142926189bc8999b86" + dependencies = [ +- "futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-sink 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures-core", ++ "futures-sink", + ] + + [[package]] + name = "futures-core" + version = "0.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "79564c427afefab1dfb3298535b21eda083ef7935b4f0ecbfcb121f0aec10866" + + [[package]] + name = "futures-executor" + version = "0.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1e274736563f686a837a0568b478bdabfeaec2dca794b5649b04e2fe1627c231" + dependencies = [ +- "futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-task 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures-core", ++ "futures-task", ++ "futures-util", + ] + + [[package]] + name = "futures-io" + version = "0.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e676577d229e70952ab25f3945795ba5b16d63ca794ca9d2c860e5595d20b5ff" + + [[package]] + name = "futures-macro" + version = "0.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "52e7c56c15537adb4f76d0b7a76ad131cb4d2f4f32d3b0bcabcbe1c7c5e87764" + dependencies = [ +- "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", +- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro-hack", ++ "proc-macro2 1.0.6", ++ "quote 1.0.2", ++ "syn 1.0.11", + ] + + [[package]] + name = "futures-sink" + version = "0.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "171be33efae63c2d59e6dbba34186fe0d6394fb378069a76dfd80fdcffd43c16" + + [[package]] + name = "futures-task" + version = "0.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0bae52d6b29cf440e298856fec3965ee6fa71b06aa7495178615953fd669e5f9" + + [[package]] + name = "futures-util" + version = "0.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c0d66274fb76985d3c62c886d1da7ac4c0903a8c9f754e8fe0f35a6a6cc39e76" + dependencies = [ +- "futures-channel 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-io 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-macro 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-sink 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-task 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "pin-utils 0.1.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", +- "proc-macro-nested 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures-channel", ++ "futures-core", ++ "futures-io", ++ "futures-macro", ++ "futures-sink", ++ "futures-task", ++ "memchr", ++ "pin-utils", ++ "proc-macro-hack", ++ "proc-macro-nested", ++ "slab", + ] + + [[package]] + name = "generic-array" + version = "0.12.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" + dependencies = [ +- "typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "typenum", + ] + + [[package]] + name = "getrandom" + version = "0.1.13" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407" + dependencies = [ +- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.76 (registry+https://github.com/rust-lang/crates.io-index)", +- "wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "libc", ++ "wasi", + ] + + [[package]] + name = "glob" + version = "0.2.11" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" + + [[package]] + name = "heck" + version = "0.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" + dependencies = [ +- "unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-segmentation", + ] + + [[package]] + name = "hermit-abi" + version = "0.1.15" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9" + dependencies = [ +- "libc 0.2.76 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", + ] + + [[package]] + name = "hex" + version = "0.4.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "644f9158b2f133fd50f5fb3242878846d9eb792e445c893805ff0e3824006e35" + + [[package]] + name = "hostname" + version = "0.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" + dependencies = [ +- "libc 0.2.76 (registry+https://github.com/rust-lang/crates.io-index)", +- "match_cfg 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "match_cfg", ++ "winapi 0.3.8", + ] + + [[package]] + name = "http_req" + version = "0.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "83169a2c0f68280d1c88a4a1d514810006c181a53c40844563013ae86ed4c478" + dependencies = [ +- "native-tls 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "native-tls", ++ "unicase", + ] + + [[package]] + name = "idna" + version = "0.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" + dependencies = [ +- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-normalization 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "matches", ++ "unicode-bidi", ++ "unicode-normalization", + ] + + [[package]] + name = "insta" + version = "0.11.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "23f83ab4ee86f38b292f0420c27fd412690a4baa9ea0ad4e3fa624bf34379b76" + dependencies = [ +- "console 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "pest 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "pest_derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", +- "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "console 0.8.0", ++ "difference", ++ "lazy_static", ++ "pest", ++ "pest_derive", ++ "serde", ++ "serde_json", ++ "serde_yaml", ++ "uuid 0.7.4", + ] + + [[package]] + name = "insta" + version = "0.12.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0d499dc062e841590a67230d853bce62d0abeb91304927871670b7c55c461349" + dependencies = [ +- "console 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", +- "uuid 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "console 0.9.1", ++ "difference", ++ "lazy_static", ++ "serde", ++ "serde_json", ++ "serde_yaml", ++ "uuid 0.8.1", + ] + + [[package]] + name = "iovec" + version = "0.1.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" + dependencies = [ +- "libc 0.2.76 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", + ] + + [[package]] + name = "ipconfig" + version = "0.2.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aa79fa216fbe60834a9c0737d7fcd30425b32d1c58854663e24d4c4b328ed83f" + dependencies = [ +- "socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", +- "widestring 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "socket2", ++ "widestring", ++ "winapi 0.3.8", ++ "winreg", + ] + + [[package]] + name = "ipnetwork" + version = "0.12.8" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "70783119ac90828aaba91eae39db32c6c1b8838deea3637e5238efa0130801ab" + + [[package]] + name = "ipnetwork" + version = "0.16.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b8eca9f51da27bc908ef3dd85c21e1bbba794edaf94d7841e37356275b82d31e" + dependencies = [ +- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde", + ] + + [[package]] + name = "itoa" + version = "0.4.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f" + + [[package]] + name = "kernel32-sys" + version = "0.2.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" + dependencies = [ +- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.2.8", ++ "winapi-build", + ] + + [[package]] + name = "lazy_static" + version = "1.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + + [[package]] + name = "libc" + version = "0.2.76" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "755456fae044e6fa1ebbbd1b3e902ae19e73097ed4ed87bb79934a867c007bc3" + + [[package]] + name = "libflate" + version = "1.0.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e9bac9023e1db29c084f9f8cd9d3852e5e8fddf98fb47c4964a0ea4663d95949" + dependencies = [ +- "adler32 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "libflate_lz77 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "rle-decode-fast 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "adler32", ++ "crc32fast", ++ "libflate_lz77", ++ "rle-decode-fast", + ] + + [[package]] + name = "libflate_lz77" + version = "1.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3286f09f7d4926fc486334f28d8d2e6ebe4f7f9994494b6dab27ddfad2c9b11b" + + [[package]] + name = "linked-hash-map" + version = "0.5.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83" + + [[package]] + name = "lock_api" + version = "0.3.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" + dependencies = [ +- "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "scopeguard", + ] + + [[package]] + name = "log" + version = "0.3.9" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" + dependencies = [ +- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8", + ] + + [[package]] + name = "log" + version = "0.4.8" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" + dependencies = [ +- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", + ] + + [[package]] + name = "lru-cache" + version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" + dependencies = [ +- "linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "linked-hash-map", + ] + + [[package]] + name = "maplit" + version = "1.0.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" + + [[package]] + name = "match_cfg" + version = "0.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" + + [[package]] + name = "matches" + version = "0.1.8" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" + + [[package]] + name = "maybe-uninit" + version = "2.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" + + [[package]] + name = "memchr" + version = "2.2.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" + + [[package]] + name = "memoffset" + version = "0.5.5" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c198b026e1bbf08a937e94c6c60f9ec4a2267f5b0d2eec9c1b21b061ce2be55f" + dependencies = [ +- "autocfg 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 1.0.1", + ] + + [[package]] + name = "miniz_oxide" + version = "0.4.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4d7559a8a40d0f97e1edea3220f698f78b1c5ab67532e49f68fde3910323b722" + dependencies = [ +- "adler 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "adler", + ] + + [[package]] + name = "mio" + version = "0.6.21" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "302dec22bcf6bae6dfb69c647187f4b4d0fb6f535521f7bc022430ce8e12008f" + dependencies = [ +- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.76 (registry+https://github.com/rust-lang/crates.io-index)", +- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", +- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "fuchsia-zircon", ++ "fuchsia-zircon-sys", ++ "iovec", ++ "kernel32-sys", ++ "libc", ++ "log 0.4.8", ++ "miow 0.2.1", ++ "net2", ++ "slab", ++ "winapi 0.2.8", + ] + + [[package]] + name = "mio" + version = "0.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6e9971bc8349a361217a8f2a41f5d011274686bd4436465ba51730921039d7fb" + dependencies = [ +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.76 (registry+https://github.com/rust-lang/crates.io-index)", +- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "miow 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "ntapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static", ++ "libc", ++ "log 0.4.8", ++ "miow 0.3.5", ++ "ntapi", ++ "winapi 0.3.8", + ] + + [[package]] + name = "miow" + version = "0.2.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" + dependencies = [ +- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "kernel32-sys", ++ "net2", ++ "winapi 0.2.8", ++ "ws2_32-sys", + ] + + [[package]] + name = "miow" + version = "0.3.5" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "07b88fb9795d4d36d62a012dfbf49a8f5cf12751f36d31a9dbe66d528e58979e" + dependencies = [ +- "socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "socket2", ++ "winapi 0.3.8", + ] + + [[package]] + name = "native-tls" + version = "0.2.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2b0d88c06fe90d5ee94048ba40409ef1d9315d86f6f38c2efdaad4fb50c58b2d" + dependencies = [ +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.76 (registry+https://github.com/rust-lang/crates.io-index)", +- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "openssl 0.10.30 (registry+https://github.com/rust-lang/crates.io-index)", +- "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "openssl-sys 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", +- "schannel 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)", +- "security-framework 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "security-framework-sys 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static", ++ "libc", ++ "log 0.4.8", ++ "openssl", ++ "openssl-probe", ++ "openssl-sys", ++ "schannel", ++ "security-framework", ++ "security-framework-sys", ++ "tempfile", + ] + + [[package]] + name = "net2" + version = "0.2.33" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" + dependencies = [ +- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.76 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "libc", ++ "winapi 0.3.8", + ] + + [[package]] + name = "netstat2" + version = "0.9.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a338c16442210137bdcc667853b1c61753e01f9e0ef8a875dbf4cd95c7787f53" + dependencies = [ +- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.76 (registry+https://github.com/rust-lang/crates.io-index)", +- "num-derive 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "thiserror 1.0.20 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.2.1", ++ "byteorder", ++ "libc", ++ "num-derive", ++ "num-traits", ++ "thiserror", + ] + + [[package]] + name = "ntapi" + version = "0.3.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a31937dea023539c72ddae0e3571deadc1414b300483fa7aaec176168cfa9d2" + dependencies = [ +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8", + ] + + [[package]] + name = "num-derive" + version = "0.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6f09b9841adb6b5e1f89ef7087ea636e0fd94b2851f887c1e3eb5d5f8228fab3" + dependencies = [ +- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.6", ++ "quote 1.0.2", ++ "syn 1.0.11", + ] + + [[package]] + name = "num-integer" + version = "0.1.41" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09" + dependencies = [ +- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", +- "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.7", ++ "num-traits", + ] + + [[package]] + name = "num-traits" + version = "0.2.8" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32" + dependencies = [ +- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.7", + ] + + [[package]] + name = "num_cpus" + version = "1.13.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" + dependencies = [ +- "hermit-abi 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.76 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hermit-abi", ++ "libc", + ] + + [[package]] + name = "once_cell" + version = "1.4.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "260e51e7efe62b592207e9e13a68e43692a7a279171d6ba57abd208bf23645ad" + + [[package]] + name = "opaque-debug" + version = "0.2.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" + + [[package]] + name = "openssl" + version = "0.10.30" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4" + dependencies = [ +- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.76 (registry+https://github.com/rust-lang/crates.io-index)", +- "openssl-sys 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.2.1", ++ "cfg-if", ++ "foreign-types", ++ "lazy_static", ++ "libc", ++ "openssl-sys", + ] + + [[package]] + name = "openssl-probe" + version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" + + [[package]] + name = "openssl-sys" + version = "0.9.58" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de" + dependencies = [ +- "autocfg 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.76 (registry+https://github.com/rust-lang/crates.io-index)", +- "pkg-config 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", +- "vcpkg 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 1.0.1", ++ "cc", ++ "libc", ++ "pkg-config", ++ "vcpkg", + ] + + [[package]] + name = "packet-builder" + version = "0.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "369f20d8356b3f1cfd362c5b3775d3ca71e0290f259eeff6154420fd06d578d6" + dependencies = [ +- "derive-new 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "ipnetwork 0.12.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "pnet 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "pnet_base 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "pnet_datalink 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "pnet_macros_support 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "derive-new", ++ "ipnetwork 0.12.8", ++ "pnet", ++ "pnet_base", ++ "pnet_datalink", ++ "pnet_macros_support", + ] + + [[package]] + name = "parking_lot" + version = "0.10.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e" + dependencies = [ +- "lock_api 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "parking_lot_core 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lock_api", ++ "parking_lot_core", + ] + + [[package]] + name = "parking_lot_core" + version = "0.7.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3" + dependencies = [ +- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.76 (registry+https://github.com/rust-lang/crates.io-index)", +- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", +- "smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "cloudabi", ++ "libc", ++ "redox_syscall", ++ "smallvec 1.0.0", ++ "winapi 0.3.8", + ] + + [[package]] + name = "percent-encoding" + version = "2.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" + + [[package]] + name = "pest" + version = "2.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7e4fb201c5c22a55d8b24fef95f78be52738e5e1361129be1b5e862ecdb6894a" + dependencies = [ +- "ucd-trie 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ucd-trie", + ] + + [[package]] + name = "pest_derive" + version = "2.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0" + dependencies = [ +- "pest 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "pest_generator 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pest", ++ "pest_generator", + ] + + [[package]] + name = "pest_generator" + version = "2.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7b9fcf299b5712d06ee128a556c94709aaa04512c4dffb8ead07c5c998447fc0" + dependencies = [ +- "pest 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "pest_meta 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pest", ++ "pest_meta", ++ "proc-macro2 1.0.6", ++ "quote 1.0.2", ++ "syn 1.0.11", + ] + + [[package]] + name = "pest_meta" + version = "2.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "df43fd99896fd72c485fe47542c7b500e4ac1e8700bf995544d1317a60ded547" + dependencies = [ +- "maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "pest 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "maplit", ++ "pest", ++ "sha-1", + ] + + [[package]] + name = "pin-project-lite" + version = "0.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f0af6cbca0e6e3ce8692ee19fb8d734b641899e07b68eb73e9bbbd32f1703991" + + [[package]] + name = "pin-utils" + version = "0.1.0-alpha.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5894c618ce612a3fa23881b152b608bafb8c56cfc22f434a3ba3120b40f7b587" + + [[package]] + name = "pkg-config" + version = "0.3.18" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33" + + [[package]] + name = "pnet" + version = "0.26.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c62df42dcd72f6f2a658bcf38509f1027df1440ac85f1af4badbe034418302dc" + dependencies = [ +- "ipnetwork 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "pnet_base 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "pnet_datalink 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "pnet_packet 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "pnet_sys 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "pnet_transport 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ipnetwork 0.16.0", ++ "pnet_base", ++ "pnet_datalink", ++ "pnet_packet", ++ "pnet_sys", ++ "pnet_transport", + ] + + [[package]] + name = "pnet_base" + version = "0.26.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b7cd5f7e15220afa66b0a9a62841ea10089f39dcaa1c29752c0b22dfc03111b5" + + [[package]] + name = "pnet_datalink" + version = "0.26.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7318ae1d6e0b7fa1e49933233c9473f2b72d3d18b97e70e2716c6415dde5f915" + dependencies = [ +- "ipnetwork 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.76 (registry+https://github.com/rust-lang/crates.io-index)", +- "pnet_base 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "pnet_sys 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ipnetwork 0.16.0", ++ "libc", ++ "pnet_base", ++ "pnet_sys", ++ "winapi 0.2.8", + ] + + [[package]] + name = "pnet_macros" + version = "0.26.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bbbd5c52c6e04aa720400f9c71cd0e8bcb38cd13421d5caabd9035e9efa47de9" + dependencies = [ +- "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "syntex 0.42.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "syntex_syntax 0.42.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex", ++ "syntex", ++ "syntex_syntax", + ] + + [[package]] + name = "pnet_macros_support" + version = "0.26.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "daf9c5c0c36766d0a4da9ab268c0700771b8ec367b9463fd678109fa28463c5b" + dependencies = [ +- "pnet_base 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pnet_base", + ] + + [[package]] + name = "pnet_packet" + version = "0.26.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "89e26a864d71d0ac51a549cf40283c44ed1b8f98168545638a4730ef9f560283" + dependencies = [ +- "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", +- "pnet_base 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "pnet_macros 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "pnet_macros_support 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "syntex 0.42.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "glob", ++ "pnet_base", ++ "pnet_macros", ++ "pnet_macros_support", ++ "syntex", + ] + + [[package]] + name = "pnet_sys" + version = "0.26.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "73f0de0c52609f157b25d79ce24d9016ab1bbf10cde761397200d634a833872c" + dependencies = [ +- "libc 0.2.76 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "winapi 0.2.8", ++ "ws2_32-sys", + ] + + [[package]] + name = "pnet_transport" + version = "0.26.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6712ab76534340494d849e3c51c64a6261e4b451337b7c05bd3681e384c48b10" + dependencies = [ +- "libc 0.2.76 (registry+https://github.com/rust-lang/crates.io-index)", +- "pnet_base 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "pnet_packet 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "pnet_sys 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "pnet_base", ++ "pnet_packet", ++ "pnet_sys", + ] + + [[package]] + name = "podio" + version = "0.1.7" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b18befed8bc2b61abc79a457295e7e838417326da1586050b919414073977f19" + + [[package]] + name = "ppv-lite86" + version = "0.2.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" + + [[package]] + name = "proc-macro-error" + version = "0.2.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aeccfe4d5d8ea175d5f0e4a2ad0637e0f4121d63bd99d356fb1f39ab2e7c6097" + dependencies = [ +- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.6", ++ "quote 1.0.2", ++ "syn 1.0.11", + ] + + [[package]] + name = "proc-macro-hack" + version = "0.5.11" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5" + dependencies = [ +- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.6", ++ "quote 1.0.2", ++ "syn 1.0.11", + ] + + [[package]] + name = "proc-macro-nested" + version = "0.1.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "369a6ed065f249a159e06c45752c780bda2fb53c995718f9e484d08daa9eb42e" + + [[package]] + name = "proc-macro2" + version = "0.4.30" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" + dependencies = [ +- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.1.0", + ] + + [[package]] + name = "proc-macro2" + version = "1.0.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27" + dependencies = [ +- "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.2.0", + ] + + [[package]] + name = "procfs" + version = "0.7.9" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c434e93ef69c216e68e4f417c927b4f31502c3560b72cfdb6827e2321c5c6b3e" + dependencies = [ +- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "hex 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.76 (registry+https://github.com/rust-lang/crates.io-index)", +- "libflate 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.2.1", ++ "byteorder", ++ "chrono", ++ "hex", ++ "lazy_static", ++ "libc", ++ "libflate", + ] + + [[package]] + name = "quick-error" + version = "1.2.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" + + [[package]] + name = "quote" + version = "0.6.13" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" + dependencies = [ +- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 0.4.30", + ] + + [[package]] + name = "quote" + version = "1.0.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" + dependencies = [ +- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.6", + ] + + [[package]] + name = "rand" + version = "0.6.5" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" + dependencies = [ +- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.76 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.7", ++ "libc", ++ "rand_chacha 0.1.1", ++ "rand_core 0.4.2", ++ "rand_hc 0.1.0", ++ "rand_isaac", ++ "rand_jitter", ++ "rand_os", ++ "rand_pcg", ++ "rand_xorshift", ++ "winapi 0.3.8", + ] + + [[package]] + name = "rand" + version = "0.7.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412" + dependencies = [ +- "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.76 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "getrandom", ++ "libc", ++ "rand_chacha 0.2.1", ++ "rand_core 0.5.1", ++ "rand_hc 0.2.0", + ] + + [[package]] + name = "rand_chacha" + version = "0.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" + dependencies = [ +- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.7", ++ "rand_core 0.3.1", + ] + + [[package]] + name = "rand_chacha" + version = "0.2.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" + dependencies = [ +- "c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "c2-chacha", ++ "rand_core 0.5.1", + ] + + [[package]] + name = "rand_core" + version = "0.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" + dependencies = [ +- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.2", + ] + + [[package]] + name = "rand_core" + version = "0.4.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" + + [[package]] + name = "rand_core" + version = "0.5.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" + dependencies = [ +- "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "getrandom", + ] + + [[package]] + name = "rand_hc" + version = "0.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" + dependencies = [ +- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1", + ] + + [[package]] + name = "rand_hc" + version = "0.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" + dependencies = [ +- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.5.1", + ] + + [[package]] + name = "rand_isaac" + version = "0.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" + dependencies = [ +- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1", + ] + + [[package]] + name = "rand_jitter" + version = "0.1.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" + dependencies = [ +- "libc 0.2.76 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "rand_core 0.4.2", ++ "winapi 0.3.8", + ] + + [[package]] + name = "rand_os" + version = "0.1.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" + dependencies = [ +- "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.76 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cloudabi", ++ "fuchsia-cprng", ++ "libc", ++ "rand_core 0.4.2", ++ "rdrand", ++ "winapi 0.3.8", + ] + + [[package]] + name = "rand_pcg" + version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" + dependencies = [ +- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.7", ++ "rand_core 0.4.2", + ] + + [[package]] + name = "rand_xorshift" + version = "0.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" + dependencies = [ +- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1", + ] + + [[package]] + name = "rayon" + version = "1.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cfd016f0c045ad38b5251be2c9c0ab806917f82da4d36b2a327e5166adad9270" + dependencies = [ +- "autocfg 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "crossbeam-deque 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "rayon-core 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 1.0.1", ++ "crossbeam-deque", ++ "either", ++ "rayon-core", + ] + + [[package]] + name = "rayon-core" + version = "1.8.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "91739a34c4355b5434ce54c9086c5895604a9c278586d1f1aa95e04f66b525a0" + dependencies = [ +- "crossbeam-channel 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "crossbeam-deque 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "num_cpus 1.13.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-channel", ++ "crossbeam-deque", ++ "crossbeam-utils", ++ "lazy_static", ++ "num_cpus", + ] + + [[package]] + name = "rdrand" + version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" + dependencies = [ +- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1", + ] + + [[package]] + name = "redox_syscall" + version = "0.1.56" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" + + [[package]] + name = "regex" + version = "1.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd" + dependencies = [ +- "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", +- "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "aho-corasick", ++ "memchr", ++ "regex-syntax", ++ "thread_local", + ] + + [[package]] + name = "regex-syntax" + version = "0.6.12" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716" + + [[package]] + name = "remove_dir_all" + version = "0.5.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" + dependencies = [ +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8", + ] + + [[package]] +@@ -1487,881 +1656,718 @@ name = "resolv-conf" + version = "0.6.3" + source = "git+https://github.com/tailhook/resolv-conf?rev=83c0f25ebcb0615550488692c5213ca1ae4acd8f#83c0f25ebcb0615550488692c5213ca1ae4acd8f" + dependencies = [ +- "hostname 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hostname", ++ "quick-error", ++] ++ ++[[package]] ++name = "resolv-conf" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" ++dependencies = [ ++ "quick-error", + ] + + [[package]] + name = "rle-decode-fast" + version = "1.0.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cabe4fa914dec5870285fa7f71f602645da47c486e68486d2b4ceb4a343e90ac" + + [[package]] + name = "rustc-demangle" + version = "0.1.16" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" + + [[package]] + name = "rustc-serialize" + version = "0.3.24" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" + + [[package]] + name = "ryu" + version = "1.0.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8" + + [[package]] + name = "same-file" + version = "1.0.5" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421" + dependencies = [ +- "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-util", + ] + + [[package]] + name = "schannel" + version = "0.1.19" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" + dependencies = [ +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static", ++ "winapi 0.3.8", + ] + + [[package]] + name = "scopeguard" + version = "1.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d" + + [[package]] + name = "security-framework" + version = "0.4.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "64808902d7d99f78eaddd2b4e2509713babc3dc3c85ad6f4c447680f3c01e535" + dependencies = [ +- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "core-foundation 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "core-foundation-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.76 (registry+https://github.com/rust-lang/crates.io-index)", +- "security-framework-sys 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.2.1", ++ "core-foundation", ++ "core-foundation-sys", ++ "libc", ++ "security-framework-sys", + ] + + [[package]] + name = "security-framework-sys" + version = "0.4.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "17bf11d99252f512695eb468de5516e5cf75455521e69dfe343f3b74e4748405" + dependencies = [ +- "core-foundation-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.76 (registry+https://github.com/rust-lang/crates.io-index)", ++ "core-foundation-sys", ++ "libc", + ] + + [[package]] + name = "serde" + version = "1.0.102" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0c4b39bd9b0b087684013a792c59e3e07a46a01d2322518d8a1104641a0b1be0" + dependencies = [ +- "serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive", + ] + + [[package]] + name = "serde_derive" + version = "1.0.102" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ca13fc1a832f793322228923fbb3aba9f3f44444898f835d31ad1b74fa0a2bf8" + dependencies = [ +- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.6", ++ "quote 1.0.2", ++ "syn 1.0.11", + ] + + [[package]] + name = "serde_json" + version = "1.0.41" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2f72eb2a68a7dc3f9a691bfda9305a1c017a6215e5a4545c258500d2099a37c2" + dependencies = [ +- "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)", ++ "itoa", ++ "ryu", ++ "serde", + ] + + [[package]] + name = "serde_yaml" + version = "0.8.11" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "691b17f19fc1ec9d94ec0b5864859290dff279dbd7b03f017afda54eb36c3c35" + dependencies = [ +- "dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)", +- "yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dtoa", ++ "linked-hash-map", ++ "serde", ++ "yaml-rust", + ] + + [[package]] + name = "sha-1" + version = "0.8.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "23962131a91661d643c98940b20fcaffe62d776a823247be80a48fcb8b6fce68" + dependencies = [ +- "block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "block-buffer", ++ "digest", ++ "fake-simd", ++ "opaque-debug", + ] + + [[package]] + name = "signal-hook" + version = "0.1.16" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "604508c1418b99dfe1925ca9224829bb2a8a9a04dda655cc01fcad46f4ab05ed" + dependencies = [ +- "libc 0.2.76 (registry+https://github.com/rust-lang/crates.io-index)", +- "mio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "signal-hook-registry 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "mio 0.7.0", ++ "signal-hook-registry", + ] + + [[package]] + name = "signal-hook-registry" + version = "1.2.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a3e12110bc539e657a646068aaf5eb5b63af9d0c1f7b29c97113fad80e15f035" + dependencies = [ +- "arc-swap 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.76 (registry+https://github.com/rust-lang/crates.io-index)", ++ "arc-swap", ++ "libc", + ] + + [[package]] + name = "slab" + version = "0.4.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" + + [[package]] + name = "smallvec" + version = "0.6.13" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6" + dependencies = [ +- "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "maybe-uninit", + ] + + [[package]] + name = "smallvec" + version = "1.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4ecf3b85f68e8abaa7555aa5abdb1153079387e60b718283d732f03897fcfc86" + + [[package]] + name = "socket2" + version = "0.3.11" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e8b74de517221a2cb01a53349cf54182acdc31a074727d3079068448c0676d85" + dependencies = [ +- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.76 (registry+https://github.com/rust-lang/crates.io-index)", +- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "libc", ++ "redox_syscall", ++ "winapi 0.3.8", + ] + + [[package]] + name = "strsim" + version = "0.8.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + + [[package]] + name = "structopt" + version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "16c2cdbf9cc375f15d1b4141bc48aeef444806655cd0e904207edc8d68d86ed7" + dependencies = [ +- "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "structopt-derive 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", ++ "clap", ++ "structopt-derive 0.2.18", + ] + + [[package]] + name = "structopt" + version = "0.3.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c167b61c7d4c126927f5346a4327ce20abf8a186b8041bbeb1ce49e5db49587b" + dependencies = [ +- "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "structopt-derive 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "clap", ++ "structopt-derive 0.3.4", + ] + + [[package]] + name = "structopt-derive" + version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "53010261a84b37689f9ed7d395165029f9cc7abb9f56bbfe86bee2597ed25107" + dependencies = [ +- "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", ++ "heck", ++ "proc-macro2 0.4.30", ++ "quote 0.6.13", ++ "syn 0.15.44", + ] + + [[package]] + name = "structopt-derive" + version = "0.3.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "519621841414165d2ad0d4c92be8f41844203f2b67e245f9345a5a12d40c69d7" + dependencies = [ +- "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "proc-macro-error 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "heck", ++ "proc-macro-error", ++ "proc-macro2 1.0.6", ++ "quote 1.0.2", ++ "syn 1.0.11", + ] + + [[package]] + name = "syn" + version = "0.15.44" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" + dependencies = [ +- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 0.4.30", ++ "quote 0.6.13", ++ "unicode-xid 0.1.0", + ] + + [[package]] + name = "syn" + version = "1.0.11" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dff0acdb207ae2fe6d5976617f887eb1e35a2ba52c13c7234c790960cdad9238" + dependencies = [ +- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.6", ++ "quote 1.0.2", ++ "unicode-xid 0.2.0", + ] + + [[package]] + name = "synstructure" + version = "0.12.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545" + dependencies = [ +- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.6", ++ "quote 1.0.2", ++ "syn 1.0.11", ++ "unicode-xid 0.2.0", + ] + + [[package]] + name = "syntex" + version = "0.42.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0a30b08a6b383a22e5f6edc127d169670d48f905bb00ca79a00ea3e442ebe317" + dependencies = [ +- "syntex_errors 0.42.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "syntex_syntax 0.42.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syntex_errors", ++ "syntex_syntax", + ] + + [[package]] + name = "syntex_errors" + version = "0.42.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "04c48f32867b6114449155b2a82114b86d4b09e1bddb21c47ff104ab9172b646" + dependencies = [ +- "libc 0.2.76 (registry+https://github.com/rust-lang/crates.io-index)", +- "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", +- "syntex_pos 0.42.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-xid 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "log 0.3.9", ++ "rustc-serialize", ++ "syntex_pos", ++ "term", ++ "unicode-xid 0.0.3", + ] + + [[package]] + name = "syntex_pos" + version = "0.42.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3fd49988e52451813c61fecbe9abb5cfd4e1b7bb6cdbb980a6fbcbab859171a6" + dependencies = [ +- "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc-serialize", + ] + + [[package]] + name = "syntex_syntax" + version = "0.42.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7628a0506e8f9666fdabb5f265d0059b059edac9a3f810bda077abb5d826bd8d" + dependencies = [ +- "bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.76 (registry+https://github.com/rust-lang/crates.io-index)", +- "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", +- "syntex_errors 0.42.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "syntex_pos 0.42.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-xid 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 0.5.0", ++ "libc", ++ "log 0.3.9", ++ "rustc-serialize", ++ "syntex_errors", ++ "syntex_pos", ++ "term", ++ "unicode-xid 0.0.3", + ] + + [[package]] + name = "sysinfo" + version = "0.15.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "13816d558f404113dfdf855ed982f160cf697b3e573a68b2b798062032182212" + dependencies = [ +- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "doc-comment 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.76 (registry+https://github.com/rust-lang/crates.io-index)", +- "ntapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "once_cell 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "rayon 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "doc-comment", ++ "libc", ++ "ntapi", ++ "once_cell", ++ "rayon", ++ "winapi 0.3.8", + ] + + [[package]] + name = "tempfile" + version = "3.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" + dependencies = [ +- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.76 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", +- "remove_dir_all 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "libc", ++ "rand 0.7.2", ++ "redox_syscall", ++ "remove_dir_all", ++ "winapi 0.3.8", + ] + + [[package]] + name = "term" + version = "0.4.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fa63644f74ce96fbeb9b794f66aff2a52d601cbd5e80f4b97123e3899f4570f1" + dependencies = [ +- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "kernel32-sys", ++ "winapi 0.2.8", + ] + + [[package]] + name = "termios" + version = "0.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "72b620c5ea021d75a735c943269bb07d30c9b77d6ac6b236bc8b5c496ef05625" + dependencies = [ +- "libc 0.2.76 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", + ] + + [[package]] + name = "textwrap" + version = "0.11.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" + dependencies = [ +- "unicode-width 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-width", + ] + + [[package]] + name = "thiserror" + version = "1.0.20" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3d0d08" + dependencies = [ +- "thiserror-impl 1.0.20 (registry+https://github.com/rust-lang/crates.io-index)", ++ "thiserror-impl", + ] + + [[package]] + name = "thiserror-impl" + version = "1.0.20" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793" + dependencies = [ +- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.6", ++ "quote 1.0.2", ++ "syn 1.0.11", + ] + + [[package]] + name = "thread_local" + version = "0.3.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" + dependencies = [ +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static", + ] + + [[package]] + name = "time" + version = "0.1.42" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" + dependencies = [ +- "libc 0.2.76 (registry+https://github.com/rust-lang/crates.io-index)", +- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "redox_syscall", ++ "winapi 0.3.8", + ] + + [[package]] + name = "tokio" + version = "0.2.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2e765bf9f550bd9b8a970633ca3b56b8120c4b6c5dcbe26a93744cb02fee4b17" + dependencies = [ +- "bytes 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)", +- "pin-project-lite 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bytes", ++ "fnv", ++ "lazy_static", ++ "mio 0.6.21", ++ "pin-project-lite", ++ "slab", + ] + + [[package]] + name = "trust-dns-proto" + version = "0.18.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "253a722ff22a1217b7af6199cb2ec5824a19c5110e0db21d3fcb28d5f6e1b0ee" + dependencies = [ +- "async-trait 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", +- "enum-as-inner 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "async-trait", ++ "enum-as-inner", ++ "failure", ++ "futures", ++ "idna", ++ "lazy_static", ++ "log 0.4.8", ++ "rand 0.7.2", ++ "smallvec 1.0.0", ++ "socket2", ++ "tokio", ++ "url", + ] + + [[package]] + name = "trust-dns-resolver" + version = "0.18.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "72d7df08b45f4d6d124cdae3c303f9908159a17b39e633e524349e91bc798d32" + dependencies = [ +- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "ipconfig 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "resolv-conf 0.6.3 (git+https://github.com/tailhook/resolv-conf?rev=83c0f25ebcb0615550488692c5213ca1ae4acd8f)", +- "smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "trust-dns-proto 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "failure", ++ "futures", ++ "ipconfig", ++ "lazy_static", ++ "log 0.4.8", ++ "lru-cache", ++ "resolv-conf 0.6.3", ++ "smallvec 1.0.0", ++ "tokio", ++ "trust-dns-proto", + ] + + [[package]] + name = "tui" + version = "0.12.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c2eaeee894a1e9b90f80aa466fe59154fdb471980b5e104d8836fcea309ae17e" + dependencies = [ +- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "cassowary 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "crossterm 0.17.7 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-width 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.2.1", ++ "cassowary", ++ "crossterm", ++ "unicode-segmentation", ++ "unicode-width", + ] + + [[package]] + name = "typenum" + version = "1.11.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9" + + [[package]] + name = "ucd-trie" + version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8f00ed7be0c1ff1e24f46c3d2af4859f7e863672ba3a6e92e7cff702bf9f06c2" + + [[package]] + name = "unicase" + version = "2.6.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" + dependencies = [ +- "version_check 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "version_check", + ] + + [[package]] + name = "unicode-bidi" + version = "0.3.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" + dependencies = [ +- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "matches", + ] + + [[package]] + name = "unicode-normalization" + version = "0.1.9" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "09c8070a9942f5e7cfccd93f490fdebd230ee3c3c9f107cb25bad5351ef671cf" + dependencies = [ +- "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "smallvec 0.6.13", + ] + + [[package]] + name = "unicode-segmentation" + version = "1.6.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" + + [[package]] + name = "unicode-width" + version = "0.1.8" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" + + [[package]] + name = "unicode-xid" + version = "0.0.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "36dff09cafb4ec7c8cf0023eb0b686cb6ce65499116a12201c9e11840ca01beb" + + [[package]] + name = "unicode-xid" + version = "0.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" + + [[package]] + name = "unicode-xid" + version = "0.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" + + [[package]] + name = "url" + version = "2.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "75b414f6c464c879d7f9babf951f23bc3743fb7313c081b2e6ca719067ea9d61" + dependencies = [ +- "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "idna", ++ "matches", ++ "percent-encoding", + ] + + [[package]] + name = "uuid" + version = "0.7.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a" + dependencies = [ +- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.6.5", ++ "serde", + ] + + [[package]] + name = "uuid" + version = "0.8.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9fde2f6a4bea1d6e007c4ad38c6839fa71cbb63b6dbf5b595aa38dc9b1093c11" + dependencies = [ +- "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.7.2", ++ "serde", + ] + + [[package]] + name = "vcpkg" + version = "0.2.10" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c" + + [[package]] + name = "vec_map" + version = "0.8.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" + + [[package]] + name = "version_check" + version = "0.9.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" + + [[package]] + name = "walkdir" + version = "2.2.9" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9658c94fa8b940eab2250bd5a457f9c48b748420d71293b165c8cdbe2f55f71e" + dependencies = [ +- "same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "same-file", ++ "winapi 0.3.8", ++ "winapi-util", + ] + + [[package]] + name = "wasi" + version = "0.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d" + + [[package]] + name = "widestring" + version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "effc0e4ff8085673ea7b9b2e3c73f6bd4d118810c9009ed8f1e16bd96c331db6" + + [[package]] + name = "winapi" + version = "0.2.8" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" + + [[package]] + name = "winapi" + version = "0.3.8" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" + dependencies = [ +- "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", + ] + + [[package]] + name = "winapi-build" + version = "0.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" + + [[package]] + name = "winapi-i686-pc-windows-gnu" + version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + + [[package]] + name = "winapi-util" + version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9" + dependencies = [ +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8", + ] + + [[package]] + name = "winapi-x86_64-pc-windows-gnu" + version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + + [[package]] + name = "winreg" + version = "0.6.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" + dependencies = [ +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8", + ] + + [[package]] + name = "ws2_32-sys" + version = "0.2.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" + dependencies = [ +- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.2.8", ++ "winapi-build", + ] + + [[package]] + name = "yaml-rust" + version = "0.4.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "65923dd1784f44da1d2c3dbbc5e822045628c590ba72123e1c73d3c230c4434d" + dependencies = [ +- "linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "linked-hash-map", + ] + + [[package]] + name = "zip" + version = "0.5.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "58287c28d78507f5f91f2a4cf1e8310e2c76fd4c6932f93ac60fd1ceb402db7d" + dependencies = [ +- "bzip2 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "flate2 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", +- "podio 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", +- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", +-] +- +-[metadata] +-"checksum adler 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" +-"checksum adler32 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" +-"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" +-"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" +-"checksum arc-swap 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f1a1eca3195b729bbd64e292ef2f5fff6b1c28504fed762ce2b1013dde4d8e92" +-"checksum async-trait 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)" = "8b6dd385bb33043b833ba049048d57bdbb4d654a121ed68c71871ca51ff67070" +-"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90" +-"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" +-"checksum autocfg 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" +-"checksum backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)" = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea" +-"checksum backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491" +-"checksum bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4f67931368edf3a9a51d29886d245f1c3db2f1ef0dcc9e35ff70341b78c10d23" +-"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +-"checksum block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" +-"checksum block-padding 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" +-"checksum byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" +-"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" +-"checksum bytes 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "549c8cf9befa7948bfd9ebb0ed84c6b25b0400046b6db1b73c026e4117c26c12" +-"checksum bzip2 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "42b7c3cbf0fa9c1b82308d57191728ca0256cb821220f4e2fd410a72ade26e3b" +-"checksum bzip2-sys 0.1.9+1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ad3b39a260062fca31f7b0b12f207e8f2590a67d32ec7d59c20484b07ea7285e" +-"checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb" +-"checksum cargo-insta 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e22a28c661f0fb0474ef90d63b4bc834bf2c179550608783594f358f5ac74cc2" +-"checksum cassowary 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" +-"checksum cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)" = "aa87058dce70a3ff5621797f1506cb837edd02ac4c0ae642b4542dce802908b8" +-"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" +-"checksum chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e8493056968583b0193c1bb04d6f7684586f3726992d6c573261941a895dbd68" +-"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" +-"checksum clicolors-control 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90082ee5dcdd64dc4e9e0d37fbf3ee325419e39c0092191e0393df65518f741e" +-"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" +-"checksum console 0.7.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8ca57c2c14b8a2bf3105bc9d15574aad80babf6a9c44b1058034cdf8bd169628" +-"checksum console 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b147390a412132d75d10dd3b7b175a69cf5fd95032f7503c7091b8831ba10242" +-"checksum console 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f5d540c2d34ac9dd0deb5f3b5f54c36c79efa78f6b3ad19106a554d07a7b5d9f" +-"checksum core-foundation 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" +-"checksum core-foundation-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" +-"checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" +-"checksum crossbeam-channel 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "cced8691919c02aac3cb0a1bc2e9b73d89e832bf9a06fc579d4e71b68a2da061" +-"checksum crossbeam-deque 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285" +-"checksum crossbeam-epoch 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" +-"checksum crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" +-"checksum crossterm 0.17.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6f4919d60f26ae233e14233cc39746c8c8bb8cd7b05840ace83604917b51b6c7" +-"checksum crossterm_winapi 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "057b7146d02fb50175fd7dbe5158f6097f33d02831f43b4ee8ae4ddf67b68f5c" +-"checksum derive-new 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)" = "71f31892cd5c62e414316f2963c5689242c43d8e7bbcaaeca97e5e28c95d91d9" +-"checksum difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" +-"checksum digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" +-"checksum doc-comment 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" +-"checksum dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e" +-"checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" +-"checksum encode_unicode 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" +-"checksum enum-as-inner 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "900a6c7fbe523f4c2884eaf26b57b81bb69b6810a01a236390a7ac021d09492e" +-"checksum failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9" +-"checksum failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08" +-"checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" +-"checksum flate2 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)" = "766d0e77a2c1502169d4a93ff3b8c15a71fd946cd0126309752104e5f3c46d94" +-"checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" +-"checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +-"checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" +-"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" +-"checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" +-"checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" +-"checksum futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b6f16056ecbb57525ff698bb955162d0cd03bee84e6241c27ff75c08d8ca5987" +-"checksum futures-channel 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fcae98ca17d102fd8a3603727b9259fcf7fa4239b603d2142926189bc8999b86" +-"checksum futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "79564c427afefab1dfb3298535b21eda083ef7935b4f0ecbfcb121f0aec10866" +-"checksum futures-executor 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1e274736563f686a837a0568b478bdabfeaec2dca794b5649b04e2fe1627c231" +-"checksum futures-io 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e676577d229e70952ab25f3945795ba5b16d63ca794ca9d2c860e5595d20b5ff" +-"checksum futures-macro 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "52e7c56c15537adb4f76d0b7a76ad131cb4d2f4f32d3b0bcabcbe1c7c5e87764" +-"checksum futures-sink 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "171be33efae63c2d59e6dbba34186fe0d6394fb378069a76dfd80fdcffd43c16" +-"checksum futures-task 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0bae52d6b29cf440e298856fec3965ee6fa71b06aa7495178615953fd669e5f9" +-"checksum futures-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c0d66274fb76985d3c62c886d1da7ac4c0903a8c9f754e8fe0f35a6a6cc39e76" +-"checksum generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" +-"checksum getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407" +-"checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" +-"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" +-"checksum hermit-abi 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9" +-"checksum hex 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "644f9158b2f133fd50f5fb3242878846d9eb792e445c893805ff0e3824006e35" +-"checksum hostname 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" +-"checksum http_req 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "83169a2c0f68280d1c88a4a1d514810006c181a53c40844563013ae86ed4c478" +-"checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" +-"checksum insta 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "23f83ab4ee86f38b292f0420c27fd412690a4baa9ea0ad4e3fa624bf34379b76" +-"checksum insta 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0d499dc062e841590a67230d853bce62d0abeb91304927871670b7c55c461349" +-"checksum iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" +-"checksum ipconfig 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "aa79fa216fbe60834a9c0737d7fcd30425b32d1c58854663e24d4c4b328ed83f" +-"checksum ipnetwork 0.12.8 (registry+https://github.com/rust-lang/crates.io-index)" = "70783119ac90828aaba91eae39db32c6c1b8838deea3637e5238efa0130801ab" +-"checksum ipnetwork 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b8eca9f51da27bc908ef3dd85c21e1bbba794edaf94d7841e37356275b82d31e" +-"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f" +-"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +-"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +-"checksum libc 0.2.76 (registry+https://github.com/rust-lang/crates.io-index)" = "755456fae044e6fa1ebbbd1b3e902ae19e73097ed4ed87bb79934a867c007bc3" +-"checksum libflate 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e9bac9023e1db29c084f9f8cd9d3852e5e8fddf98fb47c4964a0ea4663d95949" +-"checksum libflate_lz77 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3286f09f7d4926fc486334f28d8d2e6ebe4f7f9994494b6dab27ddfad2c9b11b" +-"checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83" +-"checksum lock_api 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" +-"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" +-"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" +-"checksum lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" +-"checksum maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" +-"checksum match_cfg 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" +-"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" +-"checksum maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" +-"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" +-"checksum memoffset 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "c198b026e1bbf08a937e94c6c60f9ec4a2267f5b0d2eec9c1b21b061ce2be55f" +-"checksum miniz_oxide 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4d7559a8a40d0f97e1edea3220f698f78b1c5ab67532e49f68fde3910323b722" +-"checksum mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)" = "302dec22bcf6bae6dfb69c647187f4b4d0fb6f535521f7bc022430ce8e12008f" +-"checksum mio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6e9971bc8349a361217a8f2a41f5d011274686bd4436465ba51730921039d7fb" +-"checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" +-"checksum miow 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "07b88fb9795d4d36d62a012dfbf49a8f5cf12751f36d31a9dbe66d528e58979e" +-"checksum native-tls 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "2b0d88c06fe90d5ee94048ba40409ef1d9315d86f6f38c2efdaad4fb50c58b2d" +-"checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" +-"checksum netstat2 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a338c16442210137bdcc667853b1c61753e01f9e0ef8a875dbf4cd95c7787f53" +-"checksum ntapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7a31937dea023539c72ddae0e3571deadc1414b300483fa7aaec176168cfa9d2" +-"checksum num-derive 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6f09b9841adb6b5e1f89ef7087ea636e0fd94b2851f887c1e3eb5d5f8228fab3" +-"checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09" +-"checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32" +-"checksum num_cpus 1.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +-"checksum once_cell 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "260e51e7efe62b592207e9e13a68e43692a7a279171d6ba57abd208bf23645ad" +-"checksum opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" +-"checksum openssl 0.10.30 (registry+https://github.com/rust-lang/crates.io-index)" = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4" +-"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" +-"checksum openssl-sys 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)" = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de" +-"checksum packet-builder 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "369f20d8356b3f1cfd362c5b3775d3ca71e0290f259eeff6154420fd06d578d6" +-"checksum parking_lot 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e" +-"checksum parking_lot_core 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3" +-"checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +-"checksum pest 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7e4fb201c5c22a55d8b24fef95f78be52738e5e1361129be1b5e862ecdb6894a" +-"checksum pest_derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0" +-"checksum pest_generator 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7b9fcf299b5712d06ee128a556c94709aaa04512c4dffb8ead07c5c998447fc0" +-"checksum pest_meta 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "df43fd99896fd72c485fe47542c7b500e4ac1e8700bf995544d1317a60ded547" +-"checksum pin-project-lite 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f0af6cbca0e6e3ce8692ee19fb8d734b641899e07b68eb73e9bbbd32f1703991" +-"checksum pin-utils 0.1.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5894c618ce612a3fa23881b152b608bafb8c56cfc22f434a3ba3120b40f7b587" +-"checksum pkg-config 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)" = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33" +-"checksum pnet 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c62df42dcd72f6f2a658bcf38509f1027df1440ac85f1af4badbe034418302dc" +-"checksum pnet_base 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b7cd5f7e15220afa66b0a9a62841ea10089f39dcaa1c29752c0b22dfc03111b5" +-"checksum pnet_datalink 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7318ae1d6e0b7fa1e49933233c9473f2b72d3d18b97e70e2716c6415dde5f915" +-"checksum pnet_macros 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bbbd5c52c6e04aa720400f9c71cd0e8bcb38cd13421d5caabd9035e9efa47de9" +-"checksum pnet_macros_support 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)" = "daf9c5c0c36766d0a4da9ab268c0700771b8ec367b9463fd678109fa28463c5b" +-"checksum pnet_packet 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)" = "89e26a864d71d0ac51a549cf40283c44ed1b8f98168545638a4730ef9f560283" +-"checksum pnet_sys 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)" = "73f0de0c52609f157b25d79ce24d9016ab1bbf10cde761397200d634a833872c" +-"checksum pnet_transport 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6712ab76534340494d849e3c51c64a6261e4b451337b7c05bd3681e384c48b10" +-"checksum podio 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b18befed8bc2b61abc79a457295e7e838417326da1586050b919414073977f19" +-"checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" +-"checksum proc-macro-error 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "aeccfe4d5d8ea175d5f0e4a2ad0637e0f4121d63bd99d356fb1f39ab2e7c6097" +-"checksum proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)" = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5" +-"checksum proc-macro-nested 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "369a6ed065f249a159e06c45752c780bda2fb53c995718f9e484d08daa9eb42e" +-"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" +-"checksum proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27" +-"checksum procfs 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c434e93ef69c216e68e4f417c927b4f31502c3560b72cfdb6827e2321c5c6b3e" +-"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" +-"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" +-"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" +-"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" +-"checksum rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412" +-"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" +-"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" +-"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" +-"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" +-"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +-"checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" +-"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +-"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" +-"checksum rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" +-"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" +-"checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" +-"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" +-"checksum rayon 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cfd016f0c045ad38b5251be2c9c0ab806917f82da4d36b2a327e5166adad9270" +-"checksum rayon-core 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "91739a34c4355b5434ce54c9086c5895604a9c278586d1f1aa95e04f66b525a0" +-"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" +-"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" +-"checksum regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd" +-"checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716" +-"checksum remove_dir_all 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +-"checksum resolv-conf 0.6.3 (git+https://github.com/tailhook/resolv-conf?rev=83c0f25ebcb0615550488692c5213ca1ae4acd8f)" = "" +-"checksum rle-decode-fast 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cabe4fa914dec5870285fa7f71f602645da47c486e68486d2b4ceb4a343e90ac" +-"checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" +-"checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" +-"checksum ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8" +-"checksum same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421" +-"checksum schannel 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)" = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" +-"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d" +-"checksum security-framework 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "64808902d7d99f78eaddd2b4e2509713babc3dc3c85ad6f4c447680f3c01e535" +-"checksum security-framework-sys 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "17bf11d99252f512695eb468de5516e5cf75455521e69dfe343f3b74e4748405" +-"checksum serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)" = "0c4b39bd9b0b087684013a792c59e3e07a46a01d2322518d8a1104641a0b1be0" +-"checksum serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)" = "ca13fc1a832f793322228923fbb3aba9f3f44444898f835d31ad1b74fa0a2bf8" +-"checksum serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)" = "2f72eb2a68a7dc3f9a691bfda9305a1c017a6215e5a4545c258500d2099a37c2" +-"checksum serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)" = "691b17f19fc1ec9d94ec0b5864859290dff279dbd7b03f017afda54eb36c3c35" +-"checksum sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "23962131a91661d643c98940b20fcaffe62d776a823247be80a48fcb8b6fce68" +-"checksum signal-hook 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "604508c1418b99dfe1925ca9224829bb2a8a9a04dda655cc01fcad46f4ab05ed" +-"checksum signal-hook-registry 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a3e12110bc539e657a646068aaf5eb5b63af9d0c1f7b29c97113fad80e15f035" +-"checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" +-"checksum smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6" +-"checksum smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecf3b85f68e8abaa7555aa5abdb1153079387e60b718283d732f03897fcfc86" +-"checksum socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)" = "e8b74de517221a2cb01a53349cf54182acdc31a074727d3079068448c0676d85" +-"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" +-"checksum structopt 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "16c2cdbf9cc375f15d1b4141bc48aeef444806655cd0e904207edc8d68d86ed7" +-"checksum structopt 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c167b61c7d4c126927f5346a4327ce20abf8a186b8041bbeb1ce49e5db49587b" +-"checksum structopt-derive 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "53010261a84b37689f9ed7d395165029f9cc7abb9f56bbfe86bee2597ed25107" +-"checksum structopt-derive 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "519621841414165d2ad0d4c92be8f41844203f2b67e245f9345a5a12d40c69d7" +-"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" +-"checksum syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "dff0acdb207ae2fe6d5976617f887eb1e35a2ba52c13c7234c790960cdad9238" +-"checksum synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545" +-"checksum syntex 0.42.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0a30b08a6b383a22e5f6edc127d169670d48f905bb00ca79a00ea3e442ebe317" +-"checksum syntex_errors 0.42.0 (registry+https://github.com/rust-lang/crates.io-index)" = "04c48f32867b6114449155b2a82114b86d4b09e1bddb21c47ff104ab9172b646" +-"checksum syntex_pos 0.42.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd49988e52451813c61fecbe9abb5cfd4e1b7bb6cdbb980a6fbcbab859171a6" +-"checksum syntex_syntax 0.42.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7628a0506e8f9666fdabb5f265d0059b059edac9a3f810bda077abb5d826bd8d" +-"checksum sysinfo 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)" = "13816d558f404113dfdf855ed982f160cf697b3e573a68b2b798062032182212" +-"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" +-"checksum term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "fa63644f74ce96fbeb9b794f66aff2a52d601cbd5e80f4b97123e3899f4570f1" +-"checksum termios 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "72b620c5ea021d75a735c943269bb07d30c9b77d6ac6b236bc8b5c496ef05625" +-"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +-"checksum thiserror 1.0.20 (registry+https://github.com/rust-lang/crates.io-index)" = "7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3d0d08" +-"checksum thiserror-impl 1.0.20 (registry+https://github.com/rust-lang/crates.io-index)" = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793" +-"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" +-"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" +-"checksum tokio 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2e765bf9f550bd9b8a970633ca3b56b8120c4b6c5dcbe26a93744cb02fee4b17" +-"checksum trust-dns-proto 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)" = "253a722ff22a1217b7af6199cb2ec5824a19c5110e0db21d3fcb28d5f6e1b0ee" +-"checksum trust-dns-resolver 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)" = "72d7df08b45f4d6d124cdae3c303f9908159a17b39e633e524349e91bc798d32" +-"checksum tui 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c2eaeee894a1e9b90f80aa466fe59154fdb471980b5e104d8836fcea309ae17e" +-"checksum typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9" +-"checksum ucd-trie 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8f00ed7be0c1ff1e24f46c3d2af4859f7e863672ba3a6e92e7cff702bf9f06c2" +-"checksum unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +-"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" +-"checksum unicode-normalization 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "09c8070a9942f5e7cfccd93f490fdebd230ee3c3c9f107cb25bad5351ef671cf" +-"checksum unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" +-"checksum unicode-width 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" +-"checksum unicode-xid 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "36dff09cafb4ec7c8cf0023eb0b686cb6ce65499116a12201c9e11840ca01beb" +-"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" +-"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" +-"checksum url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "75b414f6c464c879d7f9babf951f23bc3743fb7313c081b2e6ca719067ea9d61" +-"checksum uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a" +-"checksum uuid 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9fde2f6a4bea1d6e007c4ad38c6839fa71cbb63b6dbf5b595aa38dc9b1093c11" +-"checksum vcpkg 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c" +-"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" +-"checksum version_check 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" +-"checksum walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9658c94fa8b940eab2250bd5a457f9c48b748420d71293b165c8cdbe2f55f71e" +-"checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d" +-"checksum widestring 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "effc0e4ff8085673ea7b9b2e3c73f6bd4d118810c9009ed8f1e16bd96c331db6" +-"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" +-"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" +-"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" +-"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +-"checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9" +-"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +-"checksum winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" +-"checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" +-"checksum yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "65923dd1784f44da1d2c3dbbc5e822045628c590ba72123e1c73d3c230c4434d" +-"checksum zip 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58287c28d78507f5f91f2a4cf1e8310e2c76fd4c6932f93ac60fd1ceb402db7d" ++ "bzip2", ++ "crc32fast", ++ "flate2", ++ "podio", ++ "time", ++] +diff --git a/Cargo.toml b/Cargo.toml +index eff9522..1b6f04d 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -32,7 +32,7 @@ tokio = { version = "0.2", features = ["rt-core", "sync"] } + trust-dns-resolver = "0.18.1" + async-trait = "0.1.21" + unicode-width = "0.1.8" +-resolv-conf = "0.6.3" ++resolv-conf = "0.7.0" + + [target.'cfg(target_os="windows")'.dependencies] + netstat2 = "0.9.0" +-- +2.40.0 + diff --git a/srcpkgs/bandwhich/patches/0002-update-socket2-for-Rust-1.64-compatibility.patch b/srcpkgs/bandwhich/patches/0002-update-socket2-for-Rust-1.64-compatibility.patch new file mode 100644 index 000000000000..bd75deab0c1e --- /dev/null +++ b/srcpkgs/bandwhich/patches/0002-update-socket2-for-Rust-1.64-compatibility.patch @@ -0,0 +1,37 @@ +From 7446a8666b32a40a59fe7b885b23d28f1d856fbb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= + +Date: Mon, 10 Apr 2023 23:23:11 +0200 +Subject: [PATCH 2/6] update socket2 for Rust 1.64+ compatibility + +--- + Cargo.lock | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index bcaf9da..934abd0 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1,5 +1,7 @@ + # This file is automatically @generated by Cargo. + # It is not intended for manual editing. ++version = 3 ++ + [[package]] + name = "adler" + version = "0.2.3" +@@ -1840,9 +1842,9 @@ checksum = "4ecf3b85f68e8abaa7555aa5abdb1153079387e60b718283d732f03897fcfc86" + + [[package]] + name = "socket2" +-version = "0.3.11" ++version = "0.3.16" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e8b74de517221a2cb01a53349cf54182acdc31a074727d3079068448c0676d85" ++checksum = "7fd8b795c389288baa5f355489c65e71fd48a02104600d15c4cfbc561e9e429d" + dependencies = [ + "cfg-if", + "libc", +-- +2.40.0 + diff --git a/srcpkgs/bandwhich/patches/0003-upgrade-tokio-and-trust-dns-resoler-replace-failure-.patch b/srcpkgs/bandwhich/patches/0003-upgrade-tokio-and-trust-dns-resoler-replace-failure-.patch new file mode 100644 index 000000000000..279904bf9b36 --- /dev/null +++ b/srcpkgs/bandwhich/patches/0003-upgrade-tokio-and-trust-dns-resoler-replace-failure-.patch @@ -0,0 +1,2070 @@ +From 4956afcf26a6bfcbaa695ad863b55718371e41e7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= + +Date: Mon, 10 Apr 2023 23:03:07 +0200 +Subject: [PATCH 3/6] upgrade tokio and trust-dns-resoler, replace failure with + anyhow and thiserror + +--- + Cargo.lock | 929 +++++++++++++++++++----------------- + Cargo.toml | 10 +- + src/main.rs | 17 +- + src/network/dns/client.rs | 2 +- + src/network/dns/resolver.rs | 10 +- + src/os/errors.rs | 45 +- + src/os/shared.rs | 35 +- + 7 files changed, 537 insertions(+), 511 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index 934abd0..00da668 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -29,9 +29,15 @@ version = "0.11.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" + dependencies = [ +- "winapi 0.3.8", ++ "winapi 0.3.9", + ] + ++[[package]] ++name = "anyhow" ++version = "1.0.70" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" ++ + [[package]] + name = "arc-swap" + version = "0.4.3" +@@ -40,13 +46,13 @@ checksum = "f1a1eca3195b729bbd64e292ef2f5fff6b1c28504fed762ce2b1013dde4d8e92" + + [[package]] + name = "async-trait" +-version = "0.1.21" ++version = "0.1.68" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8b6dd385bb33043b833ba049048d57bdbb4d654a121ed68c71871ca51ff67070" ++checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" + dependencies = [ +- "proc-macro2 1.0.6", +- "quote 1.0.2", +- "syn 1.0.11", ++ "proc-macro2 1.0.56", ++ "quote 1.0.26", ++ "syn 2.0.13", + ] + + [[package]] +@@ -56,7 +62,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90" + dependencies = [ + "libc", +- "winapi 0.3.8", ++ "winapi 0.3.9", + ] + + [[package]] +@@ -67,41 +73,19 @@ checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" + + [[package]] + name = "autocfg" +-version = "1.0.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" +- +-[[package]] +-name = "backtrace" +-version = "0.3.40" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea" +-dependencies = [ +- "backtrace-sys", +- "cfg-if", +- "libc", +- "rustc-demangle", +-] +- +-[[package]] +-name = "backtrace-sys" +-version = "0.1.32" ++version = "1.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491" +-dependencies = [ +- "cc", +- "libc", +-] ++checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + + [[package]] + name = "bandwhich" + version = "0.20.0" + dependencies = [ ++ "anyhow", + "async-trait", + "cargo-insta", + "chrono", + "crossterm", +- "failure", + "http_req", + "insta 0.12.0", + "ipnetwork 0.16.0", +@@ -112,9 +96,10 @@ dependencies = [ + "pnet_base", + "procfs", + "regex", +- "resolv-conf 0.7.0", ++ "resolv-conf", + "structopt 0.3.4", + "sysinfo", ++ "thiserror", + "tokio", + "trust-dns-resolver", + "tui", +@@ -130,9 +115,9 @@ checksum = "4f67931368edf3a9a51d29886d245f1c3db2f1ef0dcc9e35ff70341b78c10d23" + + [[package]] + name = "bitflags" +-version = "1.2.1" ++version = "1.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + + [[package]] + name = "block-buffer" +@@ -169,9 +154,9 @@ checksum = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" + + [[package]] + name = "bytes" +-version = "0.5.0" ++version = "1.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "549c8cf9befa7948bfd9ebb0ed84c6b25b0400046b6db1b73c026e4117c26c12" ++checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" + + [[package]] + name = "bzip2" +@@ -236,9 +221,15 @@ checksum = "aa87058dce70a3ff5621797f1506cb837edd02ac4c0ae642b4542dce802908b8" + + [[package]] + name = "cfg-if" +-version = "0.1.9" ++version = "0.1.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" ++checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" ++ ++[[package]] ++name = "cfg-if" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + + [[package]] + name = "chrono" +@@ -260,7 +251,7 @@ checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" + dependencies = [ + "ansi_term", + "atty", +- "bitflags 1.2.1", ++ "bitflags 1.3.2", + "strsim", + "textwrap", + "unicode-width", +@@ -276,7 +267,7 @@ dependencies = [ + "atty", + "lazy_static", + "libc", +- "winapi 0.3.8", ++ "winapi 0.3.9", + ] + + [[package]] +@@ -285,7 +276,7 @@ version = "0.0.3" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" + dependencies = [ +- "bitflags 1.2.1", ++ "bitflags 1.3.2", + ] + + [[package]] +@@ -299,11 +290,11 @@ dependencies = [ + "encode_unicode", + "lazy_static", + "libc", +- "parking_lot", ++ "parking_lot 0.12.1", + "regex", + "termios", + "unicode-width", +- "winapi 0.3.8", ++ "winapi 0.3.9", + ] + + [[package]] +@@ -319,7 +310,7 @@ dependencies = [ + "regex", + "termios", + "unicode-width", +- "winapi 0.3.8", ++ "winapi 0.3.9", + ] + + [[package]] +@@ -334,7 +325,7 @@ dependencies = [ + "libc", + "regex", + "termios", +- "winapi 0.3.8", ++ "winapi 0.3.9", + ] + + [[package]] +@@ -359,7 +350,7 @@ version = "1.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.10", + ] + + [[package]] +@@ -389,8 +380,8 @@ version = "0.8.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" + dependencies = [ +- "autocfg 1.0.1", +- "cfg-if", ++ "autocfg 1.1.0", ++ "cfg-if 0.1.10", + "crossbeam-utils", + "lazy_static", + "maybe-uninit", +@@ -404,8 +395,8 @@ version = "0.7.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" + dependencies = [ +- "autocfg 1.0.1", +- "cfg-if", ++ "autocfg 1.1.0", ++ "cfg-if 0.1.10", + "lazy_static", + ] + +@@ -415,14 +406,14 @@ version = "0.17.7" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "6f4919d60f26ae233e14233cc39746c8c8bb8cd7b05840ace83604917b51b6c7" + dependencies = [ +- "bitflags 1.2.1", ++ "bitflags 1.3.2", + "crossterm_winapi", + "lazy_static", + "libc", + "mio 0.7.0", +- "parking_lot", ++ "parking_lot 0.10.2", + "signal-hook", +- "winapi 0.3.8", ++ "winapi 0.3.9", + ] + + [[package]] +@@ -431,18 +422,24 @@ version = "0.6.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "057b7146d02fb50175fd7dbe5158f6097f33d02831f43b4ee8ae4ddf67b68f5c" + dependencies = [ +- "winapi 0.3.8", ++ "winapi 0.3.9", + ] + ++[[package]] ++name = "data-encoding" ++version = "2.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" ++ + [[package]] + name = "derive-new" + version = "0.5.8" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "71f31892cd5c62e414316f2963c5689242c43d8e7bbcaaeca97e5e28c95d91d9" + dependencies = [ +- "proc-macro2 1.0.6", +- "quote 1.0.2", +- "syn 1.0.11", ++ "proc-macro2 1.0.56", ++ "quote 1.0.26", ++ "syn 1.0.109", + ] + + [[package]] +@@ -486,36 +483,14 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + + [[package]] + name = "enum-as-inner" +-version = "0.3.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "900a6c7fbe523f4c2884eaf26b57b81bb69b6810a01a236390a7ac021d09492e" +-dependencies = [ +- "heck", +- "proc-macro2 1.0.6", +- "quote 1.0.2", +- "syn 1.0.11", +-] +- +-[[package]] +-name = "failure" +-version = "0.1.6" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9" +-dependencies = [ +- "backtrace", +- "failure_derive", +-] +- +-[[package]] +-name = "failure_derive" +-version = "0.1.6" ++version = "0.5.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08" ++checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" + dependencies = [ +- "proc-macro2 1.0.6", +- "quote 1.0.2", +- "syn 1.0.11", +- "synstructure", ++ "heck 0.4.1", ++ "proc-macro2 1.0.56", ++ "quote 1.0.26", ++ "syn 1.0.109", + ] + + [[package]] +@@ -530,18 +505,12 @@ version = "1.0.17" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "766d0e77a2c1502169d4a93ff3b8c15a71fd946cd0126309752104e5f3c46d94" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.10", + "crc32fast", + "libc", + "miniz_oxide", + ] + +-[[package]] +-name = "fnv" +-version = "1.0.6" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" +- + [[package]] + name = "foreign-types" + version = "0.3.2" +@@ -558,115 +527,57 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + + [[package]] +-name = "fuchsia-cprng" +-version = "0.1.1" ++name = "form_urlencoded" ++version = "1.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" +- +-[[package]] +-name = "fuchsia-zircon" +-version = "0.3.3" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" ++checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" + dependencies = [ +- "bitflags 1.2.1", +- "fuchsia-zircon-sys", ++ "percent-encoding", + ] + + [[package]] +-name = "fuchsia-zircon-sys" +-version = "0.3.3" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" +- +-[[package]] +-name = "futures" +-version = "0.3.1" ++name = "fuchsia-cprng" ++version = "0.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b6f16056ecbb57525ff698bb955162d0cd03bee84e6241c27ff75c08d8ca5987" +-dependencies = [ +- "futures-channel", +- "futures-core", +- "futures-executor", +- "futures-io", +- "futures-sink", +- "futures-task", +- "futures-util", +-] ++checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" + + [[package]] + name = "futures-channel" +-version = "0.3.1" ++version = "0.3.28" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fcae98ca17d102fd8a3603727b9259fcf7fa4239b603d2142926189bc8999b86" ++checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" + dependencies = [ + "futures-core", +- "futures-sink", + ] + + [[package]] + name = "futures-core" +-version = "0.3.1" ++version = "0.3.28" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "79564c427afefab1dfb3298535b21eda083ef7935b4f0ecbfcb121f0aec10866" +- +-[[package]] +-name = "futures-executor" +-version = "0.3.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1e274736563f686a837a0568b478bdabfeaec2dca794b5649b04e2fe1627c231" +-dependencies = [ +- "futures-core", +- "futures-task", +- "futures-util", +-] ++checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" + + [[package]] + name = "futures-io" +-version = "0.3.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e676577d229e70952ab25f3945795ba5b16d63ca794ca9d2c860e5595d20b5ff" +- +-[[package]] +-name = "futures-macro" +-version = "0.3.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "52e7c56c15537adb4f76d0b7a76ad131cb4d2f4f32d3b0bcabcbe1c7c5e87764" +-dependencies = [ +- "proc-macro-hack", +- "proc-macro2 1.0.6", +- "quote 1.0.2", +- "syn 1.0.11", +-] +- +-[[package]] +-name = "futures-sink" +-version = "0.3.1" ++version = "0.3.28" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "171be33efae63c2d59e6dbba34186fe0d6394fb378069a76dfd80fdcffd43c16" ++checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" + + [[package]] + name = "futures-task" +-version = "0.3.1" ++version = "0.3.28" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0bae52d6b29cf440e298856fec3965ee6fa71b06aa7495178615953fd669e5f9" ++checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" + + [[package]] + name = "futures-util" +-version = "0.3.1" ++version = "0.3.28" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c0d66274fb76985d3c62c886d1da7ac4c0903a8c9f754e8fe0f35a6a6cc39e76" ++checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" + dependencies = [ +- "futures-channel", + "futures-core", +- "futures-io", +- "futures-macro", +- "futures-sink", + "futures-task", +- "memchr", ++ "pin-project-lite", + "pin-utils", +- "proc-macro-hack", +- "proc-macro-nested", + "slab", + ] + +@@ -685,9 +596,20 @@ version = "0.1.13" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.10", ++ "libc", ++ "wasi 0.7.0", ++] ++ ++[[package]] ++name = "getrandom" ++version = "0.2.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" ++dependencies = [ ++ "cfg-if 1.0.0", + "libc", +- "wasi", ++ "wasi 0.11.0+wasi-snapshot-preview1", + ] + + [[package]] +@@ -705,11 +627,17 @@ dependencies = [ + "unicode-segmentation", + ] + ++[[package]] ++name = "heck" ++version = "0.4.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" ++ + [[package]] + name = "hermit-abi" +-version = "0.1.15" ++version = "0.2.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9" ++checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" + dependencies = [ + "libc", + ] +@@ -728,7 +656,7 @@ checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" + dependencies = [ + "libc", + "match_cfg", +- "winapi 0.3.8", ++ "winapi 0.3.9", + ] + + [[package]] +@@ -743,15 +671,25 @@ dependencies = [ + + [[package]] + name = "idna" +-version = "0.2.0" ++version = "0.2.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" ++checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" + dependencies = [ + "matches", + "unicode-bidi", + "unicode-normalization", + ] + ++[[package]] ++name = "idna" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" ++dependencies = [ ++ "unicode-bidi", ++ "unicode-normalization", ++] ++ + [[package]] + name = "insta" + version = "0.11.0" +@@ -784,27 +722,24 @@ dependencies = [ + "uuid 0.8.1", + ] + +-[[package]] +-name = "iovec" +-version = "0.1.4" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" +-dependencies = [ +- "libc", +-] +- + [[package]] + name = "ipconfig" +-version = "0.2.1" ++version = "0.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "aa79fa216fbe60834a9c0737d7fcd30425b32d1c58854663e24d4c4b328ed83f" ++checksum = "bd302af1b90f2463a98fa5ad469fc212c8e3175a41c3068601bfa2727591c5be" + dependencies = [ +- "socket2", ++ "socket2 0.4.9", + "widestring", +- "winapi 0.3.8", ++ "winapi 0.3.9", + "winreg", + ] + ++[[package]] ++name = "ipnet" ++version = "2.7.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" ++ + [[package]] + name = "ipnetwork" + version = "0.12.8" +@@ -844,9 +779,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + + [[package]] + name = "libc" +-version = "0.2.76" ++version = "0.2.141" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "755456fae044e6fa1ebbbd1b3e902ae19e73097ed4ed87bb79934a867c007bc3" ++checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" + + [[package]] + name = "libflate" +@@ -868,9 +803,9 @@ checksum = "3286f09f7d4926fc486334f28d8d2e6ebe4f7f9994494b6dab27ddfad2c9b11b" + + [[package]] + name = "linked-hash-map" +-version = "0.5.2" ++version = "0.5.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83" ++checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + + [[package]] + name = "lock_api" +@@ -881,22 +816,32 @@ dependencies = [ + "scopeguard", + ] + ++[[package]] ++name = "lock_api" ++version = "0.4.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" ++dependencies = [ ++ "autocfg 1.1.0", ++ "scopeguard", ++] ++ + [[package]] + name = "log" + version = "0.3.9" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" + dependencies = [ +- "log 0.4.8", ++ "log 0.4.17", + ] + + [[package]] + name = "log" +-version = "0.4.8" ++version = "0.4.17" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" ++checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" + dependencies = [ +- "cfg-if", ++ "cfg-if 1.0.0", + ] + + [[package]] +@@ -922,9 +867,9 @@ checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" + + [[package]] + name = "matches" +-version = "0.1.8" ++version = "0.1.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" ++checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + + [[package]] + name = "maybe-uninit" +@@ -934,9 +879,9 @@ checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" + + [[package]] + name = "memchr" +-version = "2.2.1" ++version = "2.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" ++checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + + [[package]] + name = "memoffset" +@@ -944,7 +889,7 @@ version = "0.5.5" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "c198b026e1bbf08a937e94c6c60f9ec4a2267f5b0d2eec9c1b21b061ce2be55f" + dependencies = [ +- "autocfg 1.0.1", ++ "autocfg 1.1.0", + ] + + [[package]] +@@ -956,25 +901,6 @@ dependencies = [ + "adler", + ] + +-[[package]] +-name = "mio" +-version = "0.6.21" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "302dec22bcf6bae6dfb69c647187f4b4d0fb6f535521f7bc022430ce8e12008f" +-dependencies = [ +- "cfg-if", +- "fuchsia-zircon", +- "fuchsia-zircon-sys", +- "iovec", +- "kernel32-sys", +- "libc", +- "log 0.4.8", +- "miow 0.2.1", +- "net2", +- "slab", +- "winapi 0.2.8", +-] +- + [[package]] + name = "mio" + version = "0.7.0" +@@ -983,22 +909,22 @@ checksum = "6e9971bc8349a361217a8f2a41f5d011274686bd4436465ba51730921039d7fb" + dependencies = [ + "lazy_static", + "libc", +- "log 0.4.8", +- "miow 0.3.5", ++ "log 0.4.17", ++ "miow", + "ntapi", +- "winapi 0.3.8", ++ "winapi 0.3.9", + ] + + [[package]] +-name = "miow" +-version = "0.2.1" ++name = "mio" ++version = "0.8.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" ++checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" + dependencies = [ +- "kernel32-sys", +- "net2", +- "winapi 0.2.8", +- "ws2_32-sys", ++ "libc", ++ "log 0.4.17", ++ "wasi 0.11.0+wasi-snapshot-preview1", ++ "windows-sys", + ] + + [[package]] +@@ -1007,8 +933,8 @@ version = "0.3.5" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "07b88fb9795d4d36d62a012dfbf49a8f5cf12751f36d31a9dbe66d528e58979e" + dependencies = [ +- "socket2", +- "winapi 0.3.8", ++ "socket2 0.3.16", ++ "winapi 0.3.9", + ] + + [[package]] +@@ -1019,7 +945,7 @@ checksum = "2b0d88c06fe90d5ee94048ba40409ef1d9315d86f6f38c2efdaad4fb50c58b2d" + dependencies = [ + "lazy_static", + "libc", +- "log 0.4.8", ++ "log 0.4.17", + "openssl", + "openssl-probe", + "openssl-sys", +@@ -1029,24 +955,13 @@ dependencies = [ + "tempfile", + ] + +-[[package]] +-name = "net2" +-version = "0.2.33" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" +-dependencies = [ +- "cfg-if", +- "libc", +- "winapi 0.3.8", +-] +- + [[package]] + name = "netstat2" + version = "0.9.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "a338c16442210137bdcc667853b1c61753e01f9e0ef8a875dbf4cd95c7787f53" + dependencies = [ +- "bitflags 1.2.1", ++ "bitflags 1.3.2", + "byteorder", + "libc", + "num-derive", +@@ -1060,7 +975,7 @@ version = "0.3.4" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "7a31937dea023539c72ddae0e3571deadc1414b300483fa7aaec176168cfa9d2" + dependencies = [ +- "winapi 0.3.8", ++ "winapi 0.3.9", + ] + + [[package]] +@@ -1069,9 +984,9 @@ version = "0.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "6f09b9841adb6b5e1f89ef7087ea636e0fd94b2851f887c1e3eb5d5f8228fab3" + dependencies = [ +- "proc-macro2 1.0.6", +- "quote 1.0.2", +- "syn 1.0.11", ++ "proc-macro2 1.0.56", ++ "quote 1.0.26", ++ "syn 1.0.109", + ] + + [[package]] +@@ -1095,9 +1010,9 @@ dependencies = [ + + [[package]] + name = "num_cpus" +-version = "1.13.0" ++version = "1.15.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" ++checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" + dependencies = [ + "hermit-abi", + "libc", +@@ -1105,9 +1020,9 @@ dependencies = [ + + [[package]] + name = "once_cell" +-version = "1.4.1" ++version = "1.17.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "260e51e7efe62b592207e9e13a68e43692a7a279171d6ba57abd208bf23645ad" ++checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" + + [[package]] + name = "opaque-debug" +@@ -1121,8 +1036,8 @@ version = "0.10.30" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4" + dependencies = [ +- "bitflags 1.2.1", +- "cfg-if", ++ "bitflags 1.3.2", ++ "cfg-if 0.1.10", + "foreign-types", + "lazy_static", + "libc", +@@ -1141,7 +1056,7 @@ version = "0.9.58" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de" + dependencies = [ +- "autocfg 1.0.1", ++ "autocfg 1.1.0", + "cc", + "libc", + "pkg-config", +@@ -1168,8 +1083,18 @@ version = "0.10.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e" + dependencies = [ +- "lock_api", +- "parking_lot_core", ++ "lock_api 0.3.4", ++ "parking_lot_core 0.7.2", ++] ++ ++[[package]] ++name = "parking_lot" ++version = "0.12.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" ++dependencies = [ ++ "lock_api 0.4.9", ++ "parking_lot_core 0.9.7", + ] + + [[package]] +@@ -1178,19 +1103,32 @@ version = "0.7.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.10", + "cloudabi", + "libc", +- "redox_syscall", +- "smallvec 1.0.0", +- "winapi 0.3.8", ++ "redox_syscall 0.1.56", ++ "smallvec", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "parking_lot_core" ++version = "0.9.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "libc", ++ "redox_syscall 0.2.16", ++ "smallvec", ++ "windows-sys", + ] + + [[package]] + name = "percent-encoding" +-version = "2.1.0" ++version = "2.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" ++checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" + + [[package]] + name = "pest" +@@ -1219,9 +1157,9 @@ checksum = "7b9fcf299b5712d06ee128a556c94709aaa04512c4dffb8ead07c5c998447fc0" + dependencies = [ + "pest", + "pest_meta", +- "proc-macro2 1.0.6", +- "quote 1.0.2", +- "syn 1.0.11", ++ "proc-macro2 1.0.56", ++ "quote 1.0.26", ++ "syn 1.0.109", + ] + + [[package]] +@@ -1237,15 +1175,15 @@ dependencies = [ + + [[package]] + name = "pin-project-lite" +-version = "0.1.1" ++version = "0.2.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f0af6cbca0e6e3ce8692ee19fb8d734b641899e07b68eb73e9bbbd32f1703991" ++checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" + + [[package]] + name = "pin-utils" +-version = "0.1.0-alpha.4" ++version = "0.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5894c618ce612a3fa23881b152b608bafb8c56cfc22f434a3ba3120b40f7b587" ++checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + + [[package]] + name = "pkg-config" +@@ -1350,9 +1288,9 @@ checksum = "b18befed8bc2b61abc79a457295e7e838417326da1586050b919414073977f19" + + [[package]] + name = "ppv-lite86" +-version = "0.2.6" ++version = "0.2.17" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" ++checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + + [[package]] + name = "proc-macro-error" +@@ -1360,28 +1298,11 @@ version = "0.2.6" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "aeccfe4d5d8ea175d5f0e4a2ad0637e0f4121d63bd99d356fb1f39ab2e7c6097" + dependencies = [ +- "proc-macro2 1.0.6", +- "quote 1.0.2", +- "syn 1.0.11", +-] +- +-[[package]] +-name = "proc-macro-hack" +-version = "0.5.11" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5" +-dependencies = [ +- "proc-macro2 1.0.6", +- "quote 1.0.2", +- "syn 1.0.11", ++ "proc-macro2 1.0.56", ++ "quote 1.0.26", ++ "syn 1.0.109", + ] + +-[[package]] +-name = "proc-macro-nested" +-version = "0.1.3" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "369a6ed065f249a159e06c45752c780bda2fb53c995718f9e484d08daa9eb42e" +- + [[package]] + name = "proc-macro2" + version = "0.4.30" +@@ -1393,11 +1314,11 @@ dependencies = [ + + [[package]] + name = "proc-macro2" +-version = "1.0.6" ++version = "1.0.56" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27" ++checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" + dependencies = [ +- "unicode-xid 0.2.0", ++ "unicode-ident", + ] + + [[package]] +@@ -1406,7 +1327,7 @@ version = "0.7.9" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "c434e93ef69c216e68e4f417c927b4f31502c3560b72cfdb6827e2321c5c6b3e" + dependencies = [ +- "bitflags 1.2.1", ++ "bitflags 1.3.2", + "byteorder", + "chrono", + "hex", +@@ -1417,9 +1338,9 @@ dependencies = [ + + [[package]] + name = "quick-error" +-version = "1.2.2" ++version = "1.2.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" ++checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + + [[package]] + name = "quote" +@@ -1432,11 +1353,11 @@ dependencies = [ + + [[package]] + name = "quote" +-version = "1.0.2" ++version = "1.0.26" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" ++checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" + dependencies = [ +- "proc-macro2 1.0.6", ++ "proc-macro2 1.0.56", + ] + + [[package]] +@@ -1455,7 +1376,7 @@ dependencies = [ + "rand_os", + "rand_pcg", + "rand_xorshift", +- "winapi 0.3.8", ++ "winapi 0.3.9", + ] + + [[package]] +@@ -1464,13 +1385,24 @@ version = "0.7.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412" + dependencies = [ +- "getrandom", ++ "getrandom 0.1.13", + "libc", + "rand_chacha 0.2.1", + "rand_core 0.5.1", + "rand_hc 0.2.0", + ] + ++[[package]] ++name = "rand" ++version = "0.8.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" ++dependencies = [ ++ "libc", ++ "rand_chacha 0.3.1", ++ "rand_core 0.6.4", ++] ++ + [[package]] + name = "rand_chacha" + version = "0.1.1" +@@ -1491,6 +1423,16 @@ dependencies = [ + "rand_core 0.5.1", + ] + ++[[package]] ++name = "rand_chacha" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" ++dependencies = [ ++ "ppv-lite86", ++ "rand_core 0.6.4", ++] ++ + [[package]] + name = "rand_core" + version = "0.3.1" +@@ -1512,7 +1454,16 @@ version = "0.5.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" + dependencies = [ +- "getrandom", ++ "getrandom 0.1.13", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.6.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" ++dependencies = [ ++ "getrandom 0.2.9", + ] + + [[package]] +@@ -1550,7 +1501,7 @@ checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" + dependencies = [ + "libc", + "rand_core 0.4.2", +- "winapi 0.3.8", ++ "winapi 0.3.9", + ] + + [[package]] +@@ -1564,7 +1515,7 @@ dependencies = [ + "libc", + "rand_core 0.4.2", + "rdrand", +- "winapi 0.3.8", ++ "winapi 0.3.9", + ] + + [[package]] +@@ -1592,7 +1543,7 @@ version = "1.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "cfd016f0c045ad38b5251be2c9c0ab806917f82da4d36b2a327e5166adad9270" + dependencies = [ +- "autocfg 1.0.1", ++ "autocfg 1.1.0", + "crossbeam-deque", + "either", + "rayon-core", +@@ -1626,6 +1577,15 @@ version = "0.1.56" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" + ++[[package]] ++name = "redox_syscall" ++version = "0.2.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" ++dependencies = [ ++ "bitflags 1.3.2", ++] ++ + [[package]] + name = "regex" + version = "1.3.1" +@@ -1650,16 +1610,7 @@ version = "0.5.3" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" + dependencies = [ +- "winapi 0.3.8", +-] +- +-[[package]] +-name = "resolv-conf" +-version = "0.6.3" +-source = "git+https://github.com/tailhook/resolv-conf?rev=83c0f25ebcb0615550488692c5213ca1ae4acd8f#83c0f25ebcb0615550488692c5213ca1ae4acd8f" +-dependencies = [ +- "hostname", +- "quick-error", ++ "winapi 0.3.9", + ] + + [[package]] +@@ -1668,6 +1619,7 @@ version = "0.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" + dependencies = [ ++ "hostname", + "quick-error", + ] + +@@ -1677,12 +1629,6 @@ version = "1.0.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "cabe4fa914dec5870285fa7f71f602645da47c486e68486d2b4ceb4a343e90ac" + +-[[package]] +-name = "rustc-demangle" +-version = "0.1.16" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" +- + [[package]] + name = "rustc-serialize" + version = "0.3.24" +@@ -1711,14 +1657,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" + dependencies = [ + "lazy_static", +- "winapi 0.3.8", ++ "winapi 0.3.9", + ] + + [[package]] + name = "scopeguard" +-version = "1.0.0" ++version = "1.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d" ++checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + + [[package]] + name = "security-framework" +@@ -1726,7 +1672,7 @@ version = "0.4.4" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "64808902d7d99f78eaddd2b4e2509713babc3dc3c85ad6f4c447680f3c01e535" + dependencies = [ +- "bitflags 1.2.1", ++ "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", +@@ -1758,9 +1704,9 @@ version = "1.0.102" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ca13fc1a832f793322228923fbb3aba9f3f44444898f835d31ad1b74fa0a2bf8" + dependencies = [ +- "proc-macro2 1.0.6", +- "quote 1.0.2", +- "syn 1.0.11", ++ "proc-macro2 1.0.56", ++ "quote 1.0.26", ++ "syn 1.0.109", + ] + + [[package]] +@@ -1821,24 +1767,18 @@ dependencies = [ + + [[package]] + name = "slab" +-version = "0.4.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" +- +-[[package]] +-name = "smallvec" +-version = "0.6.13" ++version = "0.4.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6" ++checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" + dependencies = [ +- "maybe-uninit", ++ "autocfg 1.1.0", + ] + + [[package]] + name = "smallvec" +-version = "1.0.0" ++version = "1.10.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4ecf3b85f68e8abaa7555aa5abdb1153079387e60b718283d732f03897fcfc86" ++checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + + [[package]] + name = "socket2" +@@ -1846,10 +1786,20 @@ version = "0.3.16" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "7fd8b795c389288baa5f355489c65e71fd48a02104600d15c4cfbc561e9e429d" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.10", + "libc", +- "redox_syscall", +- "winapi 0.3.8", ++ "redox_syscall 0.1.56", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "socket2" ++version = "0.4.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" ++dependencies = [ ++ "libc", ++ "winapi 0.3.9", + ] + + [[package]] +@@ -1884,7 +1834,7 @@ version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "53010261a84b37689f9ed7d395165029f9cc7abb9f56bbfe86bee2597ed25107" + dependencies = [ +- "heck", ++ "heck 0.3.1", + "proc-macro2 0.4.30", + "quote 0.6.13", + "syn 0.15.44", +@@ -1896,11 +1846,11 @@ version = "0.3.4" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "519621841414165d2ad0d4c92be8f41844203f2b67e245f9345a5a12d40c69d7" + dependencies = [ +- "heck", ++ "heck 0.3.1", + "proc-macro-error", +- "proc-macro2 1.0.6", +- "quote 1.0.2", +- "syn 1.0.11", ++ "proc-macro2 1.0.56", ++ "quote 1.0.26", ++ "syn 1.0.109", + ] + + [[package]] +@@ -1916,25 +1866,24 @@ dependencies = [ + + [[package]] + name = "syn" +-version = "1.0.11" ++version = "1.0.109" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dff0acdb207ae2fe6d5976617f887eb1e35a2ba52c13c7234c790960cdad9238" ++checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" + dependencies = [ +- "proc-macro2 1.0.6", +- "quote 1.0.2", +- "unicode-xid 0.2.0", ++ "proc-macro2 1.0.56", ++ "quote 1.0.26", ++ "unicode-ident", + ] + + [[package]] +-name = "synstructure" +-version = "0.12.3" ++name = "syn" ++version = "2.0.13" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545" ++checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec" + dependencies = [ +- "proc-macro2 1.0.6", +- "quote 1.0.2", +- "syn 1.0.11", +- "unicode-xid 0.2.0", ++ "proc-macro2 1.0.56", ++ "quote 1.0.26", ++ "unicode-ident", + ] + + [[package]] +@@ -1992,13 +1941,13 @@ version = "0.15.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "13816d558f404113dfdf855ed982f160cf697b3e573a68b2b798062032182212" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.10", + "doc-comment", + "libc", + "ntapi", + "once_cell", + "rayon", +- "winapi 0.3.8", ++ "winapi 0.3.9", + ] + + [[package]] +@@ -2007,12 +1956,12 @@ version = "3.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.10", + "libc", + "rand 0.7.2", +- "redox_syscall", ++ "redox_syscall 0.1.56", + "remove_dir_all", +- "winapi 0.3.8", ++ "winapi 0.3.9", + ] + + [[package]] +@@ -2045,22 +1994,22 @@ dependencies = [ + + [[package]] + name = "thiserror" +-version = "1.0.20" ++version = "1.0.40" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3d0d08" ++checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" + dependencies = [ + "thiserror-impl", + ] + + [[package]] + name = "thiserror-impl" +-version = "1.0.20" ++version = "1.0.40" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793" ++checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" + dependencies = [ +- "proc-macro2 1.0.6", +- "quote 1.0.2", +- "syn 1.0.11", ++ "proc-macro2 1.0.56", ++ "quote 1.0.26", ++ "syn 2.0.13", + ] + + [[package]] +@@ -2079,60 +2028,115 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" + dependencies = [ + "libc", +- "redox_syscall", +- "winapi 0.3.8", ++ "redox_syscall 0.1.56", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "tinyvec" ++version = "1.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" ++dependencies = [ ++ "tinyvec_macros", + ] + ++[[package]] ++name = "tinyvec_macros" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" ++ + [[package]] + name = "tokio" +-version = "0.2.2" ++version = "1.27.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2e765bf9f550bd9b8a970633ca3b56b8120c4b6c5dcbe26a93744cb02fee4b17" ++checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" + dependencies = [ ++ "autocfg 1.1.0", + "bytes", +- "fnv", +- "lazy_static", +- "mio 0.6.21", ++ "libc", ++ "mio 0.8.6", ++ "num_cpus", + "pin-project-lite", +- "slab", ++ "socket2 0.4.9", ++ "windows-sys", ++] ++ ++[[package]] ++name = "tracing" ++version = "0.1.37" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "pin-project-lite", ++ "tracing-attributes", ++ "tracing-core", ++] ++ ++[[package]] ++name = "tracing-attributes" ++version = "0.1.23" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" ++dependencies = [ ++ "proc-macro2 1.0.56", ++ "quote 1.0.26", ++ "syn 1.0.109", ++] ++ ++[[package]] ++name = "tracing-core" ++version = "0.1.30" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" ++dependencies = [ ++ "once_cell", + ] + + [[package]] + name = "trust-dns-proto" +-version = "0.18.1" ++version = "0.22.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "253a722ff22a1217b7af6199cb2ec5824a19c5110e0db21d3fcb28d5f6e1b0ee" ++checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26" + dependencies = [ + "async-trait", ++ "cfg-if 1.0.0", ++ "data-encoding", + "enum-as-inner", +- "failure", +- "futures", +- "idna", ++ "futures-channel", ++ "futures-io", ++ "futures-util", ++ "idna 0.2.3", ++ "ipnet", + "lazy_static", +- "log 0.4.8", +- "rand 0.7.2", +- "smallvec 1.0.0", +- "socket2", ++ "rand 0.8.5", ++ "smallvec", ++ "thiserror", ++ "tinyvec", + "tokio", ++ "tracing", + "url", + ] + + [[package]] + name = "trust-dns-resolver" +-version = "0.18.1" ++version = "0.22.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "72d7df08b45f4d6d124cdae3c303f9908159a17b39e633e524349e91bc798d32" ++checksum = "aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe" + dependencies = [ +- "cfg-if", +- "failure", +- "futures", ++ "cfg-if 1.0.0", ++ "futures-util", + "ipconfig", + "lazy_static", +- "log 0.4.8", + "lru-cache", +- "resolv-conf 0.6.3", +- "smallvec 1.0.0", ++ "parking_lot 0.12.1", ++ "resolv-conf", ++ "smallvec", ++ "thiserror", + "tokio", ++ "tracing", + "trust-dns-proto", + ] + +@@ -2142,7 +2146,7 @@ version = "0.12.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "c2eaeee894a1e9b90f80aa466fe59154fdb471980b5e104d8836fcea309ae17e" + dependencies = [ +- "bitflags 1.2.1", ++ "bitflags 1.3.2", + "cassowary", + "crossterm", + "unicode-segmentation", +@@ -2172,20 +2176,23 @@ dependencies = [ + + [[package]] + name = "unicode-bidi" +-version = "0.3.4" ++version = "0.3.13" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" +-dependencies = [ +- "matches", +-] ++checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" ++ ++[[package]] ++name = "unicode-ident" ++version = "1.0.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" + + [[package]] + name = "unicode-normalization" +-version = "0.1.9" ++version = "0.1.22" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "09c8070a9942f5e7cfccd93f490fdebd230ee3c3c9f107cb25bad5351ef671cf" ++checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" + dependencies = [ +- "smallvec 0.6.13", ++ "tinyvec", + ] + + [[package]] +@@ -2212,20 +2219,14 @@ version = "0.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" + +-[[package]] +-name = "unicode-xid" +-version = "0.2.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" +- + [[package]] + name = "url" +-version = "2.1.0" ++version = "2.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "75b414f6c464c879d7f9babf951f23bc3743fb7313c081b2e6ca719067ea9d61" ++checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" + dependencies = [ +- "idna", +- "matches", ++ "form_urlencoded", ++ "idna 0.3.0", + "percent-encoding", + ] + +@@ -2274,7 +2275,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "9658c94fa8b940eab2250bd5a457f9c48b748420d71293b165c8cdbe2f55f71e" + dependencies = [ + "same-file", +- "winapi 0.3.8", ++ "winapi 0.3.9", + "winapi-util", + ] + +@@ -2284,11 +2285,17 @@ version = "0.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d" + ++[[package]] ++name = "wasi" ++version = "0.11.0+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" ++ + [[package]] + name = "widestring" +-version = "0.4.0" ++version = "0.5.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "effc0e4ff8085673ea7b9b2e3c73f6bd4d118810c9009ed8f1e16bd96c331db6" ++checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983" + + [[package]] + name = "winapi" +@@ -2298,9 +2305,9 @@ checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" + + [[package]] + name = "winapi" +-version = "0.3.8" ++version = "0.3.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" ++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" + dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +@@ -2324,7 +2331,7 @@ version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9" + dependencies = [ +- "winapi 0.3.8", ++ "winapi 0.3.9", + ] + + [[package]] +@@ -2333,13 +2340,79 @@ version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + ++[[package]] ++name = "windows-sys" ++version = "0.45.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" ++dependencies = [ ++ "windows-targets", ++] ++ ++[[package]] ++name = "windows-targets" ++version = "0.42.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" ++dependencies = [ ++ "windows_aarch64_gnullvm", ++ "windows_aarch64_msvc", ++ "windows_i686_gnu", ++ "windows_i686_msvc", ++ "windows_x86_64_gnu", ++ "windows_x86_64_gnullvm", ++ "windows_x86_64_msvc", ++] ++ ++[[package]] ++name = "windows_aarch64_gnullvm" ++version = "0.42.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" ++ ++[[package]] ++name = "windows_aarch64_msvc" ++version = "0.42.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" ++ ++[[package]] ++name = "windows_i686_gnu" ++version = "0.42.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" ++ ++[[package]] ++name = "windows_i686_msvc" ++version = "0.42.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" ++ ++[[package]] ++name = "windows_x86_64_gnu" ++version = "0.42.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" ++ ++[[package]] ++name = "windows_x86_64_gnullvm" ++version = "0.42.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" ++ ++[[package]] ++name = "windows_x86_64_msvc" ++version = "0.42.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" ++ + [[package]] + name = "winreg" +-version = "0.6.2" ++version = "0.10.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" ++checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" + dependencies = [ +- "winapi 0.3.8", ++ "winapi 0.3.9", + ] + + [[package]] +diff --git a/Cargo.toml b/Cargo.toml +index 1b6f04d..4c083a5 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -24,15 +24,16 @@ ipnetwork = "0.16.0" + tui = { version = "0.12", default-features = false, features = ["crossterm"]} + crossterm = "0.17.7" + structopt = "0.3" +-failure = "0.1.6" + chrono = "0.4" + regex = "1.3.1" + lazy_static = "1.4.0" +-tokio = { version = "0.2", features = ["rt-core", "sync"] } +-trust-dns-resolver = "0.18.1" ++tokio = { version = "1.0", features = ["rt-multi-thread", "sync"] } ++trust-dns-resolver = "0.22.0" + async-trait = "0.1.21" + unicode-width = "0.1.8" + resolv-conf = "0.7.0" ++anyhow = "1.0.70" ++thiserror = "1.0.40" + + [target.'cfg(target_os="windows")'.dependencies] + netstat2 = "0.9.0" +@@ -51,6 +52,3 @@ regex = "1" + [target.'cfg(target_os="windows")'.build-dependencies] + http_req = "0.7.0" + zip = "0.5.6" +- +-[patch.crates-io] +-resolv-conf = { git = 'https://github.com/tailhook/resolv-conf', rev = '83c0f25ebcb0615550488692c5213ca1ae4acd8f' } +diff --git a/src/main.rs b/src/main.rs +index 39319f7..fe08644 100644 +--- a/src/main.rs ++++ b/src/main.rs +@@ -6,6 +6,7 @@ mod os; + #[cfg(test)] + mod tests; + ++use anyhow::Context; + use display::{elapsed_time, RawTerminalBackend, Ui}; + use network::{ + dns::{self, IpTable}, +@@ -77,7 +78,7 @@ fn main() { + } + } + +-fn try_main() -> Result<(), failure::Error> { ++fn try_main() -> Result<(), anyhow::Error> { + use os::get_input; + let opts = Opt::from_args(); + let os_input = get_input(&opts.interface, !opts.no_resolve, &opts.dns_server)?; +@@ -86,16 +87,10 @@ fn try_main() -> Result<(), failure::Error> { + let terminal_backend = RawTerminalBackend {}; + start(terminal_backend, os_input, opts); + } else { +- match terminal::enable_raw_mode() { +- Ok(()) => { +- let stdout = std::io::stdout(); +- let terminal_backend = CrosstermBackend::new(stdout); +- start(terminal_backend, os_input, opts); +- } +- Err(_) => failure::bail!( +- "Failed to get stdout: if you are trying to pipe 'bandwhich' you should use the --raw flag" +- ), +- } ++ terminal::enable_raw_mode().context("Failed to get stdout: if you are trying to pipe 'bandwhich' you should use the --raw flag")?; ++ let stdout = std::io::stdout(); ++ let terminal_backend = CrosstermBackend::new(stdout); ++ start(terminal_backend, os_input, opts); + } + Ok(()) + } +diff --git a/src/network/dns/client.rs b/src/network/dns/client.rs +index c3ed96c..221356e 100644 +--- a/src/network/dns/client.rs ++++ b/src/network/dns/client.rs +@@ -22,7 +22,7 @@ pub struct Client { + } + + impl Client { +- pub fn new(resolver: R, mut runtime: Runtime) -> Result ++ pub fn new(resolver: R, runtime: Runtime) -> Result + where + R: Lookup + Send + Sync + 'static, + { +diff --git a/src/network/dns/resolver.rs b/src/network/dns/resolver.rs +index 1bdaf78..2929ad5 100644 +--- a/src/network/dns/resolver.rs ++++ b/src/network/dns/resolver.rs +@@ -2,7 +2,6 @@ use async_trait::async_trait; + use std::net::IpAddr; + use std::net::SocketAddr; + use std::net::{Ipv4Addr, SocketAddrV4}; +-use tokio::runtime::Handle; + use trust_dns_resolver::config::{NameServerConfig, Protocol, ResolverConfig, ResolverOpts}; + use trust_dns_resolver::{error::ResolveErrorKind, TokioAsyncResolver}; + +@@ -15,9 +14,8 @@ pub struct Resolver(TokioAsyncResolver); + + impl Resolver { + pub async fn new( +- runtime: Handle, + dns_server: &Option, +- ) -> Result { ++ ) -> Result { + let resolver = match dns_server { + Some(dns_server_address) => { + let mut config = ResolverConfig::new(); +@@ -26,12 +24,14 @@ impl Resolver { + let nameserver_config = NameServerConfig { + socket_addr: socket, + protocol: Protocol::Udp, ++ trust_nx_responses: true, + tls_dns_name: None, ++ bind_addr: None, + }; + config.add_name_server(nameserver_config); +- TokioAsyncResolver::new(config, options, runtime).await? ++ TokioAsyncResolver::tokio(config, options)? + } +- None => TokioAsyncResolver::from_system_conf(runtime).await?, ++ None => TokioAsyncResolver::tokio_from_system_conf()?, + }; + Ok(Self(resolver)) + } +diff --git a/src/os/errors.rs b/src/os/errors.rs +index bb3d6db..b8d0059 100644 +--- a/src/os/errors.rs ++++ b/src/os/errors.rs +@@ -1,44 +1,9 @@ +-use std::fmt; ++use thiserror::Error; + +-use failure::{Backtrace, Context, Fail}; +- +-#[derive(Debug)] +-pub struct GetInterfaceError { +- inner: Context, +-} +- +-impl From for GetInterfaceError { +- fn from(kind: GetInterfaceErrorKind) -> GetInterfaceError { +- GetInterfaceError { +- inner: Context::new(kind), +- } +- } +-} +- +-impl From> for GetInterfaceError { +- fn from(inner: Context) -> GetInterfaceError { +- GetInterfaceError { inner } +- } +-} +-#[derive(Clone, Eq, PartialEq, Debug, Fail)] +-pub enum GetInterfaceErrorKind { +- #[fail(display = "{}", _0)] ++#[derive(Clone, Eq, PartialEq, Debug, Error)] ++pub enum GetInterfaceError { ++ #[error("{0}")] + PermissionError(String), +- #[fail(display = "{}", _0)] ++ #[error("{0}")] + OtherError(String), + } +-impl Fail for GetInterfaceError { +- fn cause(&self) -> Option<&dyn Fail> { +- self.inner.cause() +- } +- +- fn backtrace(&self) -> Option<&Backtrace> { +- self.inner.backtrace() +- } +-} +- +-impl fmt::Display for GetInterfaceError { +- fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { +- fmt::Display::fmt(&self.inner, f) +- } +-} +diff --git a/src/os/shared.rs b/src/os/shared.rs +index 4ef25a9..a51e632 100644 +--- a/src/os/shared.rs ++++ b/src/os/shared.rs +@@ -1,3 +1,4 @@ ++use anyhow::Context; + use ::crossterm::event::read; + use ::crossterm::event::Event; + use ::pnet::datalink::Channel::Ethernet; +@@ -9,7 +10,7 @@ use ::tokio::runtime::Runtime; + use ::std::net::Ipv4Addr; + use ::std::time; + +-use crate::os::errors::GetInterfaceErrorKind; ++use crate::os::errors::GetInterfaceError; + + #[cfg(target_os = "linux")] + use crate::os::linux::get_open_sockets; +@@ -34,22 +35,22 @@ impl Iterator for TerminalEvents { + + pub(crate) fn get_datalink_channel( + interface: &NetworkInterface, +-) -> Result, GetInterfaceErrorKind> { ++) -> Result, GetInterfaceError> { + let mut config = Config::default(); + config.read_timeout = Some(time::Duration::new(1, 0)); + config.read_buffer_size = 65536; + + match datalink::channel(interface, config) { + Ok(Ethernet(_tx, rx)) => Ok(rx), +- Ok(_) => Err(GetInterfaceErrorKind::OtherError(format!( ++ Ok(_) => Err(GetInterfaceError::OtherError(format!( + "{}: Unsupported interface type", + interface.name + ))), + Err(e) => match e.kind() { +- ErrorKind::PermissionDenied => Err(GetInterfaceErrorKind::PermissionError( ++ ErrorKind::PermissionDenied => Err(GetInterfaceError::PermissionError( + interface.name.to_owned(), + )), +- _ => Err(GetInterfaceErrorKind::OtherError(format!( ++ _ => Err(GetInterfaceError::OtherError(format!( + "{}: {}", + &interface.name, e + ))), +@@ -83,7 +84,7 @@ where + I: Iterator< + Item = ( + &'a NetworkInterface, +- Result, GetInterfaceErrorKind>, ++ Result, GetInterfaceError>, + ), + >, + { +@@ -95,7 +96,7 @@ where + |acc, (_, elem)| { + if let Some(iface_error) = elem.err() { + match iface_error { +- GetInterfaceErrorKind::PermissionError(interface_name) => { ++ GetInterfaceError::PermissionError(interface_name) => { + if let Some(prev_interface) = acc.permission { + return UserErrors { + permission: Some(format!("{}, {}", prev_interface, interface_name)), +@@ -149,15 +150,9 @@ pub fn get_input( + interface_name: &Option, + resolve: bool, + dns_server: &Option, +-) -> Result { ++) -> Result { + let network_interfaces = if let Some(name) = interface_name { +- match get_interface(&name) { +- Some(interface) => vec![interface], +- None => { +- failure::bail!("Cannot find interface {}", name); +- // the homebrew formula relies on this wording, please be careful when changing +- } +- } ++ vec![get_interface(&name).context(format!("Cannot find interface {}", name))?] + } else { + datalink::interfaces() + }; +@@ -193,20 +188,20 @@ pub fn get_input( + if available_network_frames.is_empty() { + let all_errors = collect_errors(network_frames.clone()); + if !all_errors.is_empty() { +- failure::bail!(all_errors); ++ anyhow::bail!(all_errors); + } + +- failure::bail!("Failed to find any network interface to listen on."); ++ anyhow::bail!("Failed to find any network interface to listen on."); + } + + let keyboard_events = Box::new(TerminalEvents); + let write_to_stdout = create_write_to_stdout(); + let dns_client = if resolve { +- let mut runtime = Runtime::new()?; ++ let runtime = Runtime::new()?; + let resolver = +- match runtime.block_on(dns::Resolver::new(runtime.handle().clone(), dns_server)) { ++ match runtime.block_on(dns::Resolver::new(dns_server)) { + Ok(resolver) => resolver, +- Err(err) => failure::bail!( ++ Err(err) => anyhow::bail!( + "Could not initialize the DNS resolver. Are you offline?\n\nReason: {:?}", + err + ), +-- +2.40.0 + diff --git a/srcpkgs/bandwhich/patches/0004-upgrade-compatible-deps.patch b/srcpkgs/bandwhich/patches/0004-upgrade-compatible-deps.patch new file mode 100644 index 000000000000..f1c8fd8580a8 --- /dev/null +++ b/srcpkgs/bandwhich/patches/0004-upgrade-compatible-deps.patch @@ -0,0 +1,2325 @@ +From 5b7fff250a69d498c1841d2f09d7115fa59c58f9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= + +Date: Mon, 10 Apr 2023 23:04:50 +0200 +Subject: [PATCH 4/6] upgrade compatible deps + +--- + Cargo.lock | 1237 +++++++++++++++++++++++++++++++++++----------------- + Cargo.toml | 18 +- + 2 files changed, 840 insertions(+), 415 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index 00da668..9411b9c 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -4,9 +4,9 @@ version = 3 + + [[package]] + name = "adler" +-version = "0.2.3" ++version = "1.0.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" ++checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + + [[package]] + name = "adler32" +@@ -14,20 +14,41 @@ version = "1.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" + ++[[package]] ++name = "aes" ++version = "0.7.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "cipher", ++ "cpufeatures", ++ "opaque-debug", ++] ++ + [[package]] + name = "aho-corasick" +-version = "0.7.6" ++version = "0.7.20" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" ++checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" + dependencies = [ + "memchr", + ] + ++[[package]] ++name = "android_system_properties" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" ++dependencies = [ ++ "libc", ++] ++ + [[package]] + name = "ansi_term" +-version = "0.11.0" ++version = "0.12.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" ++checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" + dependencies = [ + "winapi 0.3.9", + ] +@@ -38,12 +59,6 @@ version = "1.0.70" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" + +-[[package]] +-name = "arc-swap" +-version = "0.4.3" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f1a1eca3195b729bbd64e292ef2f5fff6b1c28504fed762ce2b1013dde4d8e92" +- + [[package]] + name = "async-trait" + version = "0.1.68" +@@ -57,19 +72,23 @@ dependencies = [ + + [[package]] + name = "atty" +-version = "0.2.13" ++version = "0.2.14" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90" ++checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" + dependencies = [ ++ "hermit-abi 0.1.19", + "libc", + "winapi 0.3.9", + ] + + [[package]] + name = "autocfg" +-version = "0.1.7" ++version = "0.1.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" ++checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" ++dependencies = [ ++ "autocfg 1.1.0", ++] + + [[package]] + name = "autocfg" +@@ -97,7 +116,7 @@ dependencies = [ + "procfs", + "regex", + "resolv-conf", +- "structopt 0.3.4", ++ "structopt 0.3.26", + "sysinfo", + "thiserror", + "tokio", +@@ -107,6 +126,12 @@ dependencies = [ + "zip", + ] + ++[[package]] ++name = "base64ct" ++version = "1.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" ++ + [[package]] + name = "bitflags" + version = "0.5.0" +@@ -121,36 +146,24 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + + [[package]] + name = "block-buffer" +-version = "0.7.3" ++version = "0.10.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" ++checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" + dependencies = [ +- "block-padding", +- "byte-tools", +- "byteorder", + "generic-array", + ] + + [[package]] +-name = "block-padding" +-version = "0.1.5" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" +-dependencies = [ +- "byte-tools", +-] +- +-[[package]] +-name = "byte-tools" +-version = "0.3.1" ++name = "bumpalo" ++version = "3.12.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" ++checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" + + [[package]] + name = "byteorder" +-version = "1.3.2" ++version = "1.4.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" ++checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + + [[package]] + name = "bytes" +@@ -160,9 +173,9 @@ checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" + + [[package]] + name = "bzip2" +-version = "0.3.3" ++version = "0.4.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "42b7c3cbf0fa9c1b82308d57191728ca0256cb821220f4e2fd410a72ade26e3b" ++checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" + dependencies = [ + "bzip2-sys", + "libc", +@@ -170,24 +183,15 @@ dependencies = [ + + [[package]] + name = "bzip2-sys" +-version = "0.1.9+1.0.8" ++version = "0.1.11+1.0.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ad3b39a260062fca31f7b0b12f207e8f2590a67d32ec7d59c20484b07ea7285e" ++checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" + dependencies = [ + "cc", + "libc", + "pkg-config", + ] + +-[[package]] +-name = "c2-chacha" +-version = "0.2.3" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb" +-dependencies = [ +- "ppv-lite86", +-] +- + [[package]] + name = "cargo-insta" + version = "0.11.0" +@@ -215,9 +219,12 @@ checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" + + [[package]] + name = "cc" +-version = "1.0.47" ++version = "1.0.79" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "aa87058dce70a3ff5621797f1506cb837edd02ac4c0ae642b4542dce802908b8" ++checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" ++dependencies = [ ++ "jobserver", ++] + + [[package]] + name = "cfg-if" +@@ -233,21 +240,33 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + + [[package]] + name = "chrono" +-version = "0.4.9" ++version = "0.4.24" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e8493056968583b0193c1bb04d6f7684586f3726992d6c573261941a895dbd68" ++checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" + dependencies = [ +- "libc", ++ "iana-time-zone", ++ "js-sys", + "num-integer", + "num-traits", +- "time", ++ "time 0.1.45", ++ "wasm-bindgen", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "cipher" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" ++dependencies = [ ++ "generic-array", + ] + + [[package]] + name = "clap" +-version = "2.33.0" ++version = "2.34.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" ++checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" + dependencies = [ + "ansi_term", + "atty", +@@ -279,6 +298,16 @@ dependencies = [ + "bitflags 1.3.2", + ] + ++[[package]] ++name = "codespan-reporting" ++version = "0.11.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" ++dependencies = [ ++ "termcolor", ++ "unicode-width", ++] ++ + [[package]] + name = "console" + version = "0.7.7" +@@ -315,9 +344,9 @@ dependencies = [ + + [[package]] + name = "console" +-version = "0.9.1" ++version = "0.9.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f5d540c2d34ac9dd0deb5f3b5f54c36c79efa78f6b3ad19106a554d07a7b5d9f" ++checksum = "45e0f3986890b3acbc782009e2629dfe2baa430ac091519ce3be26164a2ae6c0" + dependencies = [ + "clicolors-control", + "encode_unicode", +@@ -328,11 +357,17 @@ dependencies = [ + "winapi 0.3.9", + ] + ++[[package]] ++name = "constant_time_eq" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" ++ + [[package]] + name = "core-foundation" +-version = "0.7.0" ++version = "0.9.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" ++checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" + dependencies = [ + "core-foundation-sys", + "libc", +@@ -340,64 +375,69 @@ dependencies = [ + + [[package]] + name = "core-foundation-sys" +-version = "0.7.0" ++version = "0.8.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" ++ ++[[package]] ++name = "cpufeatures" ++version = "0.2.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" ++checksum = "280a9f2d8b3a38871a3c8a46fb80db65e5e5ed97da80c4d08bf27fb63e35e181" ++dependencies = [ ++ "libc", ++] + + [[package]] + name = "crc32fast" +-version = "1.2.0" ++version = "1.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" ++checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" + dependencies = [ +- "cfg-if 0.1.10", ++ "cfg-if 1.0.0", + ] + + [[package]] + name = "crossbeam-channel" +-version = "0.4.2" ++version = "0.5.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cced8691919c02aac3cb0a1bc2e9b73d89e832bf9a06fc579d4e71b68a2da061" ++checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" + dependencies = [ ++ "cfg-if 1.0.0", + "crossbeam-utils", +- "maybe-uninit", + ] + + [[package]] + name = "crossbeam-deque" +-version = "0.7.3" ++version = "0.8.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285" ++checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" + dependencies = [ ++ "cfg-if 1.0.0", + "crossbeam-epoch", + "crossbeam-utils", +- "maybe-uninit", + ] + + [[package]] + name = "crossbeam-epoch" +-version = "0.8.2" ++version = "0.9.14" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" ++checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" + dependencies = [ + "autocfg 1.1.0", +- "cfg-if 0.1.10", ++ "cfg-if 1.0.0", + "crossbeam-utils", +- "lazy_static", +- "maybe-uninit", + "memoffset", + "scopeguard", + ] + + [[package]] + name = "crossbeam-utils" +-version = "0.7.2" ++version = "0.8.15" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" ++checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" + dependencies = [ +- "autocfg 1.1.0", +- "cfg-if 0.1.10", +- "lazy_static", ++ "cfg-if 1.0.0", + ] + + [[package]] +@@ -410,7 +450,7 @@ dependencies = [ + "crossterm_winapi", + "lazy_static", + "libc", +- "mio 0.7.0", ++ "mio 0.7.14", + "parking_lot 0.10.2", + "signal-hook", + "winapi 0.3.9", +@@ -418,13 +458,67 @@ dependencies = [ + + [[package]] + name = "crossterm_winapi" +-version = "0.6.1" ++version = "0.6.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "057b7146d02fb50175fd7dbe5158f6097f33d02831f43b4ee8ae4ddf67b68f5c" ++checksum = "c2265c3f8e080075d9b6417aa72293fc71662f34b4af2612d8d1b074d29510db" + dependencies = [ + "winapi 0.3.9", + ] + ++[[package]] ++name = "crypto-common" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" ++dependencies = [ ++ "generic-array", ++ "typenum", ++] ++ ++[[package]] ++name = "cxx" ++version = "1.0.94" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" ++dependencies = [ ++ "cc", ++ "cxxbridge-flags", ++ "cxxbridge-macro", ++ "link-cplusplus", ++] ++ ++[[package]] ++name = "cxx-build" ++version = "1.0.94" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" ++dependencies = [ ++ "cc", ++ "codespan-reporting", ++ "once_cell", ++ "proc-macro2 1.0.56", ++ "quote 1.0.26", ++ "scratch", ++ "syn 2.0.13", ++] ++ ++[[package]] ++name = "cxxbridge-flags" ++version = "1.0.94" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" ++ ++[[package]] ++name = "cxxbridge-macro" ++version = "1.0.94" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" ++dependencies = [ ++ "proc-macro2 1.0.56", ++ "quote 1.0.26", ++ "syn 2.0.13", ++] ++ + [[package]] + name = "data-encoding" + version = "2.3.3" +@@ -433,9 +527,9 @@ checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" + + [[package]] + name = "derive-new" +-version = "0.5.8" ++version = "0.5.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "71f31892cd5c62e414316f2963c5689242c43d8e7bbcaaeca97e5e28c95d91d9" ++checksum = "3418329ca0ad70234b9735dc4ceed10af4df60eff9c8e7b06cb5e520d92c3535" + dependencies = [ + "proc-macro2 1.0.56", + "quote 1.0.26", +@@ -450,30 +544,20 @@ checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" + + [[package]] + name = "digest" +-version = "0.8.1" ++version = "0.10.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" ++checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" + dependencies = [ +- "generic-array", ++ "block-buffer", ++ "crypto-common", ++ "subtle", + ] + +-[[package]] +-name = "doc-comment" +-version = "0.3.3" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" +- +-[[package]] +-name = "dtoa" +-version = "0.4.4" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e" +- + [[package]] + name = "either" +-version = "1.5.3" ++version = "1.8.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" ++checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" + + [[package]] + name = "encode_unicode" +@@ -494,20 +578,42 @@ dependencies = [ + ] + + [[package]] +-name = "fake-simd" ++name = "errno" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" ++dependencies = [ ++ "errno-dragonfly", ++ "libc", ++ "windows-sys 0.48.0", ++] ++ ++[[package]] ++name = "errno-dragonfly" + version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" ++checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" ++dependencies = [ ++ "cc", ++ "libc", ++] ++ ++[[package]] ++name = "fastrand" ++version = "1.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" ++dependencies = [ ++ "instant", ++] + + [[package]] + name = "flate2" +-version = "1.0.17" ++version = "1.0.25" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "766d0e77a2c1502169d4a93ff3b8c15a71fd946cd0126309752104e5f3c46d94" ++checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" + dependencies = [ +- "cfg-if 0.1.10", + "crc32fast", +- "libc", + "miniz_oxide", + ] + +@@ -583,22 +689,12 @@ dependencies = [ + + [[package]] + name = "generic-array" +-version = "0.12.3" ++version = "0.14.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" ++checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" + dependencies = [ + "typenum", +-] +- +-[[package]] +-name = "getrandom" +-version = "0.1.13" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407" +-dependencies = [ +- "cfg-if 0.1.10", +- "libc", +- "wasi 0.7.0", ++ "version_check", + ] + + [[package]] +@@ -618,11 +714,17 @@ version = "0.2.11" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" + ++[[package]] ++name = "hashbrown" ++version = "0.12.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" ++ + [[package]] + name = "heck" +-version = "0.3.1" ++version = "0.3.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" ++checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" + dependencies = [ + "unicode-segmentation", + ] +@@ -633,6 +735,15 @@ version = "0.4.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + ++[[package]] ++name = "hermit-abi" ++version = "0.1.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" ++dependencies = [ ++ "libc", ++] ++ + [[package]] + name = "hermit-abi" + version = "0.2.6" +@@ -642,11 +753,26 @@ dependencies = [ + "libc", + ] + ++[[package]] ++name = "hermit-abi" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" ++ + [[package]] + name = "hex" +-version = "0.4.2" ++version = "0.4.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "644f9158b2f133fd50f5fb3242878846d9eb792e445c893805ff0e3824006e35" ++checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" ++ ++[[package]] ++name = "hmac" ++version = "0.12.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" ++dependencies = [ ++ "digest", ++] + + [[package]] + name = "hostname" +@@ -661,14 +787,38 @@ dependencies = [ + + [[package]] + name = "http_req" +-version = "0.7.0" ++version = "0.9.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "83169a2c0f68280d1c88a4a1d514810006c181a53c40844563013ae86ed4c478" ++checksum = "5825a38a94c3aff23ea7f60572726829ef055ca02fc64899c3e2e7db2ce4f03f" + dependencies = [ + "native-tls", + "unicase", + ] + ++[[package]] ++name = "iana-time-zone" ++version = "0.1.56" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" ++dependencies = [ ++ "android_system_properties", ++ "core-foundation-sys", ++ "iana-time-zone-haiku", ++ "js-sys", ++ "wasm-bindgen", ++ "windows", ++] ++ ++[[package]] ++name = "iana-time-zone-haiku" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" ++dependencies = [ ++ "cxx", ++ "cxx-build", ++] ++ + [[package]] + name = "idna" + version = "0.2.3" +@@ -690,6 +840,16 @@ dependencies = [ + "unicode-normalization", + ] + ++[[package]] ++name = "indexmap" ++version = "1.9.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" ++dependencies = [ ++ "autocfg 1.1.0", ++ "hashbrown", ++] ++ + [[package]] + name = "insta" + version = "0.11.0" +@@ -713,13 +873,33 @@ version = "0.12.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "0d499dc062e841590a67230d853bce62d0abeb91304927871670b7c55c461349" + dependencies = [ +- "console 0.9.1", ++ "console 0.9.2", + "difference", + "lazy_static", + "serde", + "serde_json", + "serde_yaml", +- "uuid 0.8.1", ++ "uuid 0.8.2", ++] ++ ++[[package]] ++name = "instant" ++version = "0.1.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" ++dependencies = [ ++ "cfg-if 1.0.0", ++] ++ ++[[package]] ++name = "io-lifetimes" ++version = "1.0.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" ++dependencies = [ ++ "hermit-abi 0.3.1", ++ "libc", ++ "windows-sys 0.48.0", + ] + + [[package]] +@@ -728,7 +908,7 @@ version = "0.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "bd302af1b90f2463a98fa5ad469fc212c8e3175a41c3068601bfa2727591c5be" + dependencies = [ +- "socket2 0.4.9", ++ "socket2", + "widestring", + "winapi 0.3.9", + "winreg", +@@ -757,9 +937,27 @@ dependencies = [ + + [[package]] + name = "itoa" +-version = "0.4.4" ++version = "1.0.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f" ++checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" ++ ++[[package]] ++name = "jobserver" ++version = "0.1.26" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "js-sys" ++version = "0.3.61" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" ++dependencies = [ ++ "wasm-bindgen", ++] + + [[package]] + name = "kernel32-sys" +@@ -785,21 +983,32 @@ checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" + + [[package]] + name = "libflate" +-version = "1.0.2" ++version = "1.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e9bac9023e1db29c084f9f8cd9d3852e5e8fddf98fb47c4964a0ea4663d95949" ++checksum = "97822bf791bd4d5b403713886a5fbe8bf49520fe78e323b0dc480ca1a03e50b0" + dependencies = [ + "adler32", + "crc32fast", + "libflate_lz77", +- "rle-decode-fast", + ] + + [[package]] + name = "libflate_lz77" +-version = "1.0.0" ++version = "1.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3286f09f7d4926fc486334f28d8d2e6ebe4f7f9994494b6dab27ddfad2c9b11b" ++checksum = "a52d3a8bfc85f250440e4424db7d857e241a3aebbbe301f3eb606ab15c39acbf" ++dependencies = [ ++ "rle-decode-fast", ++] ++ ++[[package]] ++name = "link-cplusplus" ++version = "1.0.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" ++dependencies = [ ++ "cc", ++] + + [[package]] + name = "linked-hash-map" +@@ -807,6 +1016,12 @@ version = "0.5.6" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + ++[[package]] ++name = "linux-raw-sys" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" ++ + [[package]] + name = "lock_api" + version = "0.3.4" +@@ -853,12 +1068,6 @@ dependencies = [ + "linked-hash-map", + ] + +-[[package]] +-name = "maplit" +-version = "1.0.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" +- + [[package]] + name = "match_cfg" + version = "0.1.0" +@@ -871,12 +1080,6 @@ version = "0.1.10" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + +-[[package]] +-name = "maybe-uninit" +-version = "2.0.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" +- + [[package]] + name = "memchr" + version = "2.5.0" +@@ -885,33 +1088,32 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + + [[package]] + name = "memoffset" +-version = "0.5.5" ++version = "0.8.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c198b026e1bbf08a937e94c6c60f9ec4a2267f5b0d2eec9c1b21b061ce2be55f" ++checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" + dependencies = [ + "autocfg 1.1.0", + ] + + [[package]] + name = "miniz_oxide" +-version = "0.4.1" ++version = "0.6.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4d7559a8a40d0f97e1edea3220f698f78b1c5ab67532e49f68fde3910323b722" ++checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" + dependencies = [ + "adler", + ] + + [[package]] + name = "mio" +-version = "0.7.0" ++version = "0.7.14" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6e9971bc8349a361217a8f2a41f5d011274686bd4436465ba51730921039d7fb" ++checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" + dependencies = [ +- "lazy_static", + "libc", + "log 0.4.17", + "miow", +- "ntapi", ++ "ntapi 0.3.7", + "winapi 0.3.9", + ] + +@@ -924,24 +1126,23 @@ dependencies = [ + "libc", + "log 0.4.17", + "wasi 0.11.0+wasi-snapshot-preview1", +- "windows-sys", ++ "windows-sys 0.45.0", + ] + + [[package]] + name = "miow" +-version = "0.3.5" ++version = "0.3.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "07b88fb9795d4d36d62a012dfbf49a8f5cf12751f36d31a9dbe66d528e58979e" ++checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" + dependencies = [ +- "socket2 0.3.16", + "winapi 0.3.9", + ] + + [[package]] + name = "native-tls" +-version = "0.2.4" ++version = "0.2.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2b0d88c06fe90d5ee94048ba40409ef1d9315d86f6f38c2efdaad4fb50c58b2d" ++checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" + dependencies = [ + "lazy_static", + "libc", +@@ -957,9 +1158,9 @@ dependencies = [ + + [[package]] + name = "netstat2" +-version = "0.9.0" ++version = "0.9.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a338c16442210137bdcc667853b1c61753e01f9e0ef8a875dbf4cd95c7787f53" ++checksum = "0faa3f4ad230fd2bf2a5dad71476ecbaeaed904b3c7e7e5b1f266c415c03761f" + dependencies = [ + "bitflags 1.3.2", + "byteorder", +@@ -971,18 +1172,27 @@ dependencies = [ + + [[package]] + name = "ntapi" +-version = "0.3.4" ++version = "0.3.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7a31937dea023539c72ddae0e3571deadc1414b300483fa7aaec176168cfa9d2" ++checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" ++dependencies = [ ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "ntapi" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bc51db7b362b205941f71232e56c625156eb9a929f8cf74a428fd5bc094a4afc" + dependencies = [ + "winapi 0.3.9", + ] + + [[package]] + name = "num-derive" +-version = "0.3.2" ++version = "0.3.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6f09b9841adb6b5e1f89ef7087ea636e0fd94b2851f887c1e3eb5d5f8228fab3" ++checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" + dependencies = [ + "proc-macro2 1.0.56", + "quote 1.0.26", +@@ -991,21 +1201,21 @@ dependencies = [ + + [[package]] + name = "num-integer" +-version = "0.1.41" ++version = "0.1.45" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09" ++checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" + dependencies = [ +- "autocfg 0.1.7", ++ "autocfg 1.1.0", + "num-traits", + ] + + [[package]] + name = "num-traits" +-version = "0.2.8" ++version = "0.2.15" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32" ++checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" + dependencies = [ +- "autocfg 0.1.7", ++ "autocfg 1.1.0", + ] + + [[package]] +@@ -1014,7 +1224,7 @@ version = "1.15.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" + dependencies = [ +- "hermit-abi", ++ "hermit-abi 0.2.6", + "libc", + ] + +@@ -1026,37 +1236,48 @@ checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" + + [[package]] + name = "opaque-debug" +-version = "0.2.3" ++version = "0.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" ++checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" + + [[package]] + name = "openssl" +-version = "0.10.30" ++version = "0.10.50" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4" ++checksum = "7e30d8bc91859781f0a943411186324d580f2bbeb71b452fe91ae344806af3f1" + dependencies = [ + "bitflags 1.3.2", +- "cfg-if 0.1.10", ++ "cfg-if 1.0.0", + "foreign-types", +- "lazy_static", + "libc", ++ "once_cell", ++ "openssl-macros", + "openssl-sys", + ] + ++[[package]] ++name = "openssl-macros" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" ++dependencies = [ ++ "proc-macro2 1.0.56", ++ "quote 1.0.26", ++ "syn 2.0.13", ++] ++ + [[package]] + name = "openssl-probe" +-version = "0.1.2" ++version = "0.1.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" ++checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + + [[package]] + name = "openssl-sys" +-version = "0.9.58" ++version = "0.9.85" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de" ++checksum = "0d3d193fb1488ad46ffe3aaabc912cc931d02ee8518fe2959aea8ef52718b0c0" + dependencies = [ +- "autocfg 1.1.0", + "cc", + "libc", + "pkg-config", +@@ -1084,7 +1305,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e" + dependencies = [ + "lock_api 0.3.4", +- "parking_lot_core 0.7.2", ++ "parking_lot_core 0.7.3", + ] + + [[package]] +@@ -1099,14 +1320,14 @@ dependencies = [ + + [[package]] + name = "parking_lot_core" +-version = "0.7.2" ++version = "0.7.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3" ++checksum = "b93f386bb233083c799e6e642a9d73db98c24a5deeb95ffc85bf281255dffc98" + dependencies = [ + "cfg-if 0.1.10", + "cloudabi", + "libc", +- "redox_syscall 0.1.56", ++ "redox_syscall 0.1.57", + "smallvec", + "winapi 0.3.9", + ] +@@ -1121,7 +1342,30 @@ dependencies = [ + "libc", + "redox_syscall 0.2.16", + "smallvec", +- "windows-sys", ++ "windows-sys 0.45.0", ++] ++ ++[[package]] ++name = "password-hash" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" ++dependencies = [ ++ "base64ct", ++ "rand_core 0.6.4", ++ "subtle", ++] ++ ++[[package]] ++name = "pbkdf2" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" ++dependencies = [ ++ "digest", ++ "hmac", ++ "password-hash", ++ "sha2", + ] + + [[package]] +@@ -1132,18 +1376,19 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" + + [[package]] + name = "pest" +-version = "2.1.2" ++version = "2.5.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7e4fb201c5c22a55d8b24fef95f78be52738e5e1361129be1b5e862ecdb6894a" ++checksum = "7b1403e8401ad5dedea73c626b99758535b342502f8d1e361f4a2dd952749122" + dependencies = [ ++ "thiserror", + "ucd-trie", + ] + + [[package]] + name = "pest_derive" +-version = "2.1.0" ++version = "2.5.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0" ++checksum = "be99c4c1d2fc2769b1d00239431d711d08f6efedcecb8b6e30707160aee99c15" + dependencies = [ + "pest", + "pest_generator", +@@ -1151,26 +1396,26 @@ dependencies = [ + + [[package]] + name = "pest_generator" +-version = "2.1.1" ++version = "2.5.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7b9fcf299b5712d06ee128a556c94709aaa04512c4dffb8ead07c5c998447fc0" ++checksum = "e56094789873daa36164de2e822b3888c6ae4b4f9da555a1103587658c805b1e" + dependencies = [ + "pest", + "pest_meta", + "proc-macro2 1.0.56", + "quote 1.0.26", +- "syn 1.0.109", ++ "syn 2.0.13", + ] + + [[package]] + name = "pest_meta" +-version = "2.1.2" ++version = "2.5.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "df43fd99896fd72c485fe47542c7b500e4ac1e8700bf995544d1317a60ded547" ++checksum = "6733073c7cff3d8459fda0e42f13a047870242aed8b509fe98000928975f359e" + dependencies = [ +- "maplit", ++ "once_cell", + "pest", +- "sha-1", ++ "sha2", + ] + + [[package]] +@@ -1187,9 +1432,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + + [[package]] + name = "pkg-config" +-version = "0.3.18" ++version = "0.3.26" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33" ++checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" + + [[package]] + name = "pnet" +@@ -1277,14 +1522,8 @@ dependencies = [ + "libc", + "pnet_base", + "pnet_packet", +- "pnet_sys", +-] +- +-[[package]] +-name = "podio" +-version = "0.1.7" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b18befed8bc2b61abc79a457295e7e838417326da1586050b919414073977f19" ++ "pnet_sys", ++] + + [[package]] + name = "ppv-lite86" +@@ -1294,13 +1533,26 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + + [[package]] + name = "proc-macro-error" +-version = "0.2.6" ++version = "1.0.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "aeccfe4d5d8ea175d5f0e4a2ad0637e0f4121d63bd99d356fb1f39ab2e7c6097" ++checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" + dependencies = [ ++ "proc-macro-error-attr", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", ++ "version_check", ++] ++ ++[[package]] ++name = "proc-macro-error-attr" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" ++dependencies = [ ++ "proc-macro2 1.0.56", ++ "quote 1.0.26", ++ "version_check", + ] + + [[package]] +@@ -1366,11 +1618,11 @@ version = "0.6.5" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" + dependencies = [ +- "autocfg 0.1.7", ++ "autocfg 0.1.8", + "libc", + "rand_chacha 0.1.1", + "rand_core 0.4.2", +- "rand_hc 0.1.0", ++ "rand_hc", + "rand_isaac", + "rand_jitter", + "rand_os", +@@ -1379,19 +1631,6 @@ dependencies = [ + "winapi 0.3.9", + ] + +-[[package]] +-name = "rand" +-version = "0.7.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412" +-dependencies = [ +- "getrandom 0.1.13", +- "libc", +- "rand_chacha 0.2.1", +- "rand_core 0.5.1", +- "rand_hc 0.2.0", +-] +- + [[package]] + name = "rand" + version = "0.8.5" +@@ -1409,20 +1648,10 @@ version = "0.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" + dependencies = [ +- "autocfg 0.1.7", ++ "autocfg 0.1.8", + "rand_core 0.3.1", + ] + +-[[package]] +-name = "rand_chacha" +-version = "0.2.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" +-dependencies = [ +- "c2-chacha", +- "rand_core 0.5.1", +-] +- + [[package]] + name = "rand_chacha" + version = "0.3.1" +@@ -1448,22 +1677,13 @@ version = "0.4.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" + +-[[package]] +-name = "rand_core" +-version = "0.5.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +-dependencies = [ +- "getrandom 0.1.13", +-] +- + [[package]] + name = "rand_core" + version = "0.6.4" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" + dependencies = [ +- "getrandom 0.2.9", ++ "getrandom", + ] + + [[package]] +@@ -1475,15 +1695,6 @@ dependencies = [ + "rand_core 0.3.1", + ] + +-[[package]] +-name = "rand_hc" +-version = "0.2.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +-dependencies = [ +- "rand_core 0.5.1", +-] +- + [[package]] + name = "rand_isaac" + version = "0.1.1" +@@ -1524,7 +1735,7 @@ version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" + dependencies = [ +- "autocfg 0.1.7", ++ "autocfg 0.1.8", + "rand_core 0.4.2", + ] + +@@ -1539,26 +1750,23 @@ dependencies = [ + + [[package]] + name = "rayon" +-version = "1.4.0" ++version = "1.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cfd016f0c045ad38b5251be2c9c0ab806917f82da4d36b2a327e5166adad9270" ++checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" + dependencies = [ +- "autocfg 1.1.0", +- "crossbeam-deque", + "either", + "rayon-core", + ] + + [[package]] + name = "rayon-core" +-version = "1.8.0" ++version = "1.11.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "91739a34c4355b5434ce54c9086c5895604a9c278586d1f1aa95e04f66b525a0" ++checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" + dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", +- "lazy_static", + "num_cpus", + ] + +@@ -1573,9 +1781,9 @@ dependencies = [ + + [[package]] + name = "redox_syscall" +-version = "0.1.56" ++version = "0.1.57" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" ++checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" + + [[package]] + name = "redox_syscall" +@@ -1586,32 +1794,31 @@ dependencies = [ + "bitflags 1.3.2", + ] + ++[[package]] ++name = "redox_syscall" ++version = "0.3.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" ++dependencies = [ ++ "bitflags 1.3.2", ++] ++ + [[package]] + name = "regex" +-version = "1.3.1" ++version = "1.7.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd" ++checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" + dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +- "thread_local", + ] + + [[package]] + name = "regex-syntax" +-version = "0.6.12" ++version = "0.6.29" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716" +- +-[[package]] +-name = "remove_dir_all" +-version = "0.5.3" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +-dependencies = [ +- "winapi 0.3.9", +-] ++checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + + [[package]] + name = "resolv-conf" +@@ -1625,9 +1832,9 @@ dependencies = [ + + [[package]] + name = "rle-decode-fast" +-version = "1.0.1" ++version = "1.0.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cabe4fa914dec5870285fa7f71f602645da47c486e68486d2b4ceb4a343e90ac" ++checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422" + + [[package]] + name = "rustc-serialize" +@@ -1635,29 +1842,42 @@ version = "0.3.24" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" + ++[[package]] ++name = "rustix" ++version = "0.37.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "85597d61f83914ddeba6a47b3b8ffe7365107221c2e557ed94426489fefb5f77" ++dependencies = [ ++ "bitflags 1.3.2", ++ "errno", ++ "io-lifetimes", ++ "libc", ++ "linux-raw-sys", ++ "windows-sys 0.48.0", ++] ++ + [[package]] + name = "ryu" +-version = "1.0.2" ++version = "1.0.13" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8" ++checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" + + [[package]] + name = "same-file" +-version = "1.0.5" ++version = "1.0.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421" ++checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" + dependencies = [ + "winapi-util", + ] + + [[package]] + name = "schannel" +-version = "0.1.19" ++version = "0.1.21" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" ++checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" + dependencies = [ +- "lazy_static", +- "winapi 0.3.9", ++ "windows-sys 0.42.0", + ] + + [[package]] +@@ -1666,11 +1886,17 @@ version = "1.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + ++[[package]] ++name = "scratch" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" ++ + [[package]] + name = "security-framework" +-version = "0.4.4" ++version = "2.8.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "64808902d7d99f78eaddd2b4e2509713babc3dc3c85ad6f4c447680f3c01e535" ++checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" + dependencies = [ + "bitflags 1.3.2", + "core-foundation", +@@ -1681,9 +1907,9 @@ dependencies = [ + + [[package]] + name = "security-framework-sys" +-version = "0.4.3" ++version = "2.8.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "17bf11d99252f512695eb468de5516e5cf75455521e69dfe343f3b74e4748405" ++checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" + dependencies = [ + "core-foundation-sys", + "libc", +@@ -1691,29 +1917,29 @@ dependencies = [ + + [[package]] + name = "serde" +-version = "1.0.102" ++version = "1.0.159" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0c4b39bd9b0b087684013a792c59e3e07a46a01d2322518d8a1104641a0b1be0" ++checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" + dependencies = [ + "serde_derive", + ] + + [[package]] + name = "serde_derive" +-version = "1.0.102" ++version = "1.0.159" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ca13fc1a832f793322228923fbb3aba9f3f44444898f835d31ad1b74fa0a2bf8" ++checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" + dependencies = [ + "proc-macro2 1.0.56", + "quote 1.0.26", +- "syn 1.0.109", ++ "syn 2.0.13", + ] + + [[package]] + name = "serde_json" +-version = "1.0.41" ++version = "1.0.95" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2f72eb2a68a7dc3f9a691bfda9305a1c017a6215e5a4545c258500d2099a37c2" ++checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744" + dependencies = [ + "itoa", + "ryu", +@@ -1722,46 +1948,55 @@ dependencies = [ + + [[package]] + name = "serde_yaml" +-version = "0.8.11" ++version = "0.8.26" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "691b17f19fc1ec9d94ec0b5864859290dff279dbd7b03f017afda54eb36c3c35" ++checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" + dependencies = [ +- "dtoa", +- "linked-hash-map", ++ "indexmap", ++ "ryu", + "serde", + "yaml-rust", + ] + + [[package]] +-name = "sha-1" +-version = "0.8.1" ++name = "sha1" ++version = "0.10.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "23962131a91661d643c98940b20fcaffe62d776a823247be80a48fcb8b6fce68" ++checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" + dependencies = [ +- "block-buffer", ++ "cfg-if 1.0.0", ++ "cpufeatures", ++ "digest", ++] ++ ++[[package]] ++name = "sha2" ++version = "0.10.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "cpufeatures", + "digest", +- "fake-simd", +- "opaque-debug", + ] + + [[package]] + name = "signal-hook" +-version = "0.1.16" ++version = "0.1.17" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "604508c1418b99dfe1925ca9224829bb2a8a9a04dda655cc01fcad46f4ab05ed" ++checksum = "7e31d442c16f047a671b5a71e2161d6e68814012b7f5379d269ebd915fac2729" + dependencies = [ + "libc", +- "mio 0.7.0", ++ "mio 0.7.14", + "signal-hook-registry", + ] + + [[package]] + name = "signal-hook-registry" +-version = "1.2.1" ++version = "1.4.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a3e12110bc539e657a646068aaf5eb5b63af9d0c1f7b29c97113fad80e15f035" ++checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" + dependencies = [ +- "arc-swap", + "libc", + ] + +@@ -1780,18 +2015,6 @@ version = "1.10.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +-[[package]] +-name = "socket2" +-version = "0.3.16" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7fd8b795c389288baa5f355489c65e71fd48a02104600d15c4cfbc561e9e429d" +-dependencies = [ +- "cfg-if 0.1.10", +- "libc", +- "redox_syscall 0.1.56", +- "winapi 0.3.9", +-] +- + [[package]] + name = "socket2" + version = "0.4.9" +@@ -1820,12 +2043,13 @@ dependencies = [ + + [[package]] + name = "structopt" +-version = "0.3.4" ++version = "0.3.26" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c167b61c7d4c126927f5346a4327ce20abf8a186b8041bbeb1ce49e5db49587b" ++checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" + dependencies = [ + "clap", +- "structopt-derive 0.3.4", ++ "lazy_static", ++ "structopt-derive 0.4.18", + ] + + [[package]] +@@ -1834,7 +2058,7 @@ version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "53010261a84b37689f9ed7d395165029f9cc7abb9f56bbfe86bee2597ed25107" + dependencies = [ +- "heck 0.3.1", ++ "heck 0.3.3", + "proc-macro2 0.4.30", + "quote 0.6.13", + "syn 0.15.44", +@@ -1842,17 +2066,23 @@ dependencies = [ + + [[package]] + name = "structopt-derive" +-version = "0.3.4" ++version = "0.4.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "519621841414165d2ad0d4c92be8f41844203f2b67e245f9345a5a12d40c69d7" ++checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" + dependencies = [ +- "heck 0.3.1", ++ "heck 0.3.3", + "proc-macro-error", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", + ] + ++[[package]] ++name = "subtle" ++version = "2.4.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" ++ + [[package]] + name = "syn" + version = "0.15.44" +@@ -1937,14 +2167,14 @@ dependencies = [ + + [[package]] + name = "sysinfo" +-version = "0.15.1" ++version = "0.28.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "13816d558f404113dfdf855ed982f160cf697b3e573a68b2b798062032182212" ++checksum = "b4c2f3ca6693feb29a89724516f016488e9aafc7f37264f898593ee4b942f31b" + dependencies = [ +- "cfg-if 0.1.10", +- "doc-comment", ++ "cfg-if 1.0.0", ++ "core-foundation-sys", + "libc", +- "ntapi", ++ "ntapi 0.4.0", + "once_cell", + "rayon", + "winapi 0.3.9", +@@ -1952,16 +2182,15 @@ dependencies = [ + + [[package]] + name = "tempfile" +-version = "3.1.0" ++version = "3.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" ++checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" + dependencies = [ +- "cfg-if 0.1.10", +- "libc", +- "rand 0.7.2", +- "redox_syscall 0.1.56", +- "remove_dir_all", +- "winapi 0.3.9", ++ "cfg-if 1.0.0", ++ "fastrand", ++ "redox_syscall 0.3.5", ++ "rustix", ++ "windows-sys 0.45.0", + ] + + [[package]] +@@ -1974,11 +2203,20 @@ dependencies = [ + "winapi 0.2.8", + ] + ++[[package]] ++name = "termcolor" ++version = "1.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" ++dependencies = [ ++ "winapi-util", ++] ++ + [[package]] + name = "termios" +-version = "0.3.1" ++version = "0.3.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "72b620c5ea021d75a735c943269bb07d30c9b77d6ac6b236bc8b5c496ef05625" ++checksum = "411c5bf740737c7918b8b1fe232dca4dc9f8e754b8ad5e20966814001ed0ac6b" + dependencies = [ + "libc", + ] +@@ -2013,25 +2251,32 @@ dependencies = [ + ] + + [[package]] +-name = "thread_local" +-version = "0.3.6" ++name = "time" ++version = "0.1.45" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" ++checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" + dependencies = [ +- "lazy_static", ++ "libc", ++ "wasi 0.10.0+wasi-snapshot-preview1", ++ "winapi 0.3.9", + ] + + [[package]] + name = "time" +-version = "0.1.42" ++version = "0.3.20" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" ++checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" + dependencies = [ +- "libc", +- "redox_syscall 0.1.56", +- "winapi 0.3.9", ++ "serde", ++ "time-core", + ] + ++[[package]] ++name = "time-core" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" ++ + [[package]] + name = "tinyvec" + version = "1.6.0" +@@ -2059,8 +2304,8 @@ dependencies = [ + "mio 0.8.6", + "num_cpus", + "pin-project-lite", +- "socket2 0.4.9", +- "windows-sys", ++ "socket2", ++ "windows-sys 0.45.0", + ] + + [[package]] +@@ -2155,15 +2400,15 @@ dependencies = [ + + [[package]] + name = "typenum" +-version = "1.11.2" ++version = "1.16.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9" ++checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" + + [[package]] + name = "ucd-trie" +-version = "0.1.2" ++version = "0.1.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8f00ed7be0c1ff1e24f46c3d2af4859f7e863672ba3a6e92e7cff702bf9f06c2" ++checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" + + [[package]] + name = "unicase" +@@ -2197,15 +2442,15 @@ dependencies = [ + + [[package]] + name = "unicode-segmentation" +-version = "1.6.0" ++version = "1.10.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" ++checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + + [[package]] + name = "unicode-width" +-version = "0.1.8" ++version = "0.1.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" ++checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + + [[package]] + name = "unicode-xid" +@@ -2242,48 +2487,47 @@ dependencies = [ + + [[package]] + name = "uuid" +-version = "0.8.1" ++version = "0.8.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9fde2f6a4bea1d6e007c4ad38c6839fa71cbb63b6dbf5b595aa38dc9b1093c11" ++checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" + dependencies = [ +- "rand 0.7.2", ++ "getrandom", + "serde", + ] + + [[package]] + name = "vcpkg" +-version = "0.2.10" ++version = "0.2.15" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c" ++checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + + [[package]] + name = "vec_map" +-version = "0.8.1" ++version = "0.8.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" ++checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + + [[package]] + name = "version_check" +-version = "0.9.2" ++version = "0.9.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" ++checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + + [[package]] + name = "walkdir" +-version = "2.2.9" ++version = "2.3.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9658c94fa8b940eab2250bd5a457f9c48b748420d71293b165c8cdbe2f55f71e" ++checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" + dependencies = [ + "same-file", +- "winapi 0.3.9", + "winapi-util", + ] + + [[package]] + name = "wasi" +-version = "0.7.0" ++version = "0.10.0+wasi-snapshot-preview1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d" ++checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + + [[package]] + name = "wasi" +@@ -2291,6 +2535,60 @@ version = "0.11.0+wasi-snapshot-preview1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + ++[[package]] ++name = "wasm-bindgen" ++version = "0.2.84" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "wasm-bindgen-macro", ++] ++ ++[[package]] ++name = "wasm-bindgen-backend" ++version = "0.2.84" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" ++dependencies = [ ++ "bumpalo", ++ "log 0.4.17", ++ "once_cell", ++ "proc-macro2 1.0.56", ++ "quote 1.0.26", ++ "syn 1.0.109", ++ "wasm-bindgen-shared", ++] ++ ++[[package]] ++name = "wasm-bindgen-macro" ++version = "0.2.84" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" ++dependencies = [ ++ "quote 1.0.26", ++ "wasm-bindgen-macro-support", ++] ++ ++[[package]] ++name = "wasm-bindgen-macro-support" ++version = "0.2.84" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" ++dependencies = [ ++ "proc-macro2 1.0.56", ++ "quote 1.0.26", ++ "syn 1.0.109", ++ "wasm-bindgen-backend", ++ "wasm-bindgen-shared", ++] ++ ++[[package]] ++name = "wasm-bindgen-shared" ++version = "0.2.84" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" ++ + [[package]] + name = "widestring" + version = "0.5.1" +@@ -2327,9 +2625,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + + [[package]] + name = "winapi-util" +-version = "0.1.2" ++version = "0.1.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9" ++checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" + dependencies = [ + "winapi 0.3.9", + ] +@@ -2340,13 +2638,46 @@ version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + ++[[package]] ++name = "windows" ++version = "0.48.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" ++dependencies = [ ++ "windows-targets 0.48.0", ++] ++ ++[[package]] ++name = "windows-sys" ++version = "0.42.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" ++dependencies = [ ++ "windows_aarch64_gnullvm 0.42.2", ++ "windows_aarch64_msvc 0.42.2", ++ "windows_i686_gnu 0.42.2", ++ "windows_i686_msvc 0.42.2", ++ "windows_x86_64_gnu 0.42.2", ++ "windows_x86_64_gnullvm 0.42.2", ++ "windows_x86_64_msvc 0.42.2", ++] ++ + [[package]] + name = "windows-sys" + version = "0.45.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" + dependencies = [ +- "windows-targets", ++ "windows-targets 0.42.2", ++] ++ ++[[package]] ++name = "windows-sys" ++version = "0.48.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" ++dependencies = [ ++ "windows-targets 0.48.0", + ] + + [[package]] +@@ -2355,13 +2686,28 @@ version = "0.42.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" + dependencies = [ +- "windows_aarch64_gnullvm", +- "windows_aarch64_msvc", +- "windows_i686_gnu", +- "windows_i686_msvc", +- "windows_x86_64_gnu", +- "windows_x86_64_gnullvm", +- "windows_x86_64_msvc", ++ "windows_aarch64_gnullvm 0.42.2", ++ "windows_aarch64_msvc 0.42.2", ++ "windows_i686_gnu 0.42.2", ++ "windows_i686_msvc 0.42.2", ++ "windows_x86_64_gnu 0.42.2", ++ "windows_x86_64_gnullvm 0.42.2", ++ "windows_x86_64_msvc 0.42.2", ++] ++ ++[[package]] ++name = "windows-targets" ++version = "0.48.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" ++dependencies = [ ++ "windows_aarch64_gnullvm 0.48.0", ++ "windows_aarch64_msvc 0.48.0", ++ "windows_i686_gnu 0.48.0", ++ "windows_i686_msvc 0.48.0", ++ "windows_x86_64_gnu 0.48.0", ++ "windows_x86_64_gnullvm 0.48.0", ++ "windows_x86_64_msvc 0.48.0", + ] + + [[package]] +@@ -2370,42 +2716,84 @@ version = "0.42.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + ++[[package]] ++name = "windows_aarch64_gnullvm" ++version = "0.48.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" ++ + [[package]] + name = "windows_aarch64_msvc" + version = "0.42.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + ++[[package]] ++name = "windows_aarch64_msvc" ++version = "0.48.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" ++ + [[package]] + name = "windows_i686_gnu" + version = "0.42.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + ++[[package]] ++name = "windows_i686_gnu" ++version = "0.48.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" ++ + [[package]] + name = "windows_i686_msvc" + version = "0.42.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + ++[[package]] ++name = "windows_i686_msvc" ++version = "0.48.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" ++ + [[package]] + name = "windows_x86_64_gnu" + version = "0.42.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + ++[[package]] ++name = "windows_x86_64_gnu" ++version = "0.48.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" ++ + [[package]] + name = "windows_x86_64_gnullvm" + version = "0.42.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + ++[[package]] ++name = "windows_x86_64_gnullvm" ++version = "0.48.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" ++ + [[package]] + name = "windows_x86_64_msvc" + version = "0.42.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + ++[[package]] ++name = "windows_x86_64_msvc" ++version = "0.48.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" ++ + [[package]] + name = "winreg" + version = "0.10.1" +@@ -2427,22 +2815,59 @@ dependencies = [ + + [[package]] + name = "yaml-rust" +-version = "0.4.3" ++version = "0.4.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "65923dd1784f44da1d2c3dbbc5e822045628c590ba72123e1c73d3c230c4434d" ++checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" + dependencies = [ + "linked-hash-map", + ] + + [[package]] + name = "zip" +-version = "0.5.6" ++version = "0.6.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "58287c28d78507f5f91f2a4cf1e8310e2c76fd4c6932f93ac60fd1ceb402db7d" ++checksum = "0445d0fbc924bb93539b4316c11afb121ea39296f99a3c4c9edad09e3658cdef" + dependencies = [ ++ "aes", ++ "byteorder", + "bzip2", ++ "constant_time_eq", + "crc32fast", ++ "crossbeam-utils", + "flate2", +- "podio", +- "time", ++ "hmac", ++ "pbkdf2", ++ "sha1", ++ "time 0.3.20", ++ "zstd", ++] ++ ++[[package]] ++name = "zstd" ++version = "0.11.2+zstd.1.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" ++dependencies = [ ++ "zstd-safe", ++] ++ ++[[package]] ++name = "zstd-safe" ++version = "5.0.2+zstd.1.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" ++dependencies = [ ++ "libc", ++ "zstd-sys", ++] ++ ++[[package]] ++name = "zstd-sys" ++version = "2.0.8+zstd.1.5.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" ++dependencies = [ ++ "cc", ++ "libc", ++ "pkg-config", + ] +diff --git a/Cargo.toml b/Cargo.toml +index 4c083a5..f978ae1 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -25,22 +25,22 @@ tui = { version = "0.12", default-features = false, features = ["crossterm"]} + crossterm = "0.17.7" + structopt = "0.3" + chrono = "0.4" +-regex = "1.3.1" ++regex = "1.7.3" + lazy_static = "1.4.0" +-tokio = { version = "1.0", features = ["rt-multi-thread", "sync"] } ++tokio = { version = "1.27", features = ["rt-multi-thread", "sync"] } + trust-dns-resolver = "0.22.0" +-async-trait = "0.1.21" +-unicode-width = "0.1.8" ++async-trait = "0.1.68" ++unicode-width = "0.1.10" + resolv-conf = "0.7.0" + anyhow = "1.0.70" + thiserror = "1.0.40" + + [target.'cfg(target_os="windows")'.dependencies] +-netstat2 = "0.9.0" +-sysinfo = "0.15.1" ++netstat2 = "0.9.1" ++sysinfo = "0.28.4" + + [target.'cfg(target_os="linux")'.dependencies] +-procfs = "0.7.4" ++procfs = "0.7.9" + + [dev-dependencies] + insta = "0.12.0" +@@ -50,5 +50,5 @@ packet-builder = "0.5.0" + regex = "1" + + [target.'cfg(target_os="windows")'.build-dependencies] +-http_req = "0.7.0" +-zip = "0.5.6" ++http_req = "0.9.1" ++zip = "0.6.4" +-- +2.40.0 + diff --git a/srcpkgs/bandwhich/patches/0005-upgrade-tui-and-crossterm.patch b/srcpkgs/bandwhich/patches/0005-upgrade-tui-and-crossterm.patch new file mode 100644 index 000000000000..0e8fc0263561 --- /dev/null +++ b/srcpkgs/bandwhich/patches/0005-upgrade-tui-and-crossterm.patch @@ -0,0 +1,606 @@ +From 327f66c29dce36ec6b719701e785bd735da87528 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= + +Date: Mon, 10 Apr 2023 23:15:02 +0200 +Subject: [PATCH 5/6] upgrade tui and crossterm + +--- + Cargo.lock | 180 ++++++++++++-------------------- + Cargo.toml | 4 +- + src/display/components/table.rs | 6 +- + src/main.rs | 4 + + src/tests/cases/test_utils.rs | 5 + + src/tests/cases/ui.rs | 11 ++ + 6 files changed, 90 insertions(+), 120 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index 9411b9c..6e52d4c 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -20,7 +20,7 @@ version = "0.7.5" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" + dependencies = [ +- "cfg-if 1.0.0", ++ "cfg-if", + "cipher", + "cpufeatures", + "opaque-debug", +@@ -104,7 +104,7 @@ dependencies = [ + "async-trait", + "cargo-insta", + "chrono", +- "crossterm", ++ "crossterm 0.26.1", + "http_req", + "insta 0.12.0", + "ipnetwork 0.16.0", +@@ -226,12 +226,6 @@ dependencies = [ + "jobserver", + ] + +-[[package]] +-name = "cfg-if" +-version = "0.1.10" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" +- + [[package]] + name = "cfg-if" + version = "1.0.0" +@@ -319,7 +313,7 @@ dependencies = [ + "encode_unicode", + "lazy_static", + "libc", +- "parking_lot 0.12.1", ++ "parking_lot", + "regex", + "termios", + "unicode-width", +@@ -394,7 +388,7 @@ version = "1.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" + dependencies = [ +- "cfg-if 1.0.0", ++ "cfg-if", + ] + + [[package]] +@@ -403,7 +397,7 @@ version = "0.5.8" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" + dependencies = [ +- "cfg-if 1.0.0", ++ "cfg-if", + "crossbeam-utils", + ] + +@@ -413,7 +407,7 @@ version = "0.8.3" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" + dependencies = [ +- "cfg-if 1.0.0", ++ "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", + ] +@@ -425,7 +419,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" + dependencies = [ + "autocfg 1.1.0", +- "cfg-if 1.0.0", ++ "cfg-if", + "crossbeam-utils", + "memoffset", + "scopeguard", +@@ -437,30 +431,46 @@ version = "0.8.15" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" + dependencies = [ +- "cfg-if 1.0.0", ++ "cfg-if", + ] + + [[package]] + name = "crossterm" +-version = "0.17.7" ++version = "0.25.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6f4919d60f26ae233e14233cc39746c8c8bb8cd7b05840ace83604917b51b6c7" ++checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67" + dependencies = [ + "bitflags 1.3.2", + "crossterm_winapi", +- "lazy_static", + "libc", +- "mio 0.7.14", +- "parking_lot 0.10.2", ++ "mio", ++ "parking_lot", + "signal-hook", ++ "signal-hook-mio", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "crossterm" ++version = "0.26.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13" ++dependencies = [ ++ "bitflags 1.3.2", ++ "crossterm_winapi", ++ "libc", ++ "mio", ++ "parking_lot", ++ "signal-hook", ++ "signal-hook-mio", + "winapi 0.3.9", + ] + + [[package]] + name = "crossterm_winapi" +-version = "0.6.2" ++version = "0.9.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c2265c3f8e080075d9b6417aa72293fc71662f34b4af2612d8d1b074d29510db" ++checksum = "2ae1b35a484aa10e07fe0638d02301c5ad24de82d310ccbd2f3693da5f09bf1c" + dependencies = [ + "winapi 0.3.9", + ] +@@ -703,7 +713,7 @@ version = "0.2.9" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" + dependencies = [ +- "cfg-if 1.0.0", ++ "cfg-if", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", + ] +@@ -888,7 +898,7 @@ version = "0.1.12" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" + dependencies = [ +- "cfg-if 1.0.0", ++ "cfg-if", + ] + + [[package]] +@@ -1022,15 +1032,6 @@ version = "0.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" + +-[[package]] +-name = "lock_api" +-version = "0.3.4" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" +-dependencies = [ +- "scopeguard", +-] +- + [[package]] + name = "lock_api" + version = "0.4.9" +@@ -1056,7 +1057,7 @@ version = "0.4.17" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" + dependencies = [ +- "cfg-if 1.0.0", ++ "cfg-if", + ] + + [[package]] +@@ -1104,19 +1105,6 @@ dependencies = [ + "adler", + ] + +-[[package]] +-name = "mio" +-version = "0.7.14" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" +-dependencies = [ +- "libc", +- "log 0.4.17", +- "miow", +- "ntapi 0.3.7", +- "winapi 0.3.9", +-] +- + [[package]] + name = "mio" + version = "0.8.6" +@@ -1129,15 +1117,6 @@ dependencies = [ + "windows-sys 0.45.0", + ] + +-[[package]] +-name = "miow" +-version = "0.3.7" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" +-dependencies = [ +- "winapi 0.3.9", +-] +- + [[package]] + name = "native-tls" + version = "0.2.11" +@@ -1170,15 +1149,6 @@ dependencies = [ + "thiserror", + ] + +-[[package]] +-name = "ntapi" +-version = "0.3.7" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" +-dependencies = [ +- "winapi 0.3.9", +-] +- + [[package]] + name = "ntapi" + version = "0.4.0" +@@ -1247,7 +1217,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "7e30d8bc91859781f0a943411186324d580f2bbeb71b452fe91ae344806af3f1" + dependencies = [ + "bitflags 1.3.2", +- "cfg-if 1.0.0", ++ "cfg-if", + "foreign-types", + "libc", + "once_cell", +@@ -1298,38 +1268,14 @@ dependencies = [ + "pnet_macros_support", + ] + +-[[package]] +-name = "parking_lot" +-version = "0.10.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e" +-dependencies = [ +- "lock_api 0.3.4", +- "parking_lot_core 0.7.3", +-] +- + [[package]] + name = "parking_lot" + version = "0.12.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" + dependencies = [ +- "lock_api 0.4.9", +- "parking_lot_core 0.9.7", +-] +- +-[[package]] +-name = "parking_lot_core" +-version = "0.7.3" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b93f386bb233083c799e6e642a9d73db98c24a5deeb95ffc85bf281255dffc98" +-dependencies = [ +- "cfg-if 0.1.10", +- "cloudabi", +- "libc", +- "redox_syscall 0.1.57", +- "smallvec", +- "winapi 0.3.9", ++ "lock_api", ++ "parking_lot_core", + ] + + [[package]] +@@ -1338,7 +1284,7 @@ version = "0.9.7" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" + dependencies = [ +- "cfg-if 1.0.0", ++ "cfg-if", + "libc", + "redox_syscall 0.2.16", + "smallvec", +@@ -1779,12 +1725,6 @@ dependencies = [ + "rand_core 0.3.1", + ] + +-[[package]] +-name = "redox_syscall" +-version = "0.1.57" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" +- + [[package]] + name = "redox_syscall" + version = "0.2.16" +@@ -1964,7 +1904,7 @@ version = "0.10.5" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" + dependencies = [ +- "cfg-if 1.0.0", ++ "cfg-if", + "cpufeatures", + "digest", + ] +@@ -1975,22 +1915,32 @@ version = "0.10.6" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" + dependencies = [ +- "cfg-if 1.0.0", ++ "cfg-if", + "cpufeatures", + "digest", + ] + + [[package]] + name = "signal-hook" +-version = "0.1.17" ++version = "0.3.15" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7e31d442c16f047a671b5a71e2161d6e68814012b7f5379d269ebd915fac2729" ++checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" + dependencies = [ + "libc", +- "mio 0.7.14", + "signal-hook-registry", + ] + ++[[package]] ++name = "signal-hook-mio" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" ++dependencies = [ ++ "libc", ++ "mio", ++ "signal-hook", ++] ++ + [[package]] + name = "signal-hook-registry" + version = "1.4.1" +@@ -2171,10 +2121,10 @@ version = "0.28.4" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "b4c2f3ca6693feb29a89724516f016488e9aafc7f37264f898593ee4b942f31b" + dependencies = [ +- "cfg-if 1.0.0", ++ "cfg-if", + "core-foundation-sys", + "libc", +- "ntapi 0.4.0", ++ "ntapi", + "once_cell", + "rayon", + "winapi 0.3.9", +@@ -2186,7 +2136,7 @@ version = "3.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" + dependencies = [ +- "cfg-if 1.0.0", ++ "cfg-if", + "fastrand", + "redox_syscall 0.3.5", + "rustix", +@@ -2301,7 +2251,7 @@ dependencies = [ + "autocfg 1.1.0", + "bytes", + "libc", +- "mio 0.8.6", ++ "mio", + "num_cpus", + "pin-project-lite", + "socket2", +@@ -2314,7 +2264,7 @@ version = "0.1.37" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" + dependencies = [ +- "cfg-if 1.0.0", ++ "cfg-if", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +@@ -2347,7 +2297,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26" + dependencies = [ + "async-trait", +- "cfg-if 1.0.0", ++ "cfg-if", + "data-encoding", + "enum-as-inner", + "futures-channel", +@@ -2371,12 +2321,12 @@ version = "0.22.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe" + dependencies = [ +- "cfg-if 1.0.0", ++ "cfg-if", + "futures-util", + "ipconfig", + "lazy_static", + "lru-cache", +- "parking_lot 0.12.1", ++ "parking_lot", + "resolv-conf", + "smallvec", + "thiserror", +@@ -2387,13 +2337,13 @@ dependencies = [ + + [[package]] + name = "tui" +-version = "0.12.0" ++version = "0.19.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c2eaeee894a1e9b90f80aa466fe59154fdb471980b5e104d8836fcea309ae17e" ++checksum = "ccdd26cbd674007e649a272da4475fb666d3aa0ad0531da7136db6fab0e5bad1" + dependencies = [ + "bitflags 1.3.2", + "cassowary", +- "crossterm", ++ "crossterm 0.25.0", + "unicode-segmentation", + "unicode-width", + ] +@@ -2541,7 +2491,7 @@ version = "0.2.84" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" + dependencies = [ +- "cfg-if 1.0.0", ++ "cfg-if", + "wasm-bindgen-macro", + ] + +diff --git a/Cargo.toml b/Cargo.toml +index f978ae1..a735e4d 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -21,8 +21,8 @@ exclude = ["src/tests/*", "demo.gif"] + [dependencies] + pnet = "0.26.0" + ipnetwork = "0.16.0" +-tui = { version = "0.12", default-features = false, features = ["crossterm"]} +-crossterm = "0.17.7" ++tui = "0.19" ++crossterm = "0.26.1" + structopt = "0.3" + chrono = "0.4" + regex = "1.7.3" +diff --git a/src/display/components/table.rs b/src/display/components/table.rs +index 65de8be..96fa6a7 100644 +--- a/src/display/components/table.rs ++++ b/src/display/components/table.rs +@@ -289,12 +289,12 @@ impl<'a> Table<'a> { + ], + }); + +- let table_rows = rows.map(|row| Row::StyledData(row.into_iter(), Style::default())); ++ let table_rows = rows.map(|row| Row::new(row).style(Style::default())); + let width_constraints: Vec = + widths.iter().map(|w| Constraint::Length(*w)).collect(); +- let table = ::tui::widgets::Table::new(column_names.into_iter(), table_rows) ++ let table = ::tui::widgets::Table::new(table_rows) ++ .header(Row::new(column_names).style(Style::default().fg(Color::Yellow))) + .block(Block::default().title(self.title).borders(Borders::ALL)) +- .header_style(Style::default().fg(Color::Yellow)) + .widths(&width_constraints) + .style(Style::default()) + .column_spacing(column_spacing); +diff --git a/src/main.rs b/src/main.rs +index fe08644..7303446 100644 +--- a/src/main.rs ++++ b/src/main.rs +@@ -221,10 +221,12 @@ where + Event::Key(KeyEvent { + modifiers: KeyModifiers::CONTROL, + code: KeyCode::Char('c'), ++ .. + }) + | Event::Key(KeyEvent { + modifiers: KeyModifiers::NONE, + code: KeyCode::Char('q'), ++ .. + }) => { + running.store(false, Ordering::Release); + display_handler.unpark(); +@@ -237,6 +239,7 @@ where + Event::Key(KeyEvent { + modifiers: KeyModifiers::NONE, + code: KeyCode::Char(' '), ++ .. + }) => { + let restarting = paused.fetch_xor(true, Ordering::SeqCst); + if restarting { +@@ -255,6 +258,7 @@ where + Event::Key(KeyEvent { + modifiers: KeyModifiers::NONE, + code: KeyCode::Tab, ++ .. + }) => { + let paused = paused.load(Ordering::SeqCst); + let elapsed_time = elapsed_time( +diff --git a/src/tests/cases/test_utils.rs b/src/tests/cases/test_utils.rs +index ab8e502..d5685a6 100644 +--- a/src/tests/cases/test_utils.rs ++++ b/src/tests/cases/test_utils.rs +@@ -6,6 +6,7 @@ use std::iter; + + use crate::network::dns::Client; + use crate::{Opt, OsInputOutput, RenderOpts}; ++use crossterm::event::{KeyEventKind, KeyEventState}; + use ::crossterm::event::{Event, KeyCode, KeyEvent, KeyModifiers}; + use packet_builder::*; + use pnet::datalink::DataLinkReceiver; +@@ -22,6 +23,8 @@ pub fn sleep_and_quit_events(sleep_num: usize) -> Box { + events.push(Some(Event::Key(KeyEvent { + modifiers: KeyModifiers::CONTROL, + code: KeyCode::Char('c'), ++ kind: KeyEventKind::Press, ++ state: KeyEventState::NONE, + }))); + Box::new(TerminalEvents::new(events)) + } +@@ -32,6 +35,8 @@ pub fn sleep_resize_and_quit_events(sleep_num: usize) -> Box { + events.push(Some(Event::Key(KeyEvent { + modifiers: KeyModifiers::CONTROL, + code: KeyCode::Char('c'), ++ kind: KeyEventKind::Press, ++ state: KeyEventState::NONE, + }))); + Box::new(TerminalEvents::new(events)) + } +diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs +index 14bf861..ebde8e4 100644 +--- a/src/tests/cases/ui.rs ++++ b/src/tests/cases/ui.rs +@@ -3,6 +3,7 @@ use crate::tests::fakes::{ + create_fake_dns_client, get_interfaces, get_open_sockets, NetworkFrames, + }; + ++use crossterm::event::{KeyEventKind, KeyEventState}; + use ::insta::assert_snapshot; + + use ::std::collections::HashMap; +@@ -71,16 +72,22 @@ fn pause_by_space() { + events.push(Some(Event::Key(KeyEvent { + modifiers: KeyModifiers::NONE, + code: KeyCode::Char(' '), ++ kind: KeyEventKind::Press, ++ state: KeyEventState::NONE, + }))); + events.push(None); + events.push(None); + events.push(Some(Event::Key(KeyEvent { + modifiers: KeyModifiers::NONE, + code: KeyCode::Char(' '), ++ kind: KeyEventKind::Press, ++ state: KeyEventState::NONE, + }))); + events.push(Some(Event::Key(KeyEvent { + modifiers: KeyModifiers::CONTROL, + code: KeyCode::Char('c'), ++ kind: KeyEventKind::Press, ++ state: KeyEventState::NONE, + }))); + + let events = Box::new(TerminalEvents::new(events)); +@@ -131,12 +138,16 @@ fn rearranged_by_tab() { + events.push(Some(Event::Key(KeyEvent { + modifiers: KeyModifiers::NONE, + code: KeyCode::Tab, ++ kind: KeyEventKind::Press, ++ state: KeyEventState::NONE, + }))); + events.push(None); + events.push(None); + events.push(Some(Event::Key(KeyEvent { + modifiers: KeyModifiers::CONTROL, + code: KeyCode::Char('c'), ++ kind: KeyEventKind::Press, ++ state: KeyEventState::NONE, + }))); + + let events = Box::new(TerminalEvents::new(events)); +-- +2.40.0 + diff --git a/srcpkgs/bandwhich/patches/0006-upgrade-pnet-and-ipnetwork.patch b/srcpkgs/bandwhich/patches/0006-upgrade-pnet-and-ipnetwork.patch new file mode 100644 index 000000000000..375deae52384 --- /dev/null +++ b/srcpkgs/bandwhich/patches/0006-upgrade-pnet-and-ipnetwork.patch @@ -0,0 +1,1550 @@ +From bb5c80808f943164c01dd3882310cd5809f013ed Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= + +Date: Mon, 10 Apr 2023 23:20:05 +0200 +Subject: [PATCH 6/6] upgrade pnet and ipnetwork + +--- + Cargo.lock | 763 +++++++++------------------------- + Cargo.toml | 16 +- + src/tests/fakes/fake_input.rs | 1 + + 3 files changed, 206 insertions(+), 574 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index 6e52d4c..d7f9c9d 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -50,7 +50,7 @@ version = "0.12.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" + dependencies = [ +- "winapi 0.3.9", ++ "winapi", + ] + + [[package]] +@@ -65,8 +65,8 @@ version = "0.1.68" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" + dependencies = [ +- "proc-macro2 1.0.56", +- "quote 1.0.26", ++ "proc-macro2", ++ "quote", + "syn 2.0.13", + ] + +@@ -78,16 +78,7 @@ checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" + dependencies = [ + "hermit-abi 0.1.19", + "libc", +- "winapi 0.3.9", +-] +- +-[[package]] +-name = "autocfg" +-version = "0.1.8" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" +-dependencies = [ +- "autocfg 1.1.0", ++ "winapi", + ] + + [[package]] +@@ -106,8 +97,8 @@ dependencies = [ + "chrono", + "crossterm 0.26.1", + "http_req", +- "insta 0.12.0", +- "ipnetwork 0.16.0", ++ "insta", ++ "ipnetwork", + "lazy_static", + "netstat2", + "packet-builder", +@@ -116,7 +107,7 @@ dependencies = [ + "procfs", + "regex", + "resolv-conf", +- "structopt 0.3.26", ++ "structopt", + "sysinfo", + "thiserror", + "tokio", +@@ -132,12 +123,6 @@ version = "1.6.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + +-[[package]] +-name = "bitflags" +-version = "0.5.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4f67931368edf3a9a51d29886d245f1c3db2f1ef0dcc9e35ff70341b78c10d23" +- + [[package]] + name = "bitflags" + version = "1.3.2" +@@ -153,6 +138,16 @@ dependencies = [ + "generic-array", + ] + ++[[package]] ++name = "bstr" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09" ++dependencies = [ ++ "memchr", ++ "serde", ++] ++ + [[package]] + name = "bumpalo" + version = "3.12.0" +@@ -194,21 +189,19 @@ dependencies = [ + + [[package]] + name = "cargo-insta" +-version = "0.11.0" ++version = "1.29.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e22a28c661f0fb0474ef90d63b4bc834bf2c179550608783594f358f5ac74cc2" ++checksum = "e3df6b5c78ce3641aed93a19b40f0243264d6f9cba61cd4101c8d0b10e282ff2" + dependencies = [ +- "clap", +- "console 0.7.7", +- "difference", +- "glob", +- "insta 0.11.0", +- "proc-macro2 0.4.30", ++ "console", ++ "ignore", ++ "insta", ++ "proc-macro2", + "serde", + "serde_json", +- "structopt 0.2.18", +- "syn 0.15.44", +- "walkdir", ++ "structopt", ++ "syn 1.0.109", ++ "uuid", + ] + + [[package]] +@@ -244,7 +237,7 @@ dependencies = [ + "num-traits", + "time 0.1.45", + "wasm-bindgen", +- "winapi 0.3.9", ++ "winapi", + ] + + [[package]] +@@ -264,34 +257,13 @@ checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" + dependencies = [ + "ansi_term", + "atty", +- "bitflags 1.3.2", ++ "bitflags", + "strsim", + "textwrap", + "unicode-width", + "vec_map", + ] + +-[[package]] +-name = "clicolors-control" +-version = "1.0.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "90082ee5dcdd64dc4e9e0d37fbf3ee325419e39c0092191e0393df65518f741e" +-dependencies = [ +- "atty", +- "lazy_static", +- "libc", +- "winapi 0.3.9", +-] +- +-[[package]] +-name = "cloudabi" +-version = "0.0.3" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" +-dependencies = [ +- "bitflags 1.3.2", +-] +- + [[package]] + name = "codespan-reporting" + version = "0.11.1" +@@ -304,51 +276,15 @@ dependencies = [ + + [[package]] + name = "console" +-version = "0.7.7" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8ca57c2c14b8a2bf3105bc9d15574aad80babf6a9c44b1058034cdf8bd169628" +-dependencies = [ +- "atty", +- "clicolors-control", +- "encode_unicode", +- "lazy_static", +- "libc", +- "parking_lot", +- "regex", +- "termios", +- "unicode-width", +- "winapi 0.3.9", +-] +- +-[[package]] +-name = "console" +-version = "0.8.0" ++version = "0.15.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b147390a412132d75d10dd3b7b175a69cf5fd95032f7503c7091b8831ba10242" ++checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" + dependencies = [ +- "clicolors-control", + "encode_unicode", + "lazy_static", + "libc", +- "regex", +- "termios", + "unicode-width", +- "winapi 0.3.9", +-] +- +-[[package]] +-name = "console" +-version = "0.9.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "45e0f3986890b3acbc782009e2629dfe2baa430ac091519ce3be26164a2ae6c0" +-dependencies = [ +- "clicolors-control", +- "encode_unicode", +- "lazy_static", +- "libc", +- "regex", +- "termios", +- "winapi 0.3.9", ++ "windows-sys 0.42.0", + ] + + [[package]] +@@ -418,7 +354,7 @@ version = "0.9.14" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" + dependencies = [ +- "autocfg 1.1.0", ++ "autocfg", + "cfg-if", + "crossbeam-utils", + "memoffset", +@@ -440,14 +376,14 @@ version = "0.25.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67" + dependencies = [ +- "bitflags 1.3.2", ++ "bitflags", + "crossterm_winapi", + "libc", + "mio", + "parking_lot", + "signal-hook", + "signal-hook-mio", +- "winapi 0.3.9", ++ "winapi", + ] + + [[package]] +@@ -456,14 +392,14 @@ version = "0.26.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13" + dependencies = [ +- "bitflags 1.3.2", ++ "bitflags", + "crossterm_winapi", + "libc", + "mio", + "parking_lot", + "signal-hook", + "signal-hook-mio", +- "winapi 0.3.9", ++ "winapi", + ] + + [[package]] +@@ -472,7 +408,7 @@ version = "0.9.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "2ae1b35a484aa10e07fe0638d02301c5ad24de82d310ccbd2f3693da5f09bf1c" + dependencies = [ +- "winapi 0.3.9", ++ "winapi", + ] + + [[package]] +@@ -506,8 +442,8 @@ dependencies = [ + "cc", + "codespan-reporting", + "once_cell", +- "proc-macro2 1.0.56", +- "quote 1.0.26", ++ "proc-macro2", ++ "quote", + "scratch", + "syn 2.0.13", + ] +@@ -524,8 +460,8 @@ version = "1.0.94" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" + dependencies = [ +- "proc-macro2 1.0.56", +- "quote 1.0.26", ++ "proc-macro2", ++ "quote", + "syn 2.0.13", + ] + +@@ -541,17 +477,11 @@ version = "0.5.9" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "3418329ca0ad70234b9735dc4ceed10af4df60eff9c8e7b06cb5e520d92c3535" + dependencies = [ +- "proc-macro2 1.0.56", +- "quote 1.0.26", ++ "proc-macro2", ++ "quote", + "syn 1.0.109", + ] + +-[[package]] +-name = "difference" +-version = "2.0.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" +- + [[package]] + name = "digest" + version = "0.10.6" +@@ -582,8 +512,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" + dependencies = [ + "heck 0.4.1", +- "proc-macro2 1.0.56", +- "quote 1.0.26", ++ "proc-macro2", ++ "quote", + "syn 1.0.109", + ] + +@@ -627,6 +557,12 @@ dependencies = [ + "miniz_oxide", + ] + ++[[package]] ++name = "fnv" ++version = "1.0.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" ++ + [[package]] + name = "foreign-types" + version = "0.3.2" +@@ -651,12 +587,6 @@ dependencies = [ + "percent-encoding", + ] + +-[[package]] +-name = "fuchsia-cprng" +-version = "0.1.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" +- + [[package]] + name = "futures-channel" + version = "0.3.28" +@@ -720,15 +650,22 @@ dependencies = [ + + [[package]] + name = "glob" +-version = "0.2.11" ++version = "0.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" ++checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + + [[package]] +-name = "hashbrown" +-version = "0.12.3" ++name = "globset" ++version = "0.4.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" ++checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" ++dependencies = [ ++ "aho-corasick", ++ "bstr", ++ "fnv", ++ "log", ++ "regex", ++] + + [[package]] + name = "heck" +@@ -792,7 +729,7 @@ checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" + dependencies = [ + "libc", + "match_cfg", +- "winapi 0.3.9", ++ "winapi", + ] + + [[package]] +@@ -851,45 +788,36 @@ dependencies = [ + ] + + [[package]] +-name = "indexmap" +-version = "1.9.3" ++name = "ignore" ++version = "0.4.20" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" ++checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" + dependencies = [ +- "autocfg 1.1.0", +- "hashbrown", ++ "globset", ++ "lazy_static", ++ "log", ++ "memchr", ++ "regex", ++ "same-file", ++ "thread_local", ++ "walkdir", ++ "winapi-util", + ] + + [[package]] + name = "insta" +-version = "0.11.0" ++version = "1.29.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "23f83ab4ee86f38b292f0420c27fd412690a4baa9ea0ad4e3fa624bf34379b76" ++checksum = "9a28d25139df397cbca21408bb742cf6837e04cdbebf1b07b760caf971d6a972" + dependencies = [ +- "console 0.8.0", +- "difference", ++ "console", + "lazy_static", ++ "linked-hash-map", + "pest", + "pest_derive", + "serde", +- "serde_json", +- "serde_yaml", +- "uuid 0.7.4", +-] +- +-[[package]] +-name = "insta" +-version = "0.12.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0d499dc062e841590a67230d853bce62d0abeb91304927871670b7c55c461349" +-dependencies = [ +- "console 0.9.2", +- "difference", +- "lazy_static", +- "serde", +- "serde_json", +- "serde_yaml", +- "uuid 0.8.2", ++ "similar", ++ "yaml-rust", + ] + + [[package]] +@@ -920,7 +848,7 @@ checksum = "bd302af1b90f2463a98fa5ad469fc212c8e3175a41c3068601bfa2727591c5be" + dependencies = [ + "socket2", + "widestring", +- "winapi 0.3.9", ++ "winapi", + "winreg", + ] + +@@ -932,15 +860,9 @@ checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" + + [[package]] + name = "ipnetwork" +-version = "0.12.8" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "70783119ac90828aaba91eae39db32c6c1b8838deea3637e5238efa0130801ab" +- +-[[package]] +-name = "ipnetwork" +-version = "0.16.0" ++version = "0.20.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b8eca9f51da27bc908ef3dd85c21e1bbba794edaf94d7841e37356275b82d31e" ++checksum = "bf466541e9d546596ee94f9f69590f89473455f88372423e0008fc1a7daf100e" + dependencies = [ + "serde", + ] +@@ -969,16 +891,6 @@ dependencies = [ + "wasm-bindgen", + ] + +-[[package]] +-name = "kernel32-sys" +-version = "0.2.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +-dependencies = [ +- "winapi 0.2.8", +- "winapi-build", +-] +- + [[package]] + name = "lazy_static" + version = "1.4.0" +@@ -1038,19 +950,10 @@ version = "0.4.9" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" + dependencies = [ +- "autocfg 1.1.0", ++ "autocfg", + "scopeguard", + ] + +-[[package]] +-name = "log" +-version = "0.3.9" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" +-dependencies = [ +- "log 0.4.17", +-] +- + [[package]] + name = "log" + version = "0.4.17" +@@ -1093,7 +996,7 @@ version = "0.8.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" + dependencies = [ +- "autocfg 1.1.0", ++ "autocfg", + ] + + [[package]] +@@ -1112,7 +1015,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" + dependencies = [ + "libc", +- "log 0.4.17", ++ "log", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.45.0", + ] +@@ -1125,7 +1028,7 @@ checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" + dependencies = [ + "lazy_static", + "libc", +- "log 0.4.17", ++ "log", + "openssl", + "openssl-probe", + "openssl-sys", +@@ -1141,7 +1044,7 @@ version = "0.9.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "0faa3f4ad230fd2bf2a5dad71476ecbaeaed904b3c7e7e5b1f266c415c03761f" + dependencies = [ +- "bitflags 1.3.2", ++ "bitflags", + "byteorder", + "libc", + "num-derive", +@@ -1149,13 +1052,19 @@ dependencies = [ + "thiserror", + ] + ++[[package]] ++name = "no-std-net" ++version = "0.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "43794a0ace135be66a25d3ae77d41b91615fb68ae937f904090203e81f755b65" ++ + [[package]] + name = "ntapi" + version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "bc51db7b362b205941f71232e56c625156eb9a929f8cf74a428fd5bc094a4afc" + dependencies = [ +- "winapi 0.3.9", ++ "winapi", + ] + + [[package]] +@@ -1164,8 +1073,8 @@ version = "0.3.3" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" + dependencies = [ +- "proc-macro2 1.0.56", +- "quote 1.0.26", ++ "proc-macro2", ++ "quote", + "syn 1.0.109", + ] + +@@ -1175,7 +1084,7 @@ version = "0.1.45" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" + dependencies = [ +- "autocfg 1.1.0", ++ "autocfg", + "num-traits", + ] + +@@ -1185,7 +1094,7 @@ version = "0.2.15" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" + dependencies = [ +- "autocfg 1.1.0", ++ "autocfg", + ] + + [[package]] +@@ -1216,7 +1125,7 @@ version = "0.10.50" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "7e30d8bc91859781f0a943411186324d580f2bbeb71b452fe91ae344806af3f1" + dependencies = [ +- "bitflags 1.3.2", ++ "bitflags", + "cfg-if", + "foreign-types", + "libc", +@@ -1231,8 +1140,8 @@ version = "0.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" + dependencies = [ +- "proc-macro2 1.0.56", +- "quote 1.0.26", ++ "proc-macro2", ++ "quote", + "syn 2.0.13", + ] + +@@ -1256,16 +1165,13 @@ dependencies = [ + + [[package]] + name = "packet-builder" +-version = "0.5.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "369f20d8356b3f1cfd362c5b3775d3ca71e0290f259eeff6154420fd06d578d6" ++version = "0.7.0" ++source = "git+https://github.com/jcgruenhage/packet_builder?branch=upgrades-2023-04-10#d95ec200adf06a03cf966f5a40688f2f41fa9ba5" + dependencies = [ + "derive-new", +- "ipnetwork 0.12.8", ++ "ipnetwork", + "pnet", +- "pnet_base", + "pnet_datalink", +- "pnet_macros_support", + ] + + [[package]] +@@ -1298,7 +1204,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" + dependencies = [ + "base64ct", +- "rand_core 0.6.4", ++ "rand_core", + "subtle", + ] + +@@ -1348,8 +1254,8 @@ checksum = "e56094789873daa36164de2e822b3888c6ae4b4f9da555a1103587658c805b1e" + dependencies = [ + "pest", + "pest_meta", +- "proc-macro2 1.0.56", +- "quote 1.0.26", ++ "proc-macro2", ++ "quote", + "syn 2.0.13", + ] + +@@ -1384,11 +1290,11 @@ checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" + + [[package]] + name = "pnet" +-version = "0.26.0" ++version = "0.33.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c62df42dcd72f6f2a658bcf38509f1027df1440ac85f1af4badbe034418302dc" ++checksum = "cd959a8268165518e2bf5546ba84c7b3222744435616381df3c456fe8d983576" + dependencies = [ +- "ipnetwork 0.16.0", ++ "ipnetwork", + "pnet_base", + "pnet_datalink", + "pnet_packet", +@@ -1398,72 +1304,74 @@ dependencies = [ + + [[package]] + name = "pnet_base" +-version = "0.26.0" ++version = "0.33.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b7cd5f7e15220afa66b0a9a62841ea10089f39dcaa1c29752c0b22dfc03111b5" ++checksum = "872e46346144ebf35219ccaa64b1dffacd9c6f188cd7d012bd6977a2a838f42e" ++dependencies = [ ++ "no-std-net", ++] + + [[package]] + name = "pnet_datalink" +-version = "0.26.0" ++version = "0.33.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7318ae1d6e0b7fa1e49933233c9473f2b72d3d18b97e70e2716c6415dde5f915" ++checksum = "c302da22118d2793c312a35fb3da6846cb0fab6c3ad53fd67e37809b06cdafce" + dependencies = [ +- "ipnetwork 0.16.0", ++ "ipnetwork", + "libc", + "pnet_base", + "pnet_sys", +- "winapi 0.2.8", ++ "winapi", + ] + + [[package]] + name = "pnet_macros" +-version = "0.26.0" ++version = "0.33.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bbbd5c52c6e04aa720400f9c71cd0e8bcb38cd13421d5caabd9035e9efa47de9" ++checksum = "2a780e80005c2e463ec25a6e9f928630049a10b43945fea83207207d4a7606f4" + dependencies = [ ++ "proc-macro2", ++ "quote", + "regex", +- "syntex", +- "syntex_syntax", ++ "syn 1.0.109", + ] + + [[package]] + name = "pnet_macros_support" +-version = "0.26.0" ++version = "0.33.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "daf9c5c0c36766d0a4da9ab268c0700771b8ec367b9463fd678109fa28463c5b" ++checksum = "e6d932134f32efd7834eb8b16d42418dac87086347d1bc7d142370ef078582bc" + dependencies = [ + "pnet_base", + ] + + [[package]] + name = "pnet_packet" +-version = "0.26.0" ++version = "0.33.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "89e26a864d71d0ac51a549cf40283c44ed1b8f98168545638a4730ef9f560283" ++checksum = "8bde678bbd85cb1c2d99dc9fc596e57f03aa725f84f3168b0eaf33eeccb41706" + dependencies = [ + "glob", + "pnet_base", + "pnet_macros", + "pnet_macros_support", +- "syntex", + ] + + [[package]] + name = "pnet_sys" +-version = "0.26.0" ++version = "0.33.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "73f0de0c52609f157b25d79ce24d9016ab1bbf10cde761397200d634a833872c" ++checksum = "faf7a58b2803d818a374be9278a1fe8f88fce14b936afbe225000cfcd9c73f16" + dependencies = [ + "libc", +- "winapi 0.2.8", +- "ws2_32-sys", ++ "winapi", + ] + + [[package]] + name = "pnet_transport" +-version = "0.26.0" ++version = "0.33.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6712ab76534340494d849e3c51c64a6261e4b451337b7c05bd3681e384c48b10" ++checksum = "813d1c0e4defbe7ee22f6fe1755f122b77bfb5abe77145b1b5baaf463cab9249" + dependencies = [ + "libc", + "pnet_base", +@@ -1484,8 +1392,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" + dependencies = [ + "proc-macro-error-attr", +- "proc-macro2 1.0.56", +- "quote 1.0.26", ++ "proc-macro2", ++ "quote", + "syn 1.0.109", + "version_check", + ] +@@ -1496,20 +1404,11 @@ version = "1.0.4" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" + dependencies = [ +- "proc-macro2 1.0.56", +- "quote 1.0.26", ++ "proc-macro2", ++ "quote", + "version_check", + ] + +-[[package]] +-name = "proc-macro2" +-version = "0.4.30" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" +-dependencies = [ +- "unicode-xid 0.1.0", +-] +- + [[package]] + name = "proc-macro2" + version = "1.0.56" +@@ -1525,7 +1424,7 @@ version = "0.7.9" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "c434e93ef69c216e68e4f417c927b4f31502c3560b72cfdb6827e2321c5c6b3e" + dependencies = [ +- "bitflags 1.3.2", ++ "bitflags", + "byteorder", + "chrono", + "hex", +@@ -1540,41 +1439,13 @@ version = "1.2.3" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + +-[[package]] +-name = "quote" +-version = "0.6.13" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" +-dependencies = [ +- "proc-macro2 0.4.30", +-] +- + [[package]] + name = "quote" + version = "1.0.26" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" + dependencies = [ +- "proc-macro2 1.0.56", +-] +- +-[[package]] +-name = "rand" +-version = "0.6.5" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" +-dependencies = [ +- "autocfg 0.1.8", +- "libc", +- "rand_chacha 0.1.1", +- "rand_core 0.4.2", +- "rand_hc", +- "rand_isaac", +- "rand_jitter", +- "rand_os", +- "rand_pcg", +- "rand_xorshift", +- "winapi 0.3.9", ++ "proc-macro2", + ] + + [[package]] +@@ -1584,18 +1455,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" + dependencies = [ + "libc", +- "rand_chacha 0.3.1", +- "rand_core 0.6.4", +-] +- +-[[package]] +-name = "rand_chacha" +-version = "0.1.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" +-dependencies = [ +- "autocfg 0.1.8", +- "rand_core 0.3.1", ++ "rand_chacha", ++ "rand_core", + ] + + [[package]] +@@ -1605,24 +1466,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" + dependencies = [ + "ppv-lite86", +- "rand_core 0.6.4", +-] +- +-[[package]] +-name = "rand_core" +-version = "0.3.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" +-dependencies = [ +- "rand_core 0.4.2", ++ "rand_core", + ] + +-[[package]] +-name = "rand_core" +-version = "0.4.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" +- + [[package]] + name = "rand_core" + version = "0.6.4" +@@ -1632,68 +1478,6 @@ dependencies = [ + "getrandom", + ] + +-[[package]] +-name = "rand_hc" +-version = "0.1.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" +-dependencies = [ +- "rand_core 0.3.1", +-] +- +-[[package]] +-name = "rand_isaac" +-version = "0.1.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" +-dependencies = [ +- "rand_core 0.3.1", +-] +- +-[[package]] +-name = "rand_jitter" +-version = "0.1.4" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" +-dependencies = [ +- "libc", +- "rand_core 0.4.2", +- "winapi 0.3.9", +-] +- +-[[package]] +-name = "rand_os" +-version = "0.1.3" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" +-dependencies = [ +- "cloudabi", +- "fuchsia-cprng", +- "libc", +- "rand_core 0.4.2", +- "rdrand", +- "winapi 0.3.9", +-] +- +-[[package]] +-name = "rand_pcg" +-version = "0.1.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" +-dependencies = [ +- "autocfg 0.1.8", +- "rand_core 0.4.2", +-] +- +-[[package]] +-name = "rand_xorshift" +-version = "0.1.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" +-dependencies = [ +- "rand_core 0.3.1", +-] +- + [[package]] + name = "rayon" + version = "1.7.0" +@@ -1716,22 +1500,13 @@ dependencies = [ + "num_cpus", + ] + +-[[package]] +-name = "rdrand" +-version = "0.4.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" +-dependencies = [ +- "rand_core 0.3.1", +-] +- + [[package]] + name = "redox_syscall" + version = "0.2.16" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" + dependencies = [ +- "bitflags 1.3.2", ++ "bitflags", + ] + + [[package]] +@@ -1740,7 +1515,7 @@ version = "0.3.5" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" + dependencies = [ +- "bitflags 1.3.2", ++ "bitflags", + ] + + [[package]] +@@ -1776,19 +1551,13 @@ version = "1.0.3" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422" + +-[[package]] +-name = "rustc-serialize" +-version = "0.3.24" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" +- + [[package]] + name = "rustix" + version = "0.37.11" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "85597d61f83914ddeba6a47b3b8ffe7365107221c2e557ed94426489fefb5f77" + dependencies = [ +- "bitflags 1.3.2", ++ "bitflags", + "errno", + "io-lifetimes", + "libc", +@@ -1838,7 +1607,7 @@ version = "2.8.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" + dependencies = [ +- "bitflags 1.3.2", ++ "bitflags", + "core-foundation", + "core-foundation-sys", + "libc", +@@ -1870,8 +1639,8 @@ version = "1.0.159" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" + dependencies = [ +- "proc-macro2 1.0.56", +- "quote 1.0.26", ++ "proc-macro2", ++ "quote", + "syn 2.0.13", + ] + +@@ -1886,18 +1655,6 @@ dependencies = [ + "serde", + ] + +-[[package]] +-name = "serde_yaml" +-version = "0.8.26" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" +-dependencies = [ +- "indexmap", +- "ryu", +- "serde", +- "yaml-rust", +-] +- + [[package]] + name = "sha1" + version = "0.10.5" +@@ -1950,13 +1707,19 @@ dependencies = [ + "libc", + ] + ++[[package]] ++name = "similar" ++version = "2.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" ++ + [[package]] + name = "slab" + version = "0.4.8" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" + dependencies = [ +- "autocfg 1.1.0", ++ "autocfg", + ] + + [[package]] +@@ -1972,7 +1735,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" + dependencies = [ + "libc", +- "winapi 0.3.9", ++ "winapi", + ] + + [[package]] +@@ -1981,16 +1744,6 @@ version = "0.8.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + +-[[package]] +-name = "structopt" +-version = "0.2.18" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "16c2cdbf9cc375f15d1b4141bc48aeef444806655cd0e904207edc8d68d86ed7" +-dependencies = [ +- "clap", +- "structopt-derive 0.2.18", +-] +- + [[package]] + name = "structopt" + version = "0.3.26" +@@ -1999,19 +1752,7 @@ checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" + dependencies = [ + "clap", + "lazy_static", +- "structopt-derive 0.4.18", +-] +- +-[[package]] +-name = "structopt-derive" +-version = "0.2.18" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "53010261a84b37689f9ed7d395165029f9cc7abb9f56bbfe86bee2597ed25107" +-dependencies = [ +- "heck 0.3.3", +- "proc-macro2 0.4.30", +- "quote 0.6.13", +- "syn 0.15.44", ++ "structopt-derive", + ] + + [[package]] +@@ -2022,8 +1763,8 @@ checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" + dependencies = [ + "heck 0.3.3", + "proc-macro-error", +- "proc-macro2 1.0.56", +- "quote 1.0.26", ++ "proc-macro2", ++ "quote", + "syn 1.0.109", + ] + +@@ -2033,25 +1774,14 @@ version = "2.4.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" + +-[[package]] +-name = "syn" +-version = "0.15.44" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" +-dependencies = [ +- "proc-macro2 0.4.30", +- "quote 0.6.13", +- "unicode-xid 0.1.0", +-] +- + [[package]] + name = "syn" + version = "1.0.109" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" + dependencies = [ +- "proc-macro2 1.0.56", +- "quote 1.0.26", ++ "proc-macro2", ++ "quote", + "unicode-ident", + ] + +@@ -2061,60 +1791,11 @@ version = "2.0.13" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec" + dependencies = [ +- "proc-macro2 1.0.56", +- "quote 1.0.26", ++ "proc-macro2", ++ "quote", + "unicode-ident", + ] + +-[[package]] +-name = "syntex" +-version = "0.42.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0a30b08a6b383a22e5f6edc127d169670d48f905bb00ca79a00ea3e442ebe317" +-dependencies = [ +- "syntex_errors", +- "syntex_syntax", +-] +- +-[[package]] +-name = "syntex_errors" +-version = "0.42.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "04c48f32867b6114449155b2a82114b86d4b09e1bddb21c47ff104ab9172b646" +-dependencies = [ +- "libc", +- "log 0.3.9", +- "rustc-serialize", +- "syntex_pos", +- "term", +- "unicode-xid 0.0.3", +-] +- +-[[package]] +-name = "syntex_pos" +-version = "0.42.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3fd49988e52451813c61fecbe9abb5cfd4e1b7bb6cdbb980a6fbcbab859171a6" +-dependencies = [ +- "rustc-serialize", +-] +- +-[[package]] +-name = "syntex_syntax" +-version = "0.42.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7628a0506e8f9666fdabb5f265d0059b059edac9a3f810bda077abb5d826bd8d" +-dependencies = [ +- "bitflags 0.5.0", +- "libc", +- "log 0.3.9", +- "rustc-serialize", +- "syntex_errors", +- "syntex_pos", +- "term", +- "unicode-xid 0.0.3", +-] +- + [[package]] + name = "sysinfo" + version = "0.28.4" +@@ -2127,7 +1808,7 @@ dependencies = [ + "ntapi", + "once_cell", + "rayon", +- "winapi 0.3.9", ++ "winapi", + ] + + [[package]] +@@ -2143,16 +1824,6 @@ dependencies = [ + "windows-sys 0.45.0", + ] + +-[[package]] +-name = "term" +-version = "0.4.6" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fa63644f74ce96fbeb9b794f66aff2a52d601cbd5e80f4b97123e3899f4570f1" +-dependencies = [ +- "kernel32-sys", +- "winapi 0.2.8", +-] +- + [[package]] + name = "termcolor" + version = "1.2.0" +@@ -2162,15 +1833,6 @@ dependencies = [ + "winapi-util", + ] + +-[[package]] +-name = "termios" +-version = "0.3.3" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "411c5bf740737c7918b8b1fe232dca4dc9f8e754b8ad5e20966814001ed0ac6b" +-dependencies = [ +- "libc", +-] +- + [[package]] + name = "textwrap" + version = "0.11.0" +@@ -2195,11 +1857,21 @@ version = "1.0.40" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" + dependencies = [ +- "proc-macro2 1.0.56", +- "quote 1.0.26", ++ "proc-macro2", ++ "quote", + "syn 2.0.13", + ] + ++[[package]] ++name = "thread_local" ++version = "1.1.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" ++dependencies = [ ++ "cfg-if", ++ "once_cell", ++] ++ + [[package]] + name = "time" + version = "0.1.45" +@@ -2208,7 +1880,7 @@ checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" + dependencies = [ + "libc", + "wasi 0.10.0+wasi-snapshot-preview1", +- "winapi 0.3.9", ++ "winapi", + ] + + [[package]] +@@ -2248,7 +1920,7 @@ version = "1.27.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" + dependencies = [ +- "autocfg 1.1.0", ++ "autocfg", + "bytes", + "libc", + "mio", +@@ -2276,8 +1948,8 @@ version = "0.1.23" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" + dependencies = [ +- "proc-macro2 1.0.56", +- "quote 1.0.26", ++ "proc-macro2", ++ "quote", + "syn 1.0.109", + ] + +@@ -2306,7 +1978,7 @@ dependencies = [ + "idna 0.2.3", + "ipnet", + "lazy_static", +- "rand 0.8.5", ++ "rand", + "smallvec", + "thiserror", + "tinyvec", +@@ -2341,7 +2013,7 @@ version = "0.19.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ccdd26cbd674007e649a272da4475fb666d3aa0ad0531da7136db6fab0e5bad1" + dependencies = [ +- "bitflags 1.3.2", ++ "bitflags", + "cassowary", + "crossterm 0.25.0", + "unicode-segmentation", +@@ -2402,18 +2074,6 @@ version = "0.1.10" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + +-[[package]] +-name = "unicode-xid" +-version = "0.0.3" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "36dff09cafb4ec7c8cf0023eb0b686cb6ce65499116a12201c9e11840ca01beb" +- +-[[package]] +-name = "unicode-xid" +-version = "0.1.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" +- + [[package]] + name = "url" + version = "2.3.1" +@@ -2427,22 +2087,11 @@ dependencies = [ + + [[package]] + name = "uuid" +-version = "0.7.4" ++version = "1.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a" +-dependencies = [ +- "rand 0.6.5", +- "serde", +-] +- +-[[package]] +-name = "uuid" +-version = "0.8.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" ++checksum = "5b55a3fef2a1e3b3a00ce878640918820d3c51081576ac657d23af9fc7928fdb" + dependencies = [ + "getrandom", +- "serde", + ] + + [[package]] +@@ -2502,10 +2151,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" + dependencies = [ + "bumpalo", +- "log 0.4.17", ++ "log", + "once_cell", +- "proc-macro2 1.0.56", +- "quote 1.0.26", ++ "proc-macro2", ++ "quote", + "syn 1.0.109", + "wasm-bindgen-shared", + ] +@@ -2516,7 +2165,7 @@ version = "0.2.84" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" + dependencies = [ +- "quote 1.0.26", ++ "quote", + "wasm-bindgen-macro-support", + ] + +@@ -2526,8 +2175,8 @@ version = "0.2.84" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" + dependencies = [ +- "proc-macro2 1.0.56", +- "quote 1.0.26", ++ "proc-macro2", ++ "quote", + "syn 1.0.109", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +@@ -2545,12 +2194,6 @@ version = "0.5.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983" + +-[[package]] +-name = "winapi" +-version = "0.2.8" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" +- + [[package]] + name = "winapi" + version = "0.3.9" +@@ -2561,12 +2204,6 @@ dependencies = [ + "winapi-x86_64-pc-windows-gnu", + ] + +-[[package]] +-name = "winapi-build" +-version = "0.1.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" +- + [[package]] + name = "winapi-i686-pc-windows-gnu" + version = "0.4.0" +@@ -2579,7 +2216,7 @@ version = "0.1.5" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" + dependencies = [ +- "winapi 0.3.9", ++ "winapi", + ] + + [[package]] +@@ -2750,17 +2387,7 @@ version = "0.10.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" + dependencies = [ +- "winapi 0.3.9", +-] +- +-[[package]] +-name = "ws2_32-sys" +-version = "0.2.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" +-dependencies = [ +- "winapi 0.2.8", +- "winapi-build", ++ "winapi", + ] + + [[package]] +diff --git a/Cargo.toml b/Cargo.toml +index a735e4d..acc15bf 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -19,8 +19,8 @@ license = "MIT" + exclude = ["src/tests/*", "demo.gif"] + + [dependencies] +-pnet = "0.26.0" +-ipnetwork = "0.16.0" ++pnet = "0.33.0" ++ipnetwork = "0.20.0" + tui = "0.19" + crossterm = "0.26.1" + structopt = "0.3" +@@ -43,12 +43,16 @@ sysinfo = "0.28.4" + procfs = "0.7.9" + + [dev-dependencies] +-insta = "0.12.0" +-pnet_base = "0.26.0" +-cargo-insta = "0.11.0" +-packet-builder = "0.5.0" ++insta = "1.29.0" ++pnet_base = "0.33.0" ++cargo-insta = "1.29.0" ++packet-builder = "0.7.0" + regex = "1" + + [target.'cfg(target_os="windows")'.build-dependencies] + http_req = "0.9.1" + zip = "0.6.4" ++ ++[patch.crates-io] ++# https://github.com/hughesac/packet_builder/pull/5 ++packet-builder = { git = "https://github.com/jcgruenhage/packet_builder", branch = "upgrades-2023-04-10" } +diff --git a/src/tests/fakes/fake_input.rs b/src/tests/fakes/fake_input.rs +index 0fdf63a..9c3f0a0 100644 +--- a/src/tests/fakes/fake_input.rs ++++ b/src/tests/fakes/fake_input.rs +@@ -146,6 +146,7 @@ pub fn get_open_sockets() -> OpenSockets { + pub fn get_interfaces() -> Vec { + vec![NetworkInterface { + name: String::from("interface_name"), ++ description: String::new(), + index: 42, + mac: None, + ips: vec![IpNetwork::V4("10.0.0.2".parse().unwrap())], +-- +2.40.0 + diff --git a/srcpkgs/bandwhich/template b/srcpkgs/bandwhich/template index ee5e75f5d521..dc9f9a5dc490 100644 --- a/srcpkgs/bandwhich/template +++ b/srcpkgs/bandwhich/template @@ -1,7 +1,7 @@ # Template file for 'bandwhich' pkgname=bandwhich version=0.20.0 -revision=1 +revision=2 build_style=cargo short_desc="Terminal bandwidth utilization tool" maintainer="Jan Christian Grünhage " @@ -9,6 +9,8 @@ license="MIT" homepage="https://github.com/imsnif/bandwhich" distfiles="${homepage}/archive/${version}.tar.gz" checksum=4bbf05be32439049edd50bd1e4d5a2a95b0be8d36782e4100732f0cc9f19ba12 +# cba for now +make_check=no post_install() { vlicense LICENSE.md