diff --git a/Cargo.lock b/Cargo.lock
index 9224fae..32c6254 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -47,8 +47,8 @@ version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5"
dependencies = [
- "quote 1.0.17",
- "syn 1.0.91",
+ "quote 1.0.18",
+ "syn 1.0.94",
]
[[package]]
@@ -101,7 +101,7 @@ dependencies = [
"concurrent-queue",
"futures-lite",
"libc",
- "log 0.4.16",
+ "log 0.4.17",
"once_cell",
"parking",
"polling",
@@ -131,9 +131,9 @@ dependencies = [
[[package]]
name = "async-process"
-version = "1.3.0"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83137067e3a2a6a06d67168e49e68a0957d215410473a740cea95a2425c0b7c6"
+checksum = "cf2c06e30a24e8c78a3987d07f0930edf76ef35e027e7bdb063fccafdad1f60c"
dependencies = [
"async-io",
"blocking",
@@ -165,7 +165,7 @@ dependencies = [
"futures-lite",
"gloo-timers",
"kv-log-macro",
- "log 0.4.16",
+ "log 0.4.17",
"memchr",
"num_cpus",
"once_cell",
@@ -201,9 +201,9 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "25f9db3b38af870bf7e5cc649167533b493928e50744e2c30ae350230b414670"
dependencies = [
- "proc-macro2 1.0.37",
- "quote 1.0.17",
- "syn 1.0.91",
+ "proc-macro2 1.0.38",
+ "quote 1.0.18",
+ "syn 1.0.94",
]
[[package]]
@@ -212,9 +212,9 @@ version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27"
dependencies = [
- "proc-macro2 1.0.37",
- "quote 1.0.17",
- "syn 1.0.91",
+ "proc-macro2 1.0.38",
+ "quote 1.0.18",
+ "syn 1.0.94",
]
[[package]]
@@ -268,9 +268,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]]
name = "backtrace"
-version = "0.3.64"
+version = "0.3.65"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e121dee8023ce33ab248d9ce1493df03c3b38a659b240096fcbd7048ff9c31f"
+checksum = "11a17d453482a265fd5f8479f2a3f405566e6ca627837aaddb85af8b1ab8ef61"
dependencies = [
"addr2line",
"cc",
@@ -472,7 +472,7 @@ checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
dependencies = [
"libc",
"num-integer",
- "num-traits 0.2.14",
+ "num-traits 0.2.15",
"time 0.1.43",
"winapi 0.3.9",
]
@@ -562,7 +562,7 @@ dependencies = [
"crossbeam-utils 0.7.2",
"lazy_static",
"maybe-uninit",
- "memoffset 0.5.6",
+ "memoffset",
"scopeguard 1.1.0",
]
@@ -624,17 +624,17 @@ version = "0.1.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c"
dependencies = [
- "quote 1.0.17",
- "syn 1.0.91",
+ "quote 1.0.18",
+ "syn 1.0.94",
]
[[package]]
name = "ctrlc"
-version = "3.2.1"
+version = "3.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a19c6cedffdc8c03a3346d723eb20bd85a13362bb96dc2ac000842c6381ec7bf"
+checksum = "b37feaa84e6861e00a1f5e5aa8da3ee56d605c9992d33e082786754828e20865"
dependencies = [
- "nix 0.23.1",
+ "nix 0.24.1",
"winapi 0.3.9",
]
@@ -645,10 +645,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
dependencies = [
"convert_case",
- "proc-macro2 1.0.37",
- "quote 1.0.17",
+ "proc-macro2 1.0.38",
+ "quote 1.0.18",
"rustc_version 0.4.0",
- "syn 1.0.91",
+ "syn 1.0.94",
]
[[package]]
@@ -740,7 +740,7 @@ checksum = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3"
dependencies = [
"atty",
"humantime 1.3.0",
- "log 0.4.16",
+ "log 0.4.17",
"regex",
"termcolor",
]
@@ -753,7 +753,7 @@ checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3"
dependencies = [
"atty",
"humantime 2.1.0",
- "log 0.4.16",
+ "log 0.4.17",
"regex",
"termcolor",
]
@@ -766,7 +766,7 @@ checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3"
dependencies = [
"atty",
"humantime 2.1.0",
- "log 0.4.16",
+ "log 0.4.17",
"regex",
"termcolor",
]
@@ -803,9 +803,9 @@ version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
dependencies = [
- "proc-macro2 1.0.37",
- "quote 1.0.17",
- "syn 1.0.91",
+ "proc-macro2 1.0.38",
+ "quote 1.0.18",
+ "syn 1.0.94",
"synstructure",
]
@@ -826,9 +826,9 @@ dependencies = [
[[package]]
name = "filetime"
-version = "0.2.15"
+version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "975ccf83d8d9d0d84682850a38c8169027be83368805971cc4f238c2b245bc98"
+checksum = "c0408e2626025178a6a7f7ffc05a25bc47103229f19c113755de7bf63816290c"
dependencies = [
"cfg-if 1.0.0",
"libc",
@@ -970,9 +970,9 @@ version = "0.3.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512"
dependencies = [
- "proc-macro2 1.0.37",
- "quote 1.0.17",
- "syn 1.0.91",
+ "proc-macro2 1.0.38",
+ "quote 1.0.18",
+ "syn 1.0.94",
]
[[package]]
@@ -1092,15 +1092,15 @@ dependencies = [
"aho-corasick",
"bstr",
"fnv",
- "log 0.4.16",
+ "log 0.4.17",
"regex",
]
[[package]]
name = "gloo-timers"
-version = "0.2.3"
+version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d12a7f4e95cfe710f1d624fb1210b7d961a5fb05c4fd942f4feab06e61f590e"
+checksum = "5fb7d06c1c8cc2a29bee7ec961009a0b2caa0793ee4900c2ffb348734ba1c8f9"
dependencies = [
"futures-channel",
"futures-core",
@@ -1111,7 +1111,7 @@ dependencies = [
[[package]]
name = "golgi"
version = "0.1.1"
-source = "git+https://git.coopcloud.tech/golgi-ssb/golgi#77dd75bcd4649b7487069a61e2a8069b49f60a1d"
+source = "git+https://git.coopcloud.tech/golgi-ssb/golgi#0aa616d92b005b38359aa34bf448f3f1f47e8e6a"
dependencies = [
"async-std",
"async-stream 0.3.3",
@@ -1121,7 +1121,7 @@ dependencies = [
"kuska-handshake",
"kuska-sodiumoxide",
"kuska-ssb",
- "serde 1.0.136",
+ "serde 1.0.137",
"serde_json",
"sha2",
]
@@ -1150,7 +1150,7 @@ dependencies = [
"futures 0.1.31",
"http 0.1.21",
"indexmap",
- "log 0.4.16",
+ "log 0.4.17",
"slab 0.4.6",
"string",
"tokio-io",
@@ -1199,9 +1199,9 @@ dependencies = [
[[package]]
name = "http"
-version = "0.2.6"
+version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03"
+checksum = "ff8670570af52249509a86f5e3e18a08c60b177071826898fde8997cf5f6bfbb"
dependencies = [
"bytes 1.1.0",
"fnv",
@@ -1227,15 +1227,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6"
dependencies = [
"bytes 1.1.0",
- "http 0.2.6",
+ "http 0.2.7",
"pin-project-lite",
]
[[package]]
name = "httparse"
-version = "1.6.0"
+version = "1.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9100414882e15fb7feccb4897e5f0ff0ff1ca7d1a86a23208ada4d7a18e6c6c4"
+checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c"
[[package]]
name = "httpdate"
@@ -1271,7 +1271,7 @@ dependencies = [
"httparse",
"iovec",
"language-tags",
- "log 0.4.16",
+ "log 0.4.17",
"mime",
"net2",
"percent-encoding 1.0.1",
@@ -1300,7 +1300,7 @@ dependencies = [
"httparse",
"iovec",
"itoa 0.4.8",
- "log 0.4.16",
+ "log 0.4.17",
"net2",
"rustc_version 0.2.3",
"time 0.1.43",
@@ -1325,14 +1325,14 @@ dependencies = [
"futures-channel",
"futures-core",
"futures-util",
- "http 0.2.6",
+ "http 0.2.7",
"http-body 0.4.4",
"httparse",
"httpdate",
"itoa 1.0.1",
"pin-project-lite",
"socket2",
- "tokio 1.17.0",
+ "tokio 1.18.2",
"tower-service",
"tracing",
"want 0.3.0",
@@ -1414,9 +1414,9 @@ checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"
[[package]]
name = "js-sys"
-version = "0.3.56"
+version = "0.3.57"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a38fc24e30fd564ce974c02bf1d337caddff65be6cc4735a1f7eab22a7440f04"
+checksum = "671a26f820db17c2a2750743f1dd03bafd15b98c9f30c7c2628c024c05d73397"
dependencies = [
"wasm-bindgen",
]
@@ -1430,8 +1430,8 @@ dependencies = [
"error-chain",
"futures 0.1.31",
"jsonrpc-core 8.0.1",
- "log 0.4.16",
- "serde 1.0.136",
+ "log 0.4.17",
+ "serde 1.0.137",
"serde_json",
]
@@ -1445,7 +1445,7 @@ dependencies = [
"futures 0.1.31",
"hyper 0.11.27",
"jsonrpc-client-core",
- "log 0.4.16",
+ "log 0.4.17",
"tokio-core",
]
@@ -1459,8 +1459,8 @@ dependencies = [
"futures 0.3.21",
"jsonrpc-core 18.0.0",
"jsonrpc-pubsub 18.0.0",
- "log 0.4.16",
- "serde 1.0.136",
+ "log 0.4.17",
+ "serde 1.0.137",
"serde_json",
"url 1.7.2",
]
@@ -1473,7 +1473,7 @@ checksum = "ddf83704f4e79979a424d1082dd2c1e52683058056c9280efa19ac5f6bc9033c"
dependencies = [
"futures 0.1.31",
"log 0.3.9",
- "serde 1.0.136",
+ "serde 1.0.137",
"serde_derive",
"serde_json",
]
@@ -1485,8 +1485,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "97b83fdc5e0218128d0d270f2f2e7a5ea716f3240c8518a58bc89e6716ba8581"
dependencies = [
"futures 0.1.31",
- "log 0.4.16",
- "serde 1.0.136",
+ "log 0.4.17",
+ "serde 1.0.137",
"serde_derive",
"serde_json",
]
@@ -1500,8 +1500,8 @@ dependencies = [
"futures 0.3.21",
"futures-executor",
"futures-util",
- "log 0.4.16",
- "serde 1.0.136",
+ "log 0.4.17",
+ "serde 1.0.137",
"serde_derive",
"serde_json",
]
@@ -1515,8 +1515,8 @@ dependencies = [
"failure",
"futures 0.1.31",
"jsonrpc-core 11.0.0",
- "log 0.4.16",
- "serde 1.0.136",
+ "log 0.4.17",
+ "serde 1.0.137",
"serde_json",
]
@@ -1539,7 +1539,7 @@ dependencies = [
"hyper 0.12.36",
"jsonrpc-core 11.0.0",
"jsonrpc-server-utils 11.0.0",
- "log 0.4.16",
+ "log 0.4.17",
"net2",
"unicase",
]
@@ -1554,7 +1554,7 @@ dependencies = [
"hyper 0.14.18",
"jsonrpc-core 18.0.0",
"jsonrpc-server-utils 18.0.0",
- "log 0.4.16",
+ "log 0.4.17",
"net2",
"parking_lot 0.11.2",
"unicase",
@@ -1567,9 +1567,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c233c4570183a45f7bde14cd7d23446d6c236de6df9442e53a60951adae9fd34"
dependencies = [
"jsonrpc-core 11.0.0",
- "log 0.4.16",
+ "log 0.4.17",
"parking_lot 0.7.1",
- "serde 1.0.136",
+ "serde 1.0.137",
]
[[package]]
@@ -1581,10 +1581,10 @@ dependencies = [
"futures 0.3.21",
"jsonrpc-core 18.0.0",
"lazy_static",
- "log 0.4.16",
+ "log 0.4.17",
"parking_lot 0.11.2",
"rand 0.7.3",
- "serde 1.0.136",
+ "serde 1.0.137",
]
[[package]]
@@ -1597,7 +1597,7 @@ dependencies = [
"globset",
"jsonrpc-core 11.0.0",
"lazy_static",
- "log 0.4.16",
+ "log 0.4.17",
"num_cpus",
"tokio 0.1.22",
"tokio-codec",
@@ -1615,8 +1615,8 @@ dependencies = [
"globset",
"jsonrpc-core 18.0.0",
"lazy_static",
- "log 0.4.16",
- "tokio 1.17.0",
+ "log 0.4.17",
+ "tokio 1.18.2",
"tokio-stream",
"tokio-util",
"unicase",
@@ -1631,8 +1631,8 @@ dependencies = [
"jsonrpc-core 11.0.0",
"jsonrpc-core-client 11.0.0",
"jsonrpc-pubsub 11.0.0",
- "log 0.4.16",
- "serde 1.0.136",
+ "log 0.4.17",
+ "serde 1.0.137",
"serde_json",
]
@@ -1645,8 +1645,8 @@ dependencies = [
"jsonrpc-core 18.0.0",
"jsonrpc-core-client 18.0.0",
"jsonrpc-pubsub 18.0.0",
- "log 0.4.16",
- "serde 1.0.136",
+ "log 0.4.17",
+ "serde 1.0.137",
"serde_json",
]
@@ -1658,7 +1658,7 @@ checksum = "e72d8f524c7afd11d9c71614d1f814ee1c46377869933ce42d559d6973922f79"
dependencies = [
"jsonrpc-core 11.0.0",
"jsonrpc-server-utils 11.0.0",
- "log 0.4.16",
+ "log 0.4.17",
"parking_lot 0.7.1",
"slab 0.4.6",
"ws",
@@ -1689,7 +1689,7 @@ dependencies = [
"futures 0.3.21",
"hex",
"kuska-sodiumoxide",
- "log 0.4.16",
+ "log 0.4.17",
"thiserror",
]
@@ -1701,7 +1701,7 @@ checksum = "ae0f8eafdd240b722243787b51fdaf8df6693fb8621d0f7061cdba574214cf88"
dependencies = [
"libc",
"libsodium-sys",
- "serde 1.0.136",
+ "serde 1.0.137",
]
[[package]]
@@ -1718,10 +1718,10 @@ dependencies = [
"hex",
"kuska-handshake",
"kuska-sodiumoxide",
- "log 0.4.16",
+ "log 0.4.17",
"once_cell",
"regex",
- "serde 1.0.136",
+ "serde 1.0.137",
"serde_json",
"thiserror",
]
@@ -1732,7 +1732,7 @@ version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f"
dependencies = [
- "log 0.4.16",
+ "log 0.4.17",
]
[[package]]
@@ -1755,9 +1755,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
[[package]]
name = "libc"
-version = "0.2.121"
+version = "0.2.125"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efaa7b300f3b5fe8eb6bf21ce3895e1751d9665086af2d64b42f19701015ff4f"
+checksum = "5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b"
[[package]]
name = "libsodium-sys"
@@ -1835,14 +1835,14 @@ version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
dependencies = [
- "log 0.4.16",
+ "log 0.4.17",
]
[[package]]
name = "log"
-version = "0.4.16"
+version = "0.4.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8"
+checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
dependencies = [
"cfg-if 1.0.0",
"value-bag",
@@ -1870,9 +1870,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "423430ac467408136d7de93f2929debd8a7bc3e795c92476f45e259b158e3355"
dependencies = [
"proc-macro-error",
- "proc-macro2 1.0.37",
- "quote 1.0.17",
- "syn 1.0.91",
+ "proc-macro2 1.0.38",
+ "quote 1.0.18",
+ "syn 1.0.94",
]
[[package]]
@@ -1883,9 +1883,9 @@ checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
[[package]]
name = "memchr"
-version = "2.4.1"
+version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
+checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
[[package]]
name = "memoffset"
@@ -1896,15 +1896,6 @@ dependencies = [
"autocfg 1.1.0",
]
-[[package]]
-name = "memoffset"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
-dependencies = [
- "autocfg 1.1.0",
-]
-
[[package]]
name = "mime"
version = "0.3.16"
@@ -1927,9 +1918,9 @@ version = "0.1.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "60bbf2d78a45808eba478a0660f050bbce70dafc011e275cf00f6f8500a8be88"
dependencies = [
- "proc-macro2 1.0.37",
- "quote 1.0.17",
- "syn 1.0.91",
+ "proc-macro2 1.0.38",
+ "quote 1.0.18",
+ "syn 1.0.94",
]
[[package]]
@@ -1951,12 +1942,11 @@ dependencies = [
[[package]]
name = "miniz_oxide"
-version = "0.4.4"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
+checksum = "d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082"
dependencies = [
"adler",
- "autocfg 1.1.0",
]
[[package]]
@@ -1971,8 +1961,8 @@ dependencies = [
"iovec",
"kernel32-sys",
"libc",
- "log 0.4.16",
- "miow 0.2.2",
+ "log 0.4.17",
+ "miow",
"net2",
"slab 0.4.6",
"winapi 0.2.8",
@@ -1980,16 +1970,14 @@ dependencies = [
[[package]]
name = "mio"
-version = "0.8.2"
+version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9"
+checksum = "713d550d9b44d89174e066b7a6217ae06234c10cb47819a88290d2b353c31799"
dependencies = [
"libc",
- "log 0.4.16",
- "miow 0.3.7",
- "ntapi",
+ "log 0.4.17",
"wasi 0.11.0+wasi-snapshot-preview1",
- "winapi 0.3.9",
+ "windows-sys",
]
[[package]]
@@ -1999,7 +1987,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19"
dependencies = [
"lazycell",
- "log 0.4.16",
+ "log 0.4.17",
"mio 0.6.23",
"slab 0.4.6",
]
@@ -2027,15 +2015,6 @@ dependencies = [
"ws2_32-sys",
]
-[[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 = "mkdirp"
version = "0.1.0"
@@ -2050,7 +2029,7 @@ checksum = "00dec633863867f29cb39df64a397cdf4a6354708ddd7759f70c7fb51c5f9182"
dependencies = [
"buf_redux",
"httparse",
- "log 0.4.16",
+ "log 0.4.17",
"mime",
"mime_guess",
"quick-error",
@@ -2093,7 +2072,7 @@ dependencies = [
"atomicwrites",
"indexmap",
"lazy_static",
- "log 0.4.16",
+ "log 0.4.17",
"mkdirp",
"objekt",
"serde-hjson",
@@ -2156,15 +2135,13 @@ dependencies = [
[[package]]
name = "nix"
-version = "0.23.1"
+version = "0.24.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6"
+checksum = "8f17df307904acd05aa8e32e97bb20f2a0df1728bbc2d771ae8f9a90463441e9"
dependencies = [
"bitflags 1.3.2",
- "cc",
"cfg-if 1.0.0",
"libc",
- "memoffset 0.6.5",
]
[[package]]
@@ -2197,23 +2174,14 @@ dependencies = [
"minimal-lexical",
]
-[[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 = "num-integer"
-version = "0.1.44"
+version = "0.1.45"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
+checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
dependencies = [
"autocfg 1.1.0",
- "num-traits 0.2.14",
+ "num-traits 0.2.15",
]
[[package]]
@@ -2222,14 +2190,14 @@ version = "0.1.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
dependencies = [
- "num-traits 0.2.14",
+ "num-traits 0.2.15",
]
[[package]]
name = "num-traits"
-version = "0.2.14"
+version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
+checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
dependencies = [
"autocfg 1.1.0",
]
@@ -2246,18 +2214,18 @@ dependencies = [
[[package]]
name = "num_threads"
-version = "0.1.5"
+version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aba1801fb138d8e85e11d0fc70baf4fe1cdfffda7c6cd34a854905df588e5ed0"
+checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44"
dependencies = [
"libc",
]
[[package]]
name = "object"
-version = "0.27.1"
+version = "0.28.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9"
+checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424"
dependencies = [
"memchr",
]
@@ -2380,7 +2348,7 @@ dependencies = [
"jsonrpc-pubsub 11.0.0",
"jsonrpc-test 11.0.0",
"jsonrpc-ws-server",
- "log 0.4.16",
+ "log 0.4.17",
"snafu 0.4.4",
]
@@ -2391,11 +2359,11 @@ dependencies = [
"clap",
"env_logger 0.6.2",
"lazy_static",
- "log 0.4.16",
+ "log 0.4.17",
"peach-lib",
"regex",
"rpassword",
- "serde 1.0.136",
+ "serde 1.0.137",
"serde_json",
"snafu 0.6.10",
"structopt",
@@ -2406,7 +2374,7 @@ name = "peach-dyndns-updater"
version = "0.1.8"
dependencies = [
"env_logger 0.6.2",
- "log 0.4.16",
+ "log 0.4.17",
"peach-lib",
]
@@ -2418,7 +2386,7 @@ dependencies = [
"jsonrpc-core 18.0.0",
"jsonrpc-http-server 18.0.0",
"jsonrpc-test 18.0.0",
- "log 0.4.16",
+ "log 0.4.17",
"peach-stats",
"serde_json",
]
@@ -2436,10 +2404,10 @@ dependencies = [
"jsonrpc-client-http",
"jsonrpc-core 8.0.1",
"lazy_static",
- "log 0.4.16",
+ "log 0.4.17",
"nanorand",
"regex",
- "serde 1.0.136",
+ "serde 1.0.137",
"serde_json",
"serde_yaml",
"sha3",
@@ -2456,9 +2424,9 @@ dependencies = [
"jsonrpc-client-core",
"jsonrpc-client-http",
"jsonrpc-http-server 11.0.0",
- "log 0.4.16",
+ "log 0.4.17",
"peach-lib",
- "serde 1.0.136",
+ "serde 1.0.137",
"serde_json",
"ws",
]
@@ -2483,7 +2451,7 @@ dependencies = [
"miniserde",
"probes 0.4.1",
"regex",
- "serde 1.0.136",
+ "serde 1.0.137",
"wpactrl",
]
@@ -2497,9 +2465,9 @@ dependencies = [
"jsonrpc-http-server 18.0.0",
"jsonrpc-test 18.0.0",
"linux-embedded-hal",
- "log 0.4.16",
+ "log 0.4.17",
"nix 0.11.1",
- "serde 1.0.136",
+ "serde 1.0.137",
"ssd1306",
"tinybmp",
]
@@ -2508,10 +2476,10 @@ dependencies = [
name = "peach-stats"
version = "0.3.0"
dependencies = [
- "log 0.4.16",
+ "log 0.4.17",
"miniserde",
"probes 0.4.1",
- "serde 1.0.136",
+ "serde 1.0.137",
"systemstat",
]
@@ -2527,7 +2495,7 @@ dependencies = [
"futures 0.3.21",
"golgi",
"lazy_static",
- "log 0.4.16",
+ "log 0.4.17",
"maud",
"peach-lib",
"rouille",
@@ -2549,9 +2517,9 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
[[package]]
name = "pin-project-lite"
-version = "0.2.8"
+version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c"
+checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
[[package]]
name = "pin-utils"
@@ -2573,7 +2541,7 @@ checksum = "685404d509889fade3e86fe3a5803bca2ec09b0c0778d5ada6ec8bf7a8de5259"
dependencies = [
"cfg-if 1.0.0",
"libc",
- "log 0.4.16",
+ "log 0.4.17",
"wepoll-ffi",
"winapi 0.3.9",
]
@@ -2611,9 +2579,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
dependencies = [
"proc-macro-error-attr",
- "proc-macro2 1.0.37",
- "quote 1.0.17",
- "syn 1.0.91",
+ "proc-macro2 1.0.38",
+ "quote 1.0.18",
+ "syn 1.0.94",
"version_check 0.9.4",
]
@@ -2623,8 +2591,8 @@ version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
dependencies = [
- "proc-macro2 1.0.37",
- "quote 1.0.17",
+ "proc-macro2 1.0.38",
+ "quote 1.0.18",
"version_check 0.9.4",
]
@@ -2639,11 +2607,11 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.37"
+version = "1.0.38"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1"
+checksum = "9027b48e9d4c9175fa2218adf3557f91c1137021739951d4932f5f8268ac48aa"
dependencies = [
- "unicode-xid 0.2.2",
+ "unicode-xid 0.2.3",
]
[[package]]
@@ -2663,11 +2631,11 @@ dependencies = [
[[package]]
name = "quote"
-version = "1.0.17"
+version = "1.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "632d02bff7f874a36f33ea8bb416cd484b90cc66c1194b1a1110d067a7013f58"
+checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1"
dependencies = [
- "proc-macro2 1.0.37",
+ "proc-macro2 1.0.38",
]
[[package]]
@@ -2959,7 +2927,7 @@ dependencies = [
"num_cpus",
"percent-encoding 2.1.0",
"rand 0.8.5",
- "serde 1.0.136",
+ "serde 1.0.137",
"serde_derive",
"serde_json",
"sha1",
@@ -3009,7 +2977,7 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
dependencies = [
- "semver 1.0.7",
+ "semver 1.0.9",
]
[[package]]
@@ -3068,9 +3036,9 @@ dependencies = [
[[package]]
name = "semver"
-version = "1.0.7"
+version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d65bd28f48be7196d222d95b9243287f48d27aca604e08497513019ff0502cc4"
+checksum = "8cb243bdfdb5936c8dc3c45762a19d12ab4550cdc753bc247637d4ec35a040fd"
[[package]]
name = "semver-parser"
@@ -3086,9 +3054,9 @@ checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8"
[[package]]
name = "serde"
-version = "1.0.136"
+version = "1.0.137"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789"
+checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1"
dependencies = [
"serde_derive",
]
@@ -3108,25 +3076,25 @@ dependencies = [
[[package]]
name = "serde_derive"
-version = "1.0.136"
+version = "1.0.137"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9"
+checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be"
dependencies = [
- "proc-macro2 1.0.37",
- "quote 1.0.17",
- "syn 1.0.91",
+ "proc-macro2 1.0.38",
+ "quote 1.0.18",
+ "syn 1.0.94",
]
[[package]]
name = "serde_json"
-version = "1.0.79"
+version = "1.0.81"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95"
+checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c"
dependencies = [
"indexmap",
"itoa 1.0.1",
"ryu",
- "serde 1.0.136",
+ "serde 1.0.137",
]
[[package]]
@@ -3140,13 +3108,13 @@ dependencies = [
[[package]]
name = "serde_yaml"
-version = "0.8.23"
+version = "0.8.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a521f2940385c165a24ee286aa8599633d162077a54bdcae2a6fd5a7bfa7a0"
+checksum = "707d15895415db6628332b737c838b88c598522e4dc70647e59b72312924aebc"
dependencies = [
"indexmap",
"ryu",
- "serde 1.0.136",
+ "serde 1.0.137",
"yaml-rust",
]
@@ -3309,9 +3277,9 @@ version = "0.6.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1508efa03c362e23817f96cde18abed596a25219a8b2c66e8db33c03543d315b"
dependencies = [
- "proc-macro2 1.0.37",
- "quote 1.0.17",
- "syn 1.0.91",
+ "proc-macro2 1.0.38",
+ "quote 1.0.18",
+ "syn 1.0.94",
]
[[package]]
@@ -3385,9 +3353,9 @@ checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0"
dependencies = [
"heck",
"proc-macro-error",
- "proc-macro2 1.0.37",
- "quote 1.0.17",
- "syn 1.0.91",
+ "proc-macro2 1.0.38",
+ "quote 1.0.18",
+ "syn 1.0.94",
]
[[package]]
@@ -3403,13 +3371,13 @@ dependencies = [
[[package]]
name = "syn"
-version = "1.0.91"
+version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b683b2b825c8eef438b77c36a06dc262294da3d5a5813fac20da149241dcd44d"
+checksum = "a07e33e919ebcd69113d5be0e4d70c5707004ff45188910106854f38b960df4a"
dependencies = [
- "proc-macro2 1.0.37",
- "quote 1.0.17",
- "unicode-xid 0.2.2",
+ "proc-macro2 1.0.38",
+ "quote 1.0.18",
+ "unicode-xid 0.2.3",
]
[[package]]
@@ -3418,10 +3386,10 @@ version = "0.12.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
dependencies = [
- "proc-macro2 1.0.37",
- "quote 1.0.17",
- "syn 1.0.91",
- "unicode-xid 0.2.2",
+ "proc-macro2 1.0.38",
+ "quote 1.0.18",
+ "syn 1.0.94",
+ "unicode-xid 0.2.3",
]
[[package]]
@@ -3506,22 +3474,22 @@ dependencies = [
[[package]]
name = "thiserror"
-version = "1.0.30"
+version = "1.0.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417"
+checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.30"
+version = "1.0.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b"
+checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a"
dependencies = [
- "proc-macro2 1.0.37",
- "quote 1.0.17",
- "syn 1.0.91",
+ "proc-macro2 1.0.38",
+ "quote 1.0.18",
+ "syn 1.0.94",
]
[[package]]
@@ -3562,7 +3530,7 @@ dependencies = [
"ascii",
"chrono",
"chunked_transfer",
- "log 0.4.16",
+ "log 0.4.17",
"url 2.2.2",
]
@@ -3586,9 +3554,9 @@ dependencies = [
[[package]]
name = "tinyvec"
-version = "1.5.1"
+version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2"
+checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
dependencies = [
"tinyvec_macros",
]
@@ -3625,15 +3593,16 @@ dependencies = [
[[package]]
name = "tokio"
-version = "1.17.0"
+version = "1.18.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2af73ac49756f3f7c01172e34a23e5d0216f6c32333757c2c61feb2bbff5a5ee"
+checksum = "4903bf0427cf68dddd5aa6a93220756f8be0c34fcfa9f5e6191e103e15a31395"
dependencies = [
"bytes 1.1.0",
"libc",
"memchr",
- "mio 0.8.2",
+ "mio 0.8.3",
"num_cpus",
+ "once_cell",
"pin-project-lite",
"socket2",
"winapi 0.3.9",
@@ -3670,7 +3639,7 @@ dependencies = [
"bytes 0.4.12",
"futures 0.1.31",
"iovec",
- "log 0.4.16",
+ "log 0.4.17",
"mio 0.6.23",
"scoped-tls",
"tokio 0.1.22",
@@ -3719,7 +3688,7 @@ checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674"
dependencies = [
"bytes 0.4.12",
"futures 0.1.31",
- "log 0.4.16",
+ "log 0.4.17",
]
[[package]]
@@ -3749,7 +3718,7 @@ dependencies = [
"crossbeam-utils 0.7.2",
"futures 0.1.31",
"lazy_static",
- "log 0.4.16",
+ "log 0.4.17",
"mio 0.6.23",
"num_cpus",
"parking_lot 0.9.0",
@@ -3776,7 +3745,7 @@ checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3"
dependencies = [
"futures-core",
"pin-project-lite",
- "tokio 1.17.0",
+ "tokio 1.18.2",
]
[[package]]
@@ -3814,7 +3783,7 @@ dependencies = [
"crossbeam-utils 0.7.2",
"futures 0.1.31",
"lazy_static",
- "log 0.4.16",
+ "log 0.4.17",
"num_cpus",
"slab 0.4.6",
"tokio-executor",
@@ -3840,7 +3809,7 @@ checksum = "e2a0b10e610b39c38b031a2fcab08e4b82f16ece36504988dcbd81dbba650d82"
dependencies = [
"bytes 0.4.12",
"futures 0.1.31",
- "log 0.4.16",
+ "log 0.4.17",
"mio 0.6.23",
"tokio-codec",
"tokio-io",
@@ -3857,7 +3826,7 @@ dependencies = [
"futures 0.1.31",
"iovec",
"libc",
- "log 0.4.16",
+ "log 0.4.17",
"mio 0.6.23",
"mio-uds",
"tokio-codec",
@@ -3874,19 +3843,19 @@ dependencies = [
"bytes 1.1.0",
"futures-core",
"futures-sink",
- "log 0.4.16",
+ "log 0.4.17",
"pin-project-lite",
- "tokio 1.17.0",
+ "tokio 1.18.2",
]
[[package]]
name = "toml"
-version = "0.5.8"
+version = "0.5.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa"
+checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
dependencies = [
"indexmap",
- "serde 1.0.136",
+ "serde 1.0.137",
]
[[package]]
@@ -3897,9 +3866,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
[[package]]
name = "tracing"
-version = "0.1.32"
+version = "0.1.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a1bdf54a7c28a2bbf701e1d2233f6c77f473486b94bee4f9678da5a148dca7f"
+checksum = "5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09"
dependencies = [
"cfg-if 1.0.0",
"pin-project-lite",
@@ -3908,9 +3877,9 @@ dependencies = [
[[package]]
name = "tracing-core"
-version = "0.1.24"
+version = "0.1.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90442985ee2f57c9e1b548ee72ae842f4a9a20e3f417cc38dbc5dc684d9bb4ee"
+checksum = "f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f"
dependencies = [
"lazy_static",
]
@@ -3953,9 +3922,9 @@ dependencies = [
[[package]]
name = "unicode-bidi"
-version = "0.3.7"
+version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f"
+checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
[[package]]
name = "unicode-normalization"
@@ -3986,9 +3955,9 @@ checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
[[package]]
name = "unicode-xid"
-version = "0.2.2"
+version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
+checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04"
[[package]]
name = "url"
@@ -4015,9 +3984,9 @@ dependencies = [
[[package]]
name = "value-bag"
-version = "1.0.0-alpha.8"
+version = "1.0.0-alpha.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79923f7731dc61ebfba3633098bf3ac533bbd35ccd8c57e7088d9a5eebe0263f"
+checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55"
dependencies = [
"ctor",
"version_check 0.9.4",
@@ -4071,7 +4040,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a05d9d966753fa4b5c8db73fcab5eed4549cfe0e1e4e66911e5564a0085c35d1"
dependencies = [
"futures 0.1.31",
- "log 0.4.16",
+ "log 0.4.17",
"try-lock 0.1.0",
]
@@ -4082,7 +4051,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230"
dependencies = [
"futures 0.1.31",
- "log 0.4.16",
+ "log 0.4.17",
"try-lock 0.2.3",
]
@@ -4092,7 +4061,7 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
dependencies = [
- "log 0.4.16",
+ "log 0.4.17",
"try-lock 0.2.3",
]
@@ -4116,9 +4085,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasm-bindgen"
-version = "0.2.79"
+version = "0.2.80"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06"
+checksum = "27370197c907c55e3f1a9fbe26f44e937fe6451368324e009cba39e139dc08ad"
dependencies = [
"cfg-if 1.0.0",
"wasm-bindgen-macro",
@@ -4126,24 +4095,24 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.79"
+version = "0.2.80"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b21c0df030f5a177f3cba22e9bc4322695ec43e7257d865302900290bcdedca"
+checksum = "53e04185bfa3a779273da532f5025e33398409573f348985af9a1cbf3774d3f4"
dependencies = [
"bumpalo",
"lazy_static",
- "log 0.4.16",
- "proc-macro2 1.0.37",
- "quote 1.0.17",
- "syn 1.0.91",
+ "log 0.4.17",
+ "proc-macro2 1.0.38",
+ "quote 1.0.18",
+ "syn 1.0.94",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-futures"
-version = "0.4.29"
+version = "0.4.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eb6ec270a31b1d3c7e266b999739109abce8b6c87e4b31fcfcd788b65267395"
+checksum = "6f741de44b75e14c35df886aff5f1eb73aa114fa5d4d00dcd37b5e01259bf3b2"
dependencies = [
"cfg-if 1.0.0",
"js-sys",
@@ -4153,38 +4122,38 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.79"
+version = "0.2.80"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f4203d69e40a52ee523b2529a773d5ffc1dc0071801c87b3d270b471b80ed01"
+checksum = "17cae7ff784d7e83a2fe7611cfe766ecf034111b49deb850a3dc7699c08251f5"
dependencies = [
- "quote 1.0.17",
+ "quote 1.0.18",
"wasm-bindgen-macro-support",
]
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.79"
+version = "0.2.80"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa8a30d46208db204854cadbb5d4baf5fcf8071ba5bf48190c3e59937962ebc"
+checksum = "99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b"
dependencies = [
- "proc-macro2 1.0.37",
- "quote 1.0.17",
- "syn 1.0.91",
+ "proc-macro2 1.0.38",
+ "quote 1.0.18",
+ "syn 1.0.94",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.79"
+version = "0.2.80"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d958d035c4438e28c70e4321a2911302f10135ce78a9c7834c0cab4123d06a2"
+checksum = "d554b7f530dee5964d9a9468d95c1f8b8acae4f282807e7d27d4b03099a46744"
[[package]]
name = "web-sys"
-version = "0.3.56"
+version = "0.3.57"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c060b319f29dd25724f09a2ba1418f142f539b2be99fbf4d2d5a8f7330afb8eb"
+checksum = "7b17e741662c70c8bd24ac5c5b18de314a2c26c32bf8346ee1e6f53de919c283"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -4242,13 +4211,56 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+[[package]]
+name = "windows-sys"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
+dependencies = [
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
+
[[package]]
name = "wpactrl"
-version = "0.3.1"
-source = "git+https://github.com/sauyon/wpa-ctrl-rs.git?branch=master#e37eeb0a9b58cde12bc9825515caaaadcbf49fa6"
+version = "0.5.0"
+source = "git+https://github.com/sauyon/wpa-ctrl-rs.git?branch=master#ef19ca4cccabde0078ebd6bfdfc9f6bf7cd89176"
dependencies = [
"libc",
- "log 0.4.16",
+ "log 0.4.17",
]
[[package]]
@@ -4260,7 +4272,7 @@ dependencies = [
"byteorder",
"bytes 0.4.12",
"httparse",
- "log 0.4.16",
+ "log 0.4.17",
"mio 0.6.23",
"mio-extras",
"rand 0.6.5",
diff --git a/peach-lib/src/password_utils.rs b/peach-lib/src/password_utils.rs
index bb08cb2..cbdd158 100644
--- a/peach-lib/src/password_utils.rs
+++ b/peach-lib/src/password_utils.rs
@@ -1,5 +1,5 @@
use async_std::task;
-use golgi::Sbot;
+use golgi::{sbot::Keystore, Sbot};
use log::debug;
use nanorand::{Rng, WyRand};
use sha3::{Digest, Sha3_256};
@@ -126,11 +126,13 @@ async fn publish_private_msg(msg: &str, recipient: &str) -> Result<(), String> {
// TODO: panics if we pass `Some(conf.shscap)` as second arg
Some(conf) => {
let ip_port = conf.lis.clone();
- Sbot::init(Some(ip_port), None)
+ Sbot::init(Keystore::GoSbot, Some(ip_port), None)
.await
.map_err(|e| e.to_string())?
}
- None => Sbot::init(None, None).await.map_err(|e| e.to_string())?,
+ None => Sbot::init(Keystore::GoSbot, None, None)
+ .await
+ .map_err(|e| e.to_string())?,
};
debug!("Publishing a Scuttlebutt private message with temporary password");
diff --git a/peach-network/src/error.rs b/peach-network/src/error.rs
index 3840b67..41d2b31 100644
--- a/peach-network/src/error.rs
+++ b/peach-network/src/error.rs
@@ -6,7 +6,7 @@ use std::num::ParseIntError;
use io::Error as IoError;
use probes::ProbeError;
use regex::Error as RegexError;
-use wpactrl::WpaError;
+use wpactrl::Error as WpaError;
/// Custom error type encapsulating all possible errors when querying
/// network interfaces and modifying their state.
diff --git a/peach-network/src/network.rs b/peach-network/src/network.rs
index 799180c..fe3dd1c 100644
--- a/peach-network/src/network.rs
+++ b/peach-network/src/network.rs
@@ -22,6 +22,7 @@ use std::{
};
use probes::network;
+use wpactrl::Client as WpaClient;
#[cfg(feature = "miniserde_support")]
use miniserde::{Deserialize, Serialize};
@@ -121,7 +122,7 @@ pub struct Traffic {
/// In the event of an error, a `NetworkError` is returned in the `Result`.
pub fn available_networks(iface: &str) -> Result