diff --git a/Cargo.lock b/Cargo.lock index 85a45de..e54b42b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -38,68 +38,83 @@ dependencies = [ [[package]] name = "async-executor" -version = "0.1.2" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90f47c78ea98277cb1f5e6f60ba4fc762f5eafe9f6511bc2f7dfd8b75c225650" +checksum = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965" dependencies = [ + "async-task", + "concurrent-queue", + "fastrand", + "futures-lite", + "once_cell", + "slab", +] + +[[package]] +name = "async-global-executor" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" +dependencies = [ + "async-channel", + "async-executor", "async-io", + "async-lock", + "blocking", "futures-lite", - "multitask", - "parking 1.0.6", - "scoped-tls", - "waker-fn", + "once_cell", ] [[package]] name = "async-io" -version = "0.1.11" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ae22a338d28c75b53702b66f77979062cb29675db376d99e451af4fa79dedb3" +checksum = "e8121296a9f05be7f34aa4196b1747243b3b62e048bb7906f644f3fbfc490cf7" dependencies = [ - "cfg-if 0.1.10", + "async-lock", + "autocfg", "concurrent-queue", "futures-lite", "libc", - "once_cell", - "parking 2.0.0", + "log", + "parking", "polling", - "socket2", - "vec-arena", - "wepoll-sys-stjepang", + "slab", + "socket2 0.4.9", + "waker-fn", "winapi", ] [[package]] -name = "async-mutex" -version = "1.4.0" +name = "async-lock" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479db852db25d9dbf6204e6cb6253698f175c15726470f78af0d918e99d6156e" +checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" dependencies = [ "event-listener", ] [[package]] name = "async-std" -version = "1.6.3" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c8da367da62b8ff2313c406c9ac091c1b31d67a165becdd2de380d846260f7" +checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" dependencies = [ - "async-executor", + "async-channel", + "async-global-executor", "async-io", - "async-mutex", - "async-task", - "blocking", - "crossbeam-utils 0.7.2", + "async-lock", + "crossbeam-utils", "futures-channel", "futures-core", "futures-io", "futures-lite", + "gloo-timers", "kv-log-macro", "log", "memchr", - "num_cpus", "once_cell", - "pin-project-lite 0.1.11", + "pin-project-lite", "pin-utils", "slab", "wasm-bindgen-futures", @@ -107,9 +122,9 @@ dependencies = [ [[package]] name = "async-task" -version = "3.0.0" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17772156ef2829aadc587461c7753af20b7e8db1529bc66855add962a3b35d3" +checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" [[package]] name = "atomic-waker" @@ -162,15 +177,17 @@ dependencies = [ [[package]] name = "blocking" -version = "0.5.2" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea5800d29218fea137b0880387e5948694a23c93fcdde157006966693a865c7c" +checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" dependencies = [ "async-channel", + "async-lock", + "async-task", "atomic-waker", + "fastrand", "futures-lite", - "once_cell", - "waker-fn", + "log", ] [[package]] @@ -310,18 +327,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e54ea8bc3fb1ee042f5aace6e3c6e025d3874866da222930f70ce62aceba0bfa" dependencies = [ "cfg-if 1.0.0", - "crossbeam-utils 0.8.7", -] - -[[package]] -name = "crossbeam-utils" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" -dependencies = [ - "autocfg", - "cfg-if 0.1.10", - "lazy_static", + "crossbeam-utils", ] [[package]] @@ -623,16 +629,16 @@ checksum = "611834ce18aaa1bd13c4b374f5d653e1027cf99b6b502584ff8c9a64413b30bb" [[package]] name = "futures-lite" -version = "0.1.11" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97999970129b808f0ccba93211201d431fcc12d7e1ffae03a61b5cedd1a7ced2" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ "fastrand", "futures-core", "futures-io", "memchr", - "parking 2.0.0", - "pin-project-lite 0.1.11", + "parking", + "pin-project-lite", "waker-fn", ] @@ -715,6 +721,18 @@ dependencies = [ "wasi 0.11.0+wasi-snapshot-preview1", ] +[[package]] +name = "gloo-timers" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" +dependencies = [ + "futures-channel", + "futures-core", + "js-sys", + "wasm-bindgen", +] + [[package]] name = "h2" version = "0.3.0" @@ -812,7 +830,7 @@ dependencies = [ "httpdate", "itoa 0.4.5", "pin-project 1.0.2", - "socket2", + "socket2 0.3.17", "tokio", "tower-service", "tracing", @@ -912,9 +930,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.126" +version = "0.2.146" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" +checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" [[package]] name = "linked-hash-map" @@ -967,11 +985,11 @@ dependencies = [ [[package]] name = "log" -version = "0.4.8" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" dependencies = [ - "cfg-if 0.1.10", + "value-bag", ] [[package]] @@ -1023,21 +1041,10 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897" dependencies = [ - "socket2", + "socket2 0.3.17", "winapi", ] -[[package]] -name = "multitask" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c09c35271e7dcdb5f709779111f2c8e8ab8e06c1b587c1c6a9e179d865aaa5b4" -dependencies = [ - "async-task", - "concurrent-queue", - "fastrand", -] - [[package]] name = "native-tls" version = "0.2.4" @@ -1195,12 +1202,6 @@ dependencies = [ "stable_deref_trait", ] -[[package]] -name = "parking" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cb300f271742d4a2a66c01b6b2fa0c83dfebd2e0bf11addb879a3547b4ed87c" - [[package]] name = "parking" version = "2.0.0" @@ -1276,12 +1277,6 @@ dependencies = [ "syn", ] -[[package]] -name = "pin-project-lite" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b" - [[package]] name = "pin-project-lite" version = "0.2.1" @@ -1302,14 +1297,16 @@ checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" [[package]] name = "polling" -version = "0.1.5" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e09dffb745feffca5be3dea51c02b7b368c4597ab0219a82acaf9799ab3e0d1" +checksum = "22122d5ec4f9fe1b3916419b76be1e80bcb93f618d071d2edf841b137b2a2bd6" dependencies = [ - "cfg-if 0.1.10", + "autocfg", + "cfg-if 1.0.0", "libc", - "wepoll-sys-stjepang", - "winapi", + "log", + "wepoll-ffi", + "windows-sys 0.42.0", ] [[package]] @@ -1485,7 +1482,7 @@ dependencies = [ "mime", "native-tls", "percent-encoding", - "pin-project-lite 0.2.1", + "pin-project-lite", "serde", "serde_urlencoded", "tokio", @@ -1528,12 +1525,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "scoped-tls" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" - [[package]] name = "scopeguard" version = "1.1.0" @@ -1692,6 +1683,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "socket2" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +dependencies = [ + "libc", + "winapi", +] + [[package]] name = "spin" version = "0.5.2" @@ -1768,7 +1769,7 @@ dependencies = [ "memchr", "mio 0.7.7", "num_cpus", - "pin-project-lite 0.2.1", + "pin-project-lite", "tokio-macros", ] @@ -1800,7 +1801,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4cdeb73537e63f98adcd73138af75e3f368ccaecffaa29d7eb61b9f5a440457" dependencies = [ "futures-core", - "pin-project-lite 0.2.1", + "pin-project-lite", "tokio", ] @@ -1814,7 +1815,7 @@ dependencies = [ "futures-core", "futures-sink", "log", - "pin-project-lite 0.2.1", + "pin-project-lite", "tokio", "tokio-stream", ] @@ -1829,7 +1830,7 @@ dependencies = [ "futures-core", "futures-sink", "log", - "pin-project-lite 0.2.1", + "pin-project-lite", "tokio", ] @@ -1846,7 +1847,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f47026cdc4080c07e49b37087de021820269d996f581aac150ef9e5583eefe3" dependencies = [ "cfg-if 1.0.0", - "pin-project-lite 0.2.1", + "pin-project-lite", "tracing-core", ] @@ -1964,16 +1965,16 @@ dependencies = [ ] [[package]] -name = "vcpkg" -version = "0.2.8" +name = "value-bag" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168" +checksum = "a4d330786735ea358f3bc09eea4caa098569c1c93f342d9aca0514915022fe7e" [[package]] -name = "vec-arena" -version = "0.5.2" +name = "vcpkg" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cb18268690309760d59ee1a9b21132c126ba384f374c59a94db4bc03adeb561" +checksum = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168" [[package]] name = "version_check" @@ -2098,10 +2099,10 @@ dependencies = [ ] [[package]] -name = "wepoll-sys-stjepang" -version = "1.0.8" +name = "wepoll-ffi" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fdfbb03f290ca0b27922e8d48a0997b4ceea12df33269b9f75e713311eb178d" +checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb" dependencies = [ "cc", ] @@ -2164,6 +2165,21 @@ dependencies = [ "windows_x86_64_msvc 0.36.1", ] +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "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", + "windows_x86_64_msvc 0.42.2", +] + [[package]] name = "windows-sys" version = "0.45.0" diff --git a/Cargo.toml b/Cargo.toml index b56a257..4cd1a31 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ dirs = "5.0" uuid = { version = "1.3", features = ["v4"] } whoami = "1.4.0" loco = { git = "https://github.com/KiwiTalk/loco.rs" } -async-std = "1.6.3" +async-std = "1.12.0" lazy_static = "1.4" [dependencies.cursive]