From 0e817fd1c0d6b94514538c03bf1ede35a1413e4b Mon Sep 17 00:00:00 2001
From: Quentin Le Sceller <q.lesceller@gmail.com>
Date: Wed, 10 Jun 2020 12:31:04 -0400
Subject: [PATCH] Cargo Update (#426)

* Cargo update

* Fix easyjsonrpc import

* Cargo update

* Fix compiler warning
---
 Cargo.lock                   | 646 ++++++++++++++++-------------------
 Cargo.toml                   |  16 +-
 api/Cargo.toml               |  14 +-
 config/Cargo.toml            |   8 +-
 controller/Cargo.toml        |  16 +-
 controller/src/display.rs    |  22 +-
 impls/Cargo.toml             |  14 +-
 libwallet/Cargo.toml         |  14 +-
 libwallet/src/internal/tx.rs |   2 +-
 src/build/build.rs           |   7 +-
 src/cli/cli.rs               |   2 +-
 tests/common/mod.rs          |   4 +-
 util/Cargo.toml              |   6 +-
 13 files changed, 372 insertions(+), 399 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 948531e0..a81eac88 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -117,7 +117,7 @@ version = "0.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada"
 dependencies = [
- "memchr 2.3.3",
+ "memchr",
 ]
 
 [[package]]
@@ -143,9 +143,9 @@ checksum = "bc4662175ead9cd84451d5c35070517777949a2ed84551764129cedb88384841"
 
 [[package]]
 name = "arc-swap"
-version = "0.4.6"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b585a98a234c46fc563103e9278c9391fde1f4e6850334da895d27edb9580f62"
+checksum = "4d25d88fd6b8041580a654f9d0c581a047baee2b3efee13275f2fc392fc75034"
 
 [[package]]
 name = "arrayref"
@@ -191,13 +191,13 @@ dependencies = [
 
 [[package]]
 name = "async-trait"
-version = "0.1.33"
+version = "0.1.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f1c13101a3224fb178860ae372a031ce350bbd92d39968518f016744dde0bf7"
+checksum = "89cb5d814ab2a47fd66d3266e9efccb53ca4c740b7451043b8ffcf9a6208f3f8"
 dependencies = [
  "proc-macro2 1.0.18",
- "quote 1.0.6",
- "syn 1.0.30",
+ "quote 1.0.7",
+ "syn 1.0.31",
 ]
 
 [[package]]
@@ -246,21 +246,18 @@ dependencies = [
  "safemem",
 ]
 
-[[package]]
-name = "base64"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
-dependencies = [
- "byteorder",
-]
-
 [[package]]
 name = "base64"
 version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"
 
+[[package]]
+name = "base64"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d1ccbaf7d9ec9537465a97bf19edc1a4e158ecb49fc16178202238c569cc42"
+
 [[package]]
 name = "bcrypt-pbkdf"
 version = "0.1.0"
@@ -298,7 +295,7 @@ dependencies = [
  "log",
  "peeking_take_while",
  "proc-macro2 1.0.18",
- "quote 1.0.6",
+ "quote 1.0.7",
  "regex",
  "rustc-hash",
  "shlex",
@@ -311,12 +308,6 @@ version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f0dc55f2d8a1a85650ac47858bb001b4c0dd73d79e3c455a842925e68d29cd3"
 
-[[package]]
-name = "bitflags"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8dead7461c1127cf637931a1e50934eb6eee8bff2f74433ac7909e9afcee04a3"
-
 [[package]]
 name = "bitflags"
 version = "0.9.1"
@@ -418,15 +409,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "476e9cd489f9e121e02ffa6014a8ef220ecb15c05ed23fc34cca13925dc283fb"
 
 [[package]]
-name = "built"
-version = "0.3.2"
+name = "bstr"
+version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d2315cfb416f86e05360edc950b1d7d25ecfb00f7f8eba60dbd7882a0f2e944"
+checksum = "31accafdb70df7871592c058eca3985b71104e15ac32f64706022c58867da931"
 dependencies = [
- "chrono",
+ "lazy_static",
+ "memchr",
+ "regex-automata",
+ "serde",
+]
+
+[[package]]
+name = "built"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "161483ae87631dd826cb40fc696d9e5a9fa94e19c2e69a372dcedd7dc68e7c0a"
+dependencies = [
+ "cargo-lock",
  "git2",
- "semver 0.9.0",
- "toml 0.5.6",
 ]
 
 [[package]]
@@ -480,6 +481,18 @@ dependencies = [
  "stream-cipher",
 ]
 
+[[package]]
+name = "cargo-lock"
+version = "4.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8504b63dd1249fd1745b7b4ef9b6f7b107ddeb3c95370043c7dbcc38653a2679"
+dependencies = [
+ "semver 0.9.0",
+ "serde",
+ "toml",
+ "url 2.1.1",
+]
+
 [[package]]
 name = "cc"
 version = "1.0.54"
@@ -585,32 +598,16 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41f21b581d2f0cb891554812435667bb9610d74feb1a4c6415bf09c28ff0381d"
 
-[[package]]
-name = "core-foundation"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d"
-dependencies = [
- "core-foundation-sys 0.6.2",
- "libc",
-]
-
 [[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",
+ "core-foundation-sys",
  "libc",
 ]
 
-[[package]]
-name = "core-foundation-sys"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b"
-
 [[package]]
 name = "core-foundation-sys"
 version = "0.7.0"
@@ -717,13 +714,24 @@ dependencies = [
 
 [[package]]
 name = "csv"
-version = "0.15.0"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ef22b37c7a51c564a365892c012dc0271221fdcc64c69b19ba4d6fa8bd96d9c"
+checksum = "00affe7f6ab566df61b4be3ce8cf16bc2576bca0963ceb0955e45d514bf9a279"
 dependencies = [
- "byteorder",
- "memchr 1.0.2",
- "rustc-serialize",
+ "bstr",
+ "csv-core",
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "csv-core"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90"
+dependencies = [
+ "memchr",
 ]
 
 [[package]]
@@ -735,6 +743,16 @@ dependencies = [
  "sct",
 ]
 
+[[package]]
+name = "ctor"
+version = "0.1.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39858aa5bac06462d4dd4b9164848eb81ffc4aa5c479746393598fd193afa227"
+dependencies = [
+ "quote 1.0.7",
+ "syn 1.0.31",
+]
+
 [[package]]
 name = "ctr"
 version = "0.3.2"
@@ -810,12 +828,32 @@ dependencies = [
 ]
 
 [[package]]
-name = "dirs-sys"
-version = "0.3.4"
+name = "dirs-next"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b"
+checksum = "1cbcf9241d9e8d106295bd496bbe2e9cffd5fa098f2a8c9e2bbcbf09773c11a8"
 dependencies = [
  "cfg-if",
+ "dirs-sys-next",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a"
+dependencies = [
+ "libc",
+ "redox_users",
+ "winapi 0.3.8",
+]
+
+[[package]]
+name = "dirs-sys-next"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c60f7b8a8953926148223260454befb50c751d3c50e1c178c4fd1ace4083c9a"
+dependencies = [
  "libc",
  "redox_users",
  "winapi 0.3.8",
@@ -833,19 +871,6 @@ version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4358a9e11b9a09cf52383b451b49a169e8d797b68aa02301ff586d70d9661ea3"
 
-[[package]]
-name = "easy-jsonrpc"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07e05c6cb07c5bb6fdedd8de84a96c9e0aafc5a9d4e725b735ca5eddb770ae33"
-dependencies = [
- "easy-jsonrpc-proc-macro",
- "jsonrpc-core",
- "rand 0.6.5",
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "easy-jsonrpc-mw"
 version = "0.5.4"
@@ -859,18 +884,6 @@ dependencies = [
  "serde_json",
 ]
 
-[[package]]
-name = "easy-jsonrpc-proc-macro"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9fb33793846951f339a70580375734416898ff8ddbb74401865031e25ba6751"
-dependencies = [
- "heck",
- "proc-macro2 0.4.30",
- "quote 0.6.13",
- "syn 0.15.44",
-]
-
 [[package]]
 name = "easy-jsonrpc-proc-macro-mw"
 version = "0.5.1"
@@ -946,9 +959,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
 dependencies = [
  "proc-macro2 1.0.18",
- "quote 1.0.6",
- "syn 1.0.30",
- "synstructure 0.12.3",
+ "quote 1.0.7",
+ "syn 1.0.31",
+ "synstructure 0.12.4",
 ]
 
 [[package]]
@@ -1074,8 +1087,8 @@ checksum = "d0b5a30a4328ab5473878237c447333c093297bded83a4983d10f4deea240d39"
 dependencies = [
  "proc-macro-hack",
  "proc-macro2 1.0.18",
- "quote 1.0.6",
- "syn 1.0.30",
+ "quote 1.0.7",
+ "syn 1.0.31",
 ]
 
 [[package]]
@@ -1105,7 +1118,7 @@ dependencies = [
  "futures-macro",
  "futures-sink",
  "futures-task",
- "memchr 2.3.3",
+ "memchr",
  "pin-project",
  "pin-utils",
  "proc-macro-hack",
@@ -1156,9 +1169,9 @@ checksum = "bcc8e0c9bce37868955864dbecd2b1ab2bdf967e6f28066d65aaac620444b65c"
 
 [[package]]
 name = "git2"
-version = "0.10.2"
+version = "0.13.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c1af51ea8a906616af45a4ce78eacf25860f7a13ae7bf8a814693f0f4037a26"
+checksum = "11e4b2082980e751c4bf4273e9cbb4a02c655729c8ee8a79f66cad03c8f4d31e"
 dependencies = [
  "bitflags 1.2.1",
  "libc",
@@ -1191,18 +1204,18 @@ dependencies = [
  "grin_util",
  "http 0.1.21",
  "hyper",
- "hyper-rustls 0.20.0",
+ "hyper-rustls",
  "hyper-timeout",
  "lazy_static",
  "log",
  "regex",
  "ring",
- "rustls 0.17.0",
+ "rustls",
  "serde",
  "serde_derive",
  "serde_json",
  "tokio",
- "tokio-rustls 0.13.1",
+ "tokio-rustls",
  "url 1.7.2",
 ]
 
@@ -1251,7 +1264,7 @@ dependencies = [
  "rand 0.6.5",
  "serde",
  "serde_derive",
- "siphasher",
+ "siphasher 0.2.3",
  "zeroize 0.9.3",
 ]
 
@@ -1379,7 +1392,7 @@ version = "4.0.0-beta.1"
 dependencies = [
  "built",
  "clap",
- "easy-jsonrpc",
+ "easy-jsonrpc-mw",
  "failure",
  "failure_derive",
  "grin_wallet_api",
@@ -1394,18 +1407,18 @@ dependencies = [
  "prettytable-rs",
  "rpassword",
  "rustyline",
- "semver 0.9.0",
+ "semver 0.10.0",
  "serde",
  "serde_derive",
  "serde_json",
- "url 1.7.2",
+ "url 2.1.1",
 ]
 
 [[package]]
 name = "grin_wallet_api"
 version = "4.0.0-beta.1"
 dependencies = [
- "base64 0.9.3",
+ "base64 0.12.1",
  "chrono",
  "easy-jsonrpc-mw",
  "ed25519-dalek",
@@ -1416,7 +1429,7 @@ dependencies = [
  "grin_wallet_libwallet",
  "grin_wallet_util",
  "log",
- "rand 0.5.6",
+ "rand 0.6.5",
  "ring",
  "serde",
  "serde_derive",
@@ -1429,13 +1442,13 @@ dependencies = [
 name = "grin_wallet_config"
 version = "4.0.0-beta.1"
 dependencies = [
- "dirs 1.0.5",
+ "dirs 2.0.2",
  "grin_wallet_util",
  "pretty_assertions",
- "rand 0.5.6",
+ "rand 0.6.5",
  "serde",
  "serde_derive",
- "toml 0.4.10",
+ "toml",
 ]
 
 [[package]]
@@ -1457,14 +1470,14 @@ dependencies = [
  "lazy_static",
  "log",
  "prettytable-rs",
- "rand 0.5.6",
+ "rand 0.7.3",
  "ring",
  "serde",
  "serde_derive",
  "serde_json",
- "term",
+ "term 0.6.1",
  "tokio",
- "url 1.7.2",
+ "url 2.1.1",
  "uuid",
 ]
 
@@ -1484,13 +1497,13 @@ dependencies = [
  "grin_wallet_config",
  "grin_wallet_libwallet",
  "grin_wallet_util",
- "http 0.1.21",
+ "http 0.2.1",
  "hyper",
- "hyper-rustls 0.19.1",
+ "hyper-rustls",
  "hyper-socks2-mw",
  "hyper-timeout",
  "log",
- "rand 0.5.6",
+ "rand 0.6.5",
  "regex",
  "ring",
  "serde",
@@ -1522,7 +1535,7 @@ dependencies = [
  "grin_wallet_util",
  "lazy_static",
  "log",
- "rand 0.5.6",
+ "rand 0.6.5",
  "regex",
  "secrecy",
  "serde",
@@ -1548,7 +1561,7 @@ dependencies = [
  "grin_store",
  "grin_util",
  "pretty_assertions",
- "rand 0.5.6",
+ "rand 0.6.5",
  "serde",
  "serde_derive",
  "sha3",
@@ -1692,23 +1705,6 @@ dependencies = [
  "want",
 ]
 
-[[package]]
-name = "hyper-rustls"
-version = "0.19.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ea6215c7314d450ee45970ab8b3851ab447a0e6bafdd19e31b20a42dbb7faf"
-dependencies = [
- "bytes 0.5.4",
- "ct-logs",
- "futures-util",
- "hyper",
- "rustls 0.16.0",
- "rustls-native-certs 0.1.0",
- "tokio",
- "tokio-rustls 0.12.3",
- "webpki",
-]
-
 [[package]]
 name = "hyper-rustls"
 version = "0.20.0"
@@ -1720,10 +1716,10 @@ dependencies = [
  "futures-util",
  "hyper",
  "log",
- "rustls 0.17.0",
- "rustls-native-certs 0.3.0",
+ "rustls",
+ "rustls-native-certs",
  "tokio",
- "tokio-rustls 0.13.1",
+ "tokio-rustls",
  "webpki",
 ]
 
@@ -1880,7 +1876,7 @@ checksum = "d7043aa5c05dd34fb73b47acb8c3708eac428de4545ea3682ed2f11293ebd890"
 dependencies = [
  "arrayvec 0.4.12",
  "cfg-if",
- "rustc_version 0.2.3",
+ "rustc_version",
  "ryu",
  "static_assertions",
 ]
@@ -1893,9 +1889,9 @@ checksum = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49"
 
 [[package]]
 name = "libgit2-sys"
-version = "0.9.2"
+version = "0.12.7+1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4870c781f6063efb83150cd22c1ddf6ecf58531419e7570cdcced46970f64a16"
+checksum = "bcd07968649bcb7b9351ecfde53ca4d27673cccfdf57c84255ec18710f3153e0"
 dependencies = [
  "cc",
  "libc",
@@ -1937,9 +1933,9 @@ dependencies = [
 
 [[package]]
 name = "linefeed"
-version = "0.5.4"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c2abb5810ef55bb5f5f33b010cc280b3ab877764c902681efc7c8c95628004c"
+checksum = "28715d08e35c6c074f9ae6b2e6a2420bac75d050c66ecd669d7d5b98e2caa036"
 dependencies = [
  "dirs 1.0.5",
  "mortal",
@@ -2036,15 +2032,6 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
 
-[[package]]
-name = "memchr"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "148fab2e51b4f1cfc66da2a7c32981d1d3c083a803978268bb11fe4b86925e7a"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "memchr"
 version = "2.3.3"
@@ -2072,9 +2059,9 @@ dependencies = [
 
 [[package]]
 name = "miniz_oxide"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa679ff6578b1cddee93d7e82e263b94a575e0bfced07284eb0c037c1d2416a5"
+checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435"
 dependencies = [
  "adler32",
 ]
@@ -2106,7 +2093,7 @@ checksum = "f5e374eff525ce1c5b7687c4cef63943e7686524a387933ad27ca7ec43779cb3"
 dependencies = [
  "log",
  "mio",
- "miow 0.3.4",
+ "miow 0.3.5",
  "winapi 0.3.8",
 ]
 
@@ -2135,9 +2122,9 @@ dependencies = [
 
 [[package]]
 name = "miow"
-version = "0.3.4"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22dfdd1d51b2639a5abd17ed07005c3af05fb7a2a3b1a1d0d7af1000a520c1c7"
+checksum = "07b88fb9795d4d36d62a012dfbf49a8f5cf12751f36d31a9dbe66d528e58979e"
 dependencies = [
  "socket2",
  "winapi 0.3.8",
@@ -2145,13 +2132,13 @@ dependencies = [
 
 [[package]]
 name = "mortal"
-version = "0.1.5"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26153280e6a955881f761354b130aa7838f9983836f3de438ac0a8f22cfab1ff"
+checksum = "998fd6a991497275567703b6f435e27958b633878ec991f5734b96dd46675e9f"
 dependencies = [
  "bitflags 1.2.1",
  "libc",
- "nix 0.7.0",
+ "nix",
  "smallstr",
  "terminfo",
  "unicode-normalization",
@@ -2172,8 +2159,8 @@ dependencies = [
  "openssl-probe",
  "openssl-sys",
  "schannel",
- "security-framework 0.4.4",
- "security-framework-sys 0.4.3",
+ "security-framework",
+ "security-framework-sys",
  "tempfile",
 ]
 
@@ -2188,20 +2175,6 @@ dependencies = [
  "winapi 0.3.8",
 ]
 
-[[package]]
-name = "nix"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0d95c5fa8b641c10ad0b8887454ebaafa3c92b5cd5350f8fc693adafd178e7b"
-dependencies = [
- "bitflags 0.4.0",
- "cfg-if",
- "libc",
- "rustc_version 0.1.7",
- "semver 0.1.20",
- "void",
-]
-
 [[package]]
 name = "nix"
 version = "0.17.0"
@@ -2227,7 +2200,7 @@ version = "4.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6"
 dependencies = [
- "memchr 2.3.3",
+ "memchr",
  "version_check 0.1.5",
 ]
 
@@ -2238,10 +2211,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b471253da97532da4b61552249c521e01e736071f71c1a4f7ebbfbf0a06aad6"
 dependencies = [
  "lexical-core",
- "memchr 2.3.3",
+ "memchr",
  "version_check 0.9.2",
 ]
 
+[[package]]
+name = "ntapi"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a31937dea023539c72ddae0e3571deadc1414b300483fa7aaec176168cfa9d2"
+dependencies = [
+ "winapi 0.3.8",
+]
+
 [[package]]
 name = "num"
 version = "0.1.42"
@@ -2432,9 +2414,9 @@ checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.57"
+version = "0.9.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7410fef80af8ac071d4f63755c0ab89ac3df0fd1ea91f1d1f37cf5cec4395990"
+checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de"
 dependencies = [
  "autocfg 1.0.0",
  "cc",
@@ -2452,6 +2434,15 @@ dependencies = [
  "num-traits 0.2.11",
 ]
 
+[[package]]
+name = "output_vt100"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53cdc5b785b7a58c5aad8216b3dfa114df64b0b06ae6e1501cef91df2fbdf8f9"
+dependencies = [
+ "winapi 0.3.8",
+]
+
 [[package]]
 name = "owning_ref"
 version = "0.4.1"
@@ -2479,7 +2470,7 @@ checksum = "ad7f7e6ebdc79edff6fdcb87a55b620174f7a989e3eb31b65231f4af57f00b8c"
 dependencies = [
  "libc",
  "rand 0.5.6",
- "rustc_version 0.2.3",
+ "rustc_version",
  "smallvec 0.6.13",
  "winapi 0.3.8",
 ]
@@ -2530,18 +2521,18 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
 
 [[package]]
 name = "phf"
-version = "0.7.24"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18"
+checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12"
 dependencies = [
  "phf_shared",
 ]
 
 [[package]]
 name = "phf_codegen"
-version = "0.7.24"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e"
+checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815"
 dependencies = [
  "phf_generator",
  "phf_shared",
@@ -2549,48 +2540,48 @@ dependencies = [
 
 [[package]]
 name = "phf_generator"
-version = "0.7.24"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662"
+checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526"
 dependencies = [
  "phf_shared",
- "rand 0.6.5",
+ "rand 0.7.3",
 ]
 
 [[package]]
 name = "phf_shared"
-version = "0.7.24"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0"
+checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7"
 dependencies = [
- "siphasher",
+ "siphasher 0.3.3",
 ]
 
 [[package]]
 name = "pin-project"
-version = "0.4.19"
+version = "0.4.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3a1acf4a3e70849f8a673497ef984f043f95d2d8252dcdf74d54e6a1e47e8a"
+checksum = "e75373ff9037d112bb19bc61333a06a159eaeb217660dcfbea7d88e1db823919"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "0.4.19"
+version = "0.4.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "194e88048b71a3e02eb4ee36a6995fed9b8236c11a7bb9f7247a9d9835b3f265"
+checksum = "10b4b44893d3c370407a1d6a5cfde7c41ae0478e31c516c85f67eb3adc51be6d"
 dependencies = [
  "proc-macro2 1.0.18",
- "quote 1.0.6",
- "syn 1.0.30",
+ "quote 1.0.7",
+ "syn 1.0.31",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9df32da11d84f3a7d70205549562966279adb900e080fad3dccd8e64afccf0ad"
+checksum = "282adbf10f2698a7a77f8e983a74b2d18176c19a7fd32a45446139ae7b02b715"
 
 [[package]]
 name = "pin-utils"
@@ -2627,25 +2618,27 @@ checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea"
 
 [[package]]
 name = "pretty_assertions"
-version = "0.5.1"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a029430f0d744bc3d15dd474d591bed2402b645d024583082b9f63bb936dac6"
+checksum = "3f81e1644e1b54f5a68959a29aa86cde704219254669da328ecfdf6a1f09d427"
 dependencies = [
  "ansi_term",
+ "ctor",
  "difference",
+ "output_vt100",
 ]
 
 [[package]]
 name = "prettytable-rs"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5511ca4c805aa35f0abff6be7923231d664408b60c09f44ef715f2bce106cd9e"
+checksum = "0fd04b170004fa2daccf418a7f8253aaf033c27760b5f225889024cf66d7ac2e"
 dependencies = [
  "atty",
  "csv",
  "encode_unicode",
  "lazy_static",
- "term",
+ "term 0.5.2",
  "unicode-width",
 ]
 
@@ -2657,9 +2650,9 @@ checksum = "7e0456befd48169b9f13ef0f0ad46d492cf9d2dbb918bcf38e01eed4ce3ec5e4"
 
 [[package]]
 name = "proc-macro-nested"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e946095f9d3ed29ec38de908c22f95d9ac008e424c7bcae54c75a79c527c694"
+checksum = "0afe1bd463b9e9ed51d0e0f0b50b6b146aec855c56fd182bb242388710a9b6de"
 
 [[package]]
 name = "proc-macro2"
@@ -2696,9 +2689,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.6"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54a21852a652ad6f610c9510194f398ff6f8692e334fd1145fed931f7fbe44ea"
+checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
 dependencies = [
  "proc-macro2 1.0.18",
 ]
@@ -2753,7 +2746,7 @@ dependencies = [
  "rand_isaac",
  "rand_jitter",
  "rand_os",
- "rand_pcg",
+ "rand_pcg 0.1.2",
  "rand_xorshift",
  "winapi 0.3.8",
 ]
@@ -2769,6 +2762,7 @@ dependencies = [
  "rand_chacha 0.2.2",
  "rand_core 0.5.1",
  "rand_hc 0.2.0",
+ "rand_pcg 0.2.1",
 ]
 
 [[package]]
@@ -2877,6 +2871,15 @@ dependencies = [
  "rand_core 0.4.2",
 ]
 
+[[package]]
+name = "rand_pcg"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
+dependencies = [
+ "rand_core 0.5.1",
+]
+
 [[package]]
 name = "rand_xorshift"
 version = "0.1.1"
@@ -2943,11 +2946,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6"
 dependencies = [
  "aho-corasick",
- "memchr 2.3.3",
+ "memchr",
  "regex-syntax",
  "thread_local",
 ]
 
+[[package]]
+name = "regex-automata"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae1ded71d66a4a97f5e961fd0cb25a5f366a42a41570d16a763a69c092c26ae4"
+dependencies = [
+ "byteorder",
+]
+
 [[package]]
 name = "regex-syntax"
 version = "0.6.18"
@@ -2991,13 +3003,12 @@ dependencies = [
 
 [[package]]
 name = "rpassword"
-version = "2.1.0"
+version = "4.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d37473170aedbe66ffa3ad3726939ba677d83c646ad4fd99e5b4bc38712f45ec"
+checksum = "99371657d3c8e4d816fb6221db98fa408242b0b53bac08f8676a41f8554fe99f"
 dependencies = [
- "kernel32-sys",
  "libc",
- "winapi 0.2.8",
+ "winapi 0.3.8",
 ]
 
 [[package]]
@@ -3030,15 +3041,6 @@ version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
 
-[[package]]
-name = "rustc_version"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5f5376ea5e30ce23c03eb77cbe4962b988deead10910c372b226388b594c084"
-dependencies = [
- "semver 0.1.20",
-]
-
 [[package]]
 name = "rustc_version"
 version = "0.2.3"
@@ -3048,19 +3050,6 @@ dependencies = [
  "semver 0.9.0",
 ]
 
-[[package]]
-name = "rustls"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b25a18b1bf7387f0145e7f8324e700805aade3842dd3db2e74e4cdeb4677c09e"
-dependencies = [
- "base64 0.10.1",
- "log",
- "ring",
- "sct",
- "webpki",
-]
-
 [[package]]
 name = "rustls"
 version = "0.17.0"
@@ -3074,18 +3063,6 @@ dependencies = [
  "webpki",
 ]
 
-[[package]]
-name = "rustls-native-certs"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51ffebdbb48c14f84eba0b715197d673aff1dd22cc1007ca647e28483bbcc307"
-dependencies = [
- "openssl-probe",
- "rustls 0.16.0",
- "schannel",
- "security-framework 0.3.4",
-]
-
 [[package]]
 name = "rustls-native-certs"
 version = "0.3.0"
@@ -3093,23 +3070,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a75ffeb84a6bd9d014713119542ce415db3a3e4748f0bfce1e1416cd224a23a5"
 dependencies = [
  "openssl-probe",
- "rustls 0.17.0",
+ "rustls",
  "schannel",
- "security-framework 0.4.4",
+ "security-framework",
 ]
 
 [[package]]
 name = "rustyline"
-version = "6.1.2"
+version = "6.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd20b28d972040c627e209eb29f19c24a71a19d661cc5a220089176e20ee202"
+checksum = "3358c21cbbc1a751892528db4e1de4b7a2b6a73f001e215aaba97d712cfa9777"
 dependencies = [
  "cfg-if",
- "dirs 2.0.2",
+ "dirs-next",
  "libc",
  "log",
- "memchr 2.3.3",
- "nix 0.17.0",
+ "memchr",
+ "nix",
  "scopeguard 1.1.0",
  "unicode-segmentation",
  "unicode-width",
@@ -3192,18 +3169,6 @@ dependencies = [
  "zeroize 1.1.0",
 ]
 
-[[package]]
-name = "security-framework"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ef2429d7cefe5fd28bd1d2ed41c944547d4ff84776f5935b456da44593a16df"
-dependencies = [
- "core-foundation 0.6.4",
- "core-foundation-sys 0.6.2",
- "libc",
- "security-framework-sys 0.3.3",
-]
-
 [[package]]
 name = "security-framework"
 version = "0.4.4"
@@ -3211,19 +3176,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "64808902d7d99f78eaddd2b4e2509713babc3dc3c85ad6f4c447680f3c01e535"
 dependencies = [
  "bitflags 1.2.1",
- "core-foundation 0.7.0",
- "core-foundation-sys 0.7.0",
+ "core-foundation",
+ "core-foundation-sys",
  "libc",
- "security-framework-sys 0.4.3",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e31493fc37615debb8c5090a7aeb4a9730bc61e77ab10b9af59f1a202284f895"
-dependencies = [
- "core-foundation-sys 0.6.2",
+ "security-framework-sys",
 ]
 
 [[package]]
@@ -3232,21 +3188,25 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "17bf11d99252f512695eb468de5516e5cf75455521e69dfe343f3b74e4748405"
 dependencies = [
- "core-foundation-sys 0.7.0",
+ "core-foundation-sys",
  "libc",
 ]
 
-[[package]]
-name = "semver"
-version = "0.1.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4f410fedcf71af0345d7607d246e7ad15faaadd49d240ee3b24e5dc21a820ac"
-
 [[package]]
 name = "semver"
 version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
+dependencies = [
+ "semver-parser",
+ "serde",
+]
+
+[[package]]
+name = "semver"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "394cec28fa623e00903caf7ba4fa6fb9a0e260280bb8cdbbba029611108a0190"
 dependencies = [
  "semver-parser",
 ]
@@ -3283,15 +3243,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f2c3ac8e6ca1e9c80b8be1023940162bf81ae3cffbb1809474152f2ce1eb250"
 dependencies = [
  "proc-macro2 1.0.18",
- "quote 1.0.6",
- "syn 1.0.30",
+ "quote 1.0.7",
+ "syn 1.0.31",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.53"
+version = "1.0.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "993948e75b189211a9b31a7528f950c6adc21f9720b6438ff80a7fa2f864cea2"
+checksum = "ec2c5d7e739bc07a3e73381a39d61fdb5f671c60c1df26a130690665803d8226"
 dependencies = [
  "itoa",
  "ryu",
@@ -3300,9 +3260,9 @@ dependencies = [
 
 [[package]]
 name = "serde_yaml"
-version = "0.8.12"
+version = "0.8.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16c7a592a1ec97c9c1c68d75b6e537dcbf60c7618e038e7841e00af1d9ccf0c4"
+checksum = "ae3e2dd40a7cdc18ca80db804b7f461a39bb721160a85c9a1fa30134bf3c02a5"
 dependencies = [
  "dtoa",
  "linked-hash-map",
@@ -3359,7 +3319,7 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94f478ede9f64724c5d173d7bb56099ec3e2d9fc2774aac65d34b8b890405f41"
 dependencies = [
- "arc-swap 0.4.6",
+ "arc-swap 0.4.7",
  "libc",
 ]
 
@@ -3369,6 +3329,12 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac"
 
+[[package]]
+name = "siphasher"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa8f3741c7372e75519bd9346068370c9cdaabcc1f9599cbcf2a2719352286b7"
+
 [[package]]
 name = "slab"
 version = "0.4.2"
@@ -3377,11 +3343,11 @@ checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
 
 [[package]]
 name = "smallstr"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6aa65bb4d5b2bbc90d36af64e29802f788aa614783fa1d0df011800ddcec6e8e"
+checksum = "1e922794d168678729ffc7e07182721a14219c65814e66e91b839a272fe5ae4f"
 dependencies = [
- "smallvec 0.6.13",
+ "smallvec 1.4.0",
 ]
 
 [[package]]
@@ -3446,20 +3412,20 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
 
 [[package]]
 name = "strum"
-version = "0.15.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5d1c33039533f051704951680f1adfd468fd37ac46816ded0d9ee068e60f05f"
+checksum = "57bd81eb48f4c437cadc685403cad539345bf703d78e63707418431cecd4522b"
 
 [[package]]
 name = "strum_macros"
-version = "0.15.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47cd23f5c7dee395a00fa20135e2ec0fffcdfa151c56182966d7a3261343432e"
+checksum = "87c85aa3f8ea653bfd3ddf25f7ee357ee4d204731f6aa9ad04002306f6e2774c"
 dependencies = [
  "heck",
- "proc-macro2 0.4.30",
- "quote 0.6.13",
- "syn 0.15.44",
+ "proc-macro2 1.0.18",
+ "quote 1.0.7",
+ "syn 1.0.31",
 ]
 
 [[package]]
@@ -3493,12 +3459,12 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.30"
+version = "1.0.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93a56fabc59dce20fe48b6c832cc249c713e7ed88fa28b0ee0a3bfcaae5fe4e2"
+checksum = "b5304cfdf27365b7585c25d4af91b35016ed21ef88f17ced89c7093b43dba8b6"
 dependencies = [
  "proc-macro2 1.0.18",
- "quote 1.0.6",
+ "quote 1.0.7",
  "unicode-xid 0.2.0",
 ]
 
@@ -3516,25 +3482,27 @@ dependencies = [
 
 [[package]]
 name = "synstructure"
-version = "0.12.3"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545"
+checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701"
 dependencies = [
  "proc-macro2 1.0.18",
- "quote 1.0.6",
- "syn 1.0.30",
+ "quote 1.0.7",
+ "syn 1.0.31",
  "unicode-xid 0.2.0",
 ]
 
 [[package]]
 name = "sysinfo"
-version = "0.9.6"
+version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f4b2468c629cffba39c0a4425849ab3cdb03d9dfacba69684609aea04d08ff9"
+checksum = "5b796215da5a4b2a1a5db53ee55866c13b74a89acd259ab762eb10e28e937cb5"
 dependencies = [
  "cfg-if",
  "doc-comment",
  "libc",
+ "ntapi",
+ "once_cell",
  "rayon",
  "winapi 0.3.8",
 ]
@@ -3564,6 +3532,16 @@ dependencies = [
  "winapi 0.3.8",
 ]
 
+[[package]]
+name = "term"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0863a3345e70f61d613eab32ee046ccd1bcc5f9105fe402c61fcd0c13eeb8b5"
+dependencies = [
+ "dirs 2.0.2",
+ "winapi 0.3.8",
+]
+
 [[package]]
 name = "termcolor"
 version = "1.1.0"
@@ -3575,12 +3553,13 @@ dependencies = [
 
 [[package]]
 name = "terminfo"
-version = "0.6.1"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e51065bafd2abe106b6036483b69d1741f4a1ec56ce8a2378de341637de689e"
+checksum = "76971977e6121664ec1b960d1313aacfa75642adc93b9d4d53b247bd4cb1747e"
 dependencies = [
+ "dirs 2.0.2",
  "fnv",
- "nom 4.2.3",
+ "nom 5.1.1",
  "phf",
  "phf_codegen",
 ]
@@ -3610,8 +3589,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "893582086c2f98cde18f906265a65b5030a074b1046c674ae898be6519a7f479"
 dependencies = [
  "proc-macro2 1.0.18",
- "quote 1.0.6",
- "syn 1.0.30",
+ "quote 1.0.7",
+ "syn 1.0.31",
 ]
 
 [[package]]
@@ -3665,7 +3644,7 @@ dependencies = [
  "iovec",
  "lazy_static",
  "libc",
- "memchr 2.3.3",
+ "memchr",
  "mio",
  "mio-named-pipes",
  "mio-uds",
@@ -3694,20 +3673,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0c3acc6aa564495a0f2e1d59fab677cd7f81a19994cfc7f3ad0e64301560389"
 dependencies = [
  "proc-macro2 1.0.18",
- "quote 1.0.6",
- "syn 1.0.30",
-]
-
-[[package]]
-name = "tokio-rustls"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3068d891551949b37681724d6b73666787cc63fa8e255c812a41d2513aff9775"
-dependencies = [
- "futures-core",
- "rustls 0.16.0",
- "tokio",
- "webpki",
+ "quote 1.0.7",
+ "syn 1.0.31",
 ]
 
 [[package]]
@@ -3717,7 +3684,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "15cb62a0d2770787abc96e99c1cd98fcf17f94959f3af63ca85bdfb203f051b4"
 dependencies = [
  "futures-core",
- "rustls 0.17.0",
+ "rustls",
  "tokio",
  "webpki",
 ]
@@ -3746,15 +3713,6 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "toml"
-version = "0.4.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "toml"
 version = "0.5.6"
@@ -3894,19 +3852,19 @@ checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372"
 
 [[package]]
 name = "uuid"
-version = "0.7.4"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a"
+checksum = "9fde2f6a4bea1d6e007c4ad38c6839fa71cbb63b6dbf5b595aa38dc9b1093c11"
 dependencies = [
- "rand 0.6.5",
+ "rand 0.7.3",
  "serde",
 ]
 
 [[package]]
 name = "vcpkg"
-version = "0.2.9"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55d1e41d56121e07f1e223db0a4def204e45c85425f6a16d462fd07c8d10d74c"
+checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c"
 
 [[package]]
 name = "vec_map"
@@ -3979,8 +3937,8 @@ dependencies = [
  "lazy_static",
  "log",
  "proc-macro2 1.0.18",
- "quote 1.0.6",
- "syn 1.0.30",
+ "quote 1.0.7",
+ "syn 1.0.31",
  "wasm-bindgen-shared",
 ]
 
@@ -3990,7 +3948,7 @@ version = "0.2.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "838e423688dac18d73e31edce74ddfac468e37b1506ad163ffaf0a46f703ffe3"
 dependencies = [
- "quote 1.0.6",
+ "quote 1.0.7",
  "wasm-bindgen-macro-support",
 ]
 
@@ -4001,8 +3959,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3156052d8ec77142051a533cdd686cba889537b213f948cd1d20869926e68e92"
 dependencies = [
  "proc-macro2 1.0.18",
- "quote 1.0.6",
- "syn 1.0.30",
+ "quote 1.0.7",
+ "syn 1.0.31",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -4158,9 +4116,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "de251eec69fc7c1bc3923403d18ececb929380e016afe103da75f396704f8ca2"
 dependencies = [
  "proc-macro2 1.0.18",
- "quote 1.0.6",
- "syn 1.0.30",
- "synstructure 0.12.3",
+ "quote 1.0.7",
+ "syn 1.0.31",
+ "synstructure 0.12.4",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 801992f0..5a5e1e06 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,14 +20,14 @@ members = ["api", "config", "controller", "impls", "libwallet", "util"]
 exclude = ["integration"]
 
 [dependencies]
-clap = { version = "2.31", features = ["yaml"] }
-rpassword = "2.0.0"
+clap = { version = "2.33", features = ["yaml"] }
+rpassword = "4.0"
 failure = "0.1"
 failure_derive = "0.1"
-prettytable-rs = "0.7"
+prettytable-rs = "0.8"
 log = "0.4"
-linefeed = "0.5"
-semver = "0.9"
+linefeed = "0.6"
+semver = "0.10"
 rustyline = "6"
 lazy_static = "1"
 
@@ -40,11 +40,11 @@ grin_wallet_config = { path = "./config", version = "4.0.0-beta.1" }
 grin_wallet_util = { path = "./util", version = "4.0.0-beta.1" }
 
 [build-dependencies]
-built = "0.3"
+built = { version = "0.4", features = ["git2"]}
 
 [dev-dependencies]
-url = "1.7.2"
+url = "2.1"
 serde = "1"
 serde_derive = "1"
 serde_json = "1"
-easy-jsonrpc = "0.5.1"
+easy-jsonrpc-mw = "0.5.4"
diff --git a/api/Cargo.toml b/api/Cargo.toml
index 40b4586d..0fc2e89d 100644
--- a/api/Cargo.toml
+++ b/api/Cargo.toml
@@ -13,16 +13,16 @@ edition = "2018"
 failure = "0.1"
 failure_derive = "0.1"
 log = "0.4"
-uuid = { version = "0.7", features = ["serde", "v4"] }
+uuid = { version = "0.8", features = ["serde", "v4"] }
 serde = "1"
-rand = "0.5"
+rand = "0.6"
 serde_derive = "1"
 serde_json = "1"
-easy-jsonrpc-mw = "0.5.3"
-chrono = { version = "0.4.4", features = ["serde"] }
+easy-jsonrpc-mw = "0.5.4"
+chrono = { version = "0.4.11", features = ["serde"] }
 ring = "0.16"
-base64 = "0.9"
-ed25519-dalek = "1.0.0-pre.1"
+base64 = "0.12"
+ed25519-dalek = "1.0.0-pre.3"
 
 grin_wallet_libwallet = { path = "../libwallet", version = "4.0.0-beta.1" }
 grin_wallet_config = { path = "../config", version = "4.0.0-beta.1" }
@@ -31,4 +31,4 @@ grin_wallet_util = { path = "../util", version = "4.0.0-beta.1" }
 
 [dev-dependencies]
 serde_json = "1"
-tempfile = "3.0.7"
+tempfile = "3.1"
diff --git a/config/Cargo.toml b/config/Cargo.toml
index 392a698a..2622c979 100644
--- a/config/Cargo.toml
+++ b/config/Cargo.toml
@@ -10,13 +10,13 @@ workspace = ".."
 edition = "2018"
 
 [dependencies]
-rand = "0.5"
+rand = "0.6"
 serde = "1"
 serde_derive = "1"
-toml = "0.4"
-dirs = "1.0.3"
+toml = "0.5"
+dirs = "2.0"
 
 grin_wallet_util = { path = "../util", version = "4.0.0-beta.1" }
 
 [dev-dependencies]
-pretty_assertions = "0.5.1"
+pretty_assertions = "0.6"
diff --git a/controller/Cargo.toml b/controller/Cargo.toml
index 1d5aeab2..e313c641 100644
--- a/controller/Cargo.toml
+++ b/controller/Cargo.toml
@@ -15,19 +15,19 @@ failure = "0.1"
 failure_derive = "0.1"
 futures = "0.3"
 hyper = "0.13"
-rand = "0.5"
+rand = "0.7"
 serde = "1"
 serde_derive = "1"
 serde_json = "1"
 log = "0.4"
-prettytable-rs = "0.7"
+prettytable-rs = "0.8"
 ring = "0.16"
-term = "0.5"
+term = "0.6"
 tokio = { version = "0.2", features = ["full"] }
-uuid = { version = "0.7", features = ["serde", "v4"] }
-url = "1.7.0"
-chrono = { version = "0.4.4", features = ["serde"] }
-easy-jsonrpc-mw = "0.5.3"
+uuid = { version = "0.8", features = ["serde", "v4"] }
+url = "2.1"
+chrono = { version = "0.4.11", features = ["serde"] }
+easy-jsonrpc-mw = "0.5.4"
 lazy_static = "1"
 
 grin_wallet_util = { path = "../util", version = "4.0.0-beta.1" }
@@ -38,4 +38,4 @@ grin_wallet_libwallet = { path = "../libwallet", version = "4.0.0-beta.1" }
 grin_wallet_config = { path = "../config", version = "4.0.0-beta.1" }
 
 [dev-dependencies]
-ed25519-dalek = "1.0.0-pre.1"
+ed25519-dalek = "1.0.0-pre.3"
diff --git a/controller/src/display.rs b/controller/src/display.rs
index ab8e6174..1d4361f7 100644
--- a/controller/src/display.rs
+++ b/controller/src/display.rs
@@ -205,7 +205,10 @@ pub fn txs(
 			None => "None".to_owned(),
 		};
 		let kernel_excess = match t.kernel_excess {
-			Some(e) => e.0.as_ref().to_hex(),
+			Some(e) => {
+				let excess: &[u8] = e.0.as_ref();
+				excess.to_hex()
+			}
 			None => "None".to_owned(),
 		};
 		let payment_proof = match t.payment_proof {
@@ -473,7 +476,11 @@ pub fn payment_proof(tx: &TxLogEntry) -> Result<(), Error> {
 	t.fg(term::color::WHITE).unwrap();
 	writeln!(t).unwrap();
 	let receiver_signature = match pp.receiver_signature {
-		Some(s) => s.to_bytes().as_ref().to_hex(),
+		Some(s) => {
+			let sig_bytes = s.to_bytes();
+			let sig_ref: &[u8] = sig_bytes.as_ref();
+			sig_ref.to_hex()
+		}
 		None => "None".to_owned(),
 	};
 	let fee = match tx.fee {
@@ -490,11 +497,18 @@ pub fn payment_proof(tx: &TxLogEntry) -> Result<(), Error> {
 	};
 
 	let sender_signature = match pp.sender_signature {
-		Some(s) => s.to_bytes().as_ref().to_hex(),
+		Some(s) => {
+			let sig_bytes = s.to_bytes();
+			let sig_ref: &[u8] = sig_bytes.as_ref();
+			sig_ref.to_hex()
+		}
 		None => "None".to_owned(),
 	};
 	let kernel_excess = match tx.kernel_excess {
-		Some(e) => e.0.as_ref().to_hex(),
+		Some(e) => {
+			let excess: &[u8] = e.0.as_ref();
+			excess.to_hex()
+		}
 		None => "None".to_owned(),
 	};
 
diff --git a/impls/Cargo.toml b/impls/Cargo.toml
index 4278bd99..af836915 100644
--- a/impls/Cargo.toml
+++ b/impls/Cargo.toml
@@ -14,32 +14,32 @@ blake2-rfc = "0.2"
 failure = "0.1"
 failure_derive = "0.1"
 futures = "0.3"
-rand = "0.5"
+rand = "0.6"
 serde = "1"
 serde_derive = "1"
 serde_json = "1"
 log = "0.4"
 ring = "0.16"
 tokio = { version = "0.2", features = ["full"] }
-uuid = { version = "0.7", features = ["serde", "v4"] }
-chrono = { version = "0.4.4", features = ["serde"] }
+uuid = { version = "0.8", features = ["serde", "v4"] }
+chrono = { version = "0.4.11", features = ["serde"] }
 crossbeam-utils = "0.7"
 
 #http client (copied from grin)
-http = "0.1.5"
-hyper-rustls = "0.19"
+http = "0.2"
+hyper-rustls = "0.20"
 hyper-timeout = "0.3"
 
 #Socks/Tor
 byteorder = "1"
 hyper = "0.13"
 hyper-socks2-mw = "0.4"
-ed25519-dalek = "1.0.0-pre.1"
+ed25519-dalek = "1.0.0-pre.3"
 x25519-dalek = "0.6"
 data-encoding = "2"
 regex = "1.3"
 timer = "0.2"
-sysinfo = "0.9"
+sysinfo = "0.14"
 
 grin_wallet_util = { path = "../util", version = "4.0.0-beta.1" }
 grin_wallet_config = { path = "../config", version = "4.0.0-beta.1" }
diff --git a/libwallet/Cargo.toml b/libwallet/Cargo.toml
index d714f5ad..057824a3 100644
--- a/libwallet/Cargo.toml
+++ b/libwallet/Cargo.toml
@@ -14,24 +14,24 @@ edition = "2018"
 blake2-rfc = "0.2"
 failure = "0.1"
 failure_derive = "0.1"
-rand = "0.5"
+rand = "0.6"
 serde = "1"
 serde_derive = "1"
 serde_json = "1"
 log = "0.4"
-uuid = { version = "0.7", features = ["serde", "v4"] }
-chrono = { version = "0.4.4", features = ["serde"] }
+uuid = { version = "0.8", features = ["serde", "v4"] }
+chrono = { version = "0.4.11", features = ["serde"] }
 lazy_static = "1"
-strum = "0.15"
-strum_macros = "0.15"
-ed25519-dalek = "1.0.0-pre.1"
+strum = "0.18"
+strum_macros = "0.18"
+ed25519-dalek = "1.0.0-pre.3"
 x25519-dalek = "0.6"
 base64 = "0.9"
 regex = "1.3"
 sha2 = "0.8"
 bs58 = "0.3"
 age = "0.4"
-curve25519-dalek = "2.0.0"
+curve25519-dalek = "2.1"
 secrecy = "0.6"
 bech32 = "0.7"
 byteorder = "1.3"
diff --git a/libwallet/src/internal/tx.rs b/libwallet/src/internal/tx.rs
index 4b53f632..035c74ac 100644
--- a/libwallet/src/internal/tx.rs
+++ b/libwallet/src/internal/tx.rs
@@ -36,7 +36,7 @@ use ed25519_dalek::Signature as DalekSignature;
 
 // static for incrementing test UUIDs
 lazy_static! {
-	static ref SLATE_COUNTER: Mutex<u8> = { Mutex::new(0) };
+	static ref SLATE_COUNTER: Mutex<u8> = Mutex::new(0);
 }
 
 /// Creates a new slate for a transaction, can be called by anyone involved in
diff --git a/src/build/build.rs b/src/build/build.rs
index 09158e7a..97bc680a 100644
--- a/src/build/build.rs
+++ b/src/build/build.rs
@@ -16,7 +16,7 @@
 
 use built;
 use std::env;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 use std::process::Command;
 
 fn main() {
@@ -41,10 +41,11 @@ fn main() {
 	// build and versioning information
 	let mut opts = built::Options::default();
 	opts.set_dependencies(true);
+	let out_dir_path = format!("{}{}", env::var("OUT_DIR").unwrap(), "/built.rs");
 	// don't fail the build if something's missing, may just be cargo release
 	let _ = built::write_built_file_with_opts(
 		&opts,
-		env!("CARGO_MANIFEST_DIR"),
-		format!("{}{}", env::var("OUT_DIR").unwrap(), "/built.rs"),
+		Path::new(env!("CARGO_MANIFEST_DIR")),
+		Path::new(&out_dir_path),
 	);
 }
diff --git a/src/cli/cli.rs b/src/cli/cli.rs
index c458297d..25b12eec 100644
--- a/src/cli/cli.rs
+++ b/src/cli/cli.rs
@@ -42,7 +42,7 @@ const PROMPT: &'static str = "grin-wallet> ";
 
 // static for keeping track of current stdin buffer contents
 lazy_static! {
-	static ref STDIN_CONTENTS: Mutex<String> = { Mutex::new(String::from("")) };
+	static ref STDIN_CONTENTS: Mutex<String> = Mutex::new(String::from(""));
 }
 
 #[macro_export]
diff --git a/tests/common/mod.rs b/tests/common/mod.rs
index 9f53c13f..1f38bcff 100644
--- a/tests/common/mod.rs
+++ b/tests/common/mod.rs
@@ -365,7 +365,7 @@ where
 	}
 
 	let res = serde_json::from_str(&res).unwrap();
-	let res = easy_jsonrpc::Response::from_json_response(res).unwrap();
+	let res = easy_jsonrpc_mw::Response::from_json_response(res).unwrap();
 	let res = res.outputs.get(&id).unwrap().clone().unwrap();
 	if res["Err"] != json!(null) {
 		Ok(Err(WalletAPIReturnError {
@@ -418,7 +418,7 @@ where
 			code: res["error"]["code"].as_i64().unwrap() as i32,
 		}));
 	}
-	let res = easy_jsonrpc::Response::from_json_response(res).unwrap();
+	let res = easy_jsonrpc_mw::Response::from_json_response(res).unwrap();
 	let res = res
 		.outputs
 		.get(&(internal_request_id as u64))
diff --git a/util/Cargo.toml b/util/Cargo.toml
index 35d79c7f..ab219ff6 100644
--- a/util/Cargo.toml
+++ b/util/Cargo.toml
@@ -10,10 +10,10 @@ workspace = ".."
 edition = "2018"
 
 [dependencies]
-rand = "0.5"
+rand = "0.6"
 serde = "1"
 serde_derive = "1"
-ed25519-dalek = "1.0.0-pre.1"
+ed25519-dalek = "1.0.0-pre.3"
 data-encoding = "2"
 sha3 = "0.8"
 
@@ -51,4 +51,4 @@ grin_store = { git = "https://github.com/mimblewimble/grin", tag = "v4.0.0-beta.
 # grin_store = { path = "../../grin/store"}
 
 [dev-dependencies]
-pretty_assertions = "0.5.1"
+pretty_assertions = "0.6"