diff --git a/Cargo.lock b/Cargo.lock index e6378a3..75d7e5b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -13,14 +13,13 @@ dependencies = [ [[package]] name = "aes" -version = "0.7.5" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" dependencies = [ "cfg-if", "cipher", "cpufeatures", - "opaque-debug 0.3.0", ] [[package]] @@ -52,7 +51,7 @@ checksum = "ec8ad6edb4840b78c5c3d88de606b22252d552b55f3a4699fbb10fc070ec3049" [[package]] name = "anna" version = "0.1.0" -source = "git+https://github.com/essa-project/anna-rs.git#621e431c9d3d72946757b4f7d634aabcfff8b340" +source = "git+https://github.com/essa-project/anna-rs.git#a2547a632b38eee708fa78eb1bc5fa5deba66c72" dependencies = [ "anna-api", "argh", @@ -68,16 +67,16 @@ dependencies = [ "rand", "serde", "serde_json", - "serde_yaml", + "serde_yaml 0.8.23", "smol", - "uuid 1.0.0", + "uuid 1.4.1", "zenoh", ] [[package]] name = "anna-api" version = "0.1.0" -source = "git+https://github.com/essa-project/anna-rs.git#621e431c9d3d72946757b4f7d634aabcfff8b340" +source = "git+https://github.com/essa-project/anna-rs.git#a2547a632b38eee708fa78eb1bc5fa5deba66c72" dependencies = [ "chrono", "eyre", @@ -85,15 +84,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - [[package]] name = "anyhow" version = "1.0.71" @@ -126,7 +116,7 @@ dependencies = [ "heck 0.3.3", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -135,6 +125,12 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6f8c380fa28aa1b36107cd97f0196474bb7241bb95a453c5c01a15ac74b2eac" +[[package]] +name = "array-init" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d62b7694a562cdf5a74227903507c56ab2cc8bdd1f781ed5cb4cf9c9f810bfc" + [[package]] name = "async-attributes" version = "1.1.2" @@ -142,7 +138,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5" dependencies = [ "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -151,22 +147,22 @@ version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2114d64672151c0c5eaa5e131ec84a74f06e1e559830dabba01ca30605d66319" dependencies = [ - "concurrent-queue", + "concurrent-queue 1.2.2", "event-listener", "futures-core", ] [[package]] name = "async-executor" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965" +checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" dependencies = [ + "async-lock", "async-task", - "concurrent-queue", + "concurrent-queue 2.2.0", "fastrand", "futures-lite", - "once_cell", "slab", ] @@ -183,17 +179,16 @@ dependencies = [ [[package]] name = "async-global-executor" -version = "2.0.4" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c290043c9a95b05d45e952fb6383c67bcb61471f60cfa21e890dba6654234f43" +checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" dependencies = [ "async-channel", "async-executor", "async-io", - "async-mutex", + "async-lock", "blocking", "futures-lite", - "num_cpus", "once_cell", "tokio", ] @@ -204,7 +199,7 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a811e6a479f2439f0c04038796b5cfb3d2ad56c230e0f2d3f7b04d68cfee607b" dependencies = [ - "concurrent-queue", + "concurrent-queue 1.2.2", "futures-lite", "libc", "log", @@ -219,18 +214,9 @@ dependencies = [ [[package]] name = "async-lock" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e97a171d191782fba31bb902b14ad94e24a68145032b7eedf871ab0bc0d077b6" -dependencies = [ - "event-listener", -] - -[[package]] -name = "async-mutex" -version = "1.4.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479db852db25d9dbf6204e6cb6253698f175c15726470f78af0d918e99d6156e" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ "event-listener", ] @@ -265,20 +251,20 @@ dependencies = [ [[package]] name = "async-rustls" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c86f33abd5a4f3e2d6d9251a9e0c6a7e52eb1113caf893dae8429bf4a53f378" +checksum = "93b21a03b7c21702a0110f9f8d228763a533570deb376119042dabf33c37a01a" dependencies = [ - "futures-lite", - "rustls 0.19.1", - "webpki 0.21.4", + "futures-io", + "rustls", + "webpki", ] [[package]] name = "async-std" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52580991739c5cdb36cde8b2a516371c0a3b70dda36d916cc08b82372916808c" +checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" dependencies = [ "async-attributes", "async-channel", @@ -295,7 +281,6 @@ dependencies = [ "kv-log-macro", "log", "memchr", - "num_cpus", "once_cell", "pin-project-lite", "pin-utils", @@ -311,13 +296,13 @@ checksum = "30696a84d817107fc028e049980e09d5e140e8da8f1caeb17e8e950658a3cea9" [[package]] name = "async-trait" -version = "0.1.53" +version = "0.1.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.31", ] [[package]] @@ -337,15 +322,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "autocfg" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" -dependencies = [ - "autocfg 1.1.0", -] - [[package]] name = "autocfg" version = "1.1.0" @@ -354,9 +330,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "base64" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" @@ -366,9 +342,9 @@ checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" [[package]] name = "base64ct" -version = "1.1.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6b4d9b1225d28d360ec6a231d65af1fd99a2a095154c8040689617290569c5c" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "bincode" @@ -396,7 +372,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn", + "syn 1.0.109", ] [[package]] @@ -417,22 +393,12 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" dependencies = [ - "block-padding 0.1.5", + "block-padding", "byte-tools", "byteorder", "generic-array 0.12.4", ] -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "block-padding 0.2.1", - "generic-array 0.14.5", -] - [[package]] name = "block-buffer" version = "0.10.3" @@ -451,12 +417,6 @@ dependencies = [ "byte-tools", ] -[[package]] -name = "block-padding" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" - [[package]] name = "blocking" version = "1.2.0" @@ -604,11 +564,12 @@ dependencies = [ [[package]] name = "cipher" -version = "0.3.0" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ - "generic-array 0.14.5", + "crypto-common", + "inout", ] [[package]] @@ -624,17 +585,26 @@ dependencies = [ [[package]] name = "clap" -version = "2.34.0" +version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ - "ansi_term", "atty", "bitflags 1.3.2", + "clap_lex", + "indexmap 1.9.2", "strsim", + "termcolor", "textwrap", - "unicode-width", - "vec_map", +] + +[[package]] +name = "clap_lex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +dependencies = [ + "os_str_bytes", ] [[package]] @@ -655,11 +625,20 @@ dependencies = [ "cache-padded", ] +[[package]] +name = "concurrent-queue" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "const-oid" -version = "0.6.2" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6f2aa4d0537bcc1c74df8755072bd31c1ef1a3a1b85a68e8404a8c353b7b8b" +checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" [[package]] name = "core-foundation" @@ -839,7 +818,7 @@ version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c" dependencies = [ - "autocfg 1.1.0", + "autocfg", "cfg-if", "crossbeam-utils", "lazy_static", @@ -849,23 +828,11 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.8" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if", - "lazy_static", -] - -[[package]] -name = "crypto-bigint" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f83bd3bb4314701c568e340cd8cf78c975aa0ca79e03d3f6d1677d5b0c9c0c03" -dependencies = [ - "generic-array 0.14.5", - "rand_core", - "subtle", ] [[package]] @@ -878,33 +845,24 @@ dependencies = [ "typenum", ] -[[package]] -name = "crypto-mac" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" -dependencies = [ - "generic-array 0.14.5", - "subtle", -] - [[package]] name = "debugid" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" dependencies = [ - "uuid 1.0.0", + "uuid 1.4.1", ] [[package]] name = "der" -version = "0.4.5" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79b71cca7d95d7681a4b3b9cdf63c8dbc3730d0584c2c74e31416d64a90493f4" +checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" dependencies = [ "const-oid", - "crypto-bigint", + "pem-rfc7468", + "zeroize", ] [[package]] @@ -916,15 +874,6 @@ dependencies = [ "generic-array 0.12.4", ] -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array 0.14.5", -] - [[package]] name = "digest" version = "0.10.6" @@ -932,7 +881,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ "block-buffer 0.10.3", + "const-oid", "crypto-common", + "subtle", ] [[package]] @@ -945,6 +896,15 @@ dependencies = [ "dirs-sys-next", ] +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys", +] + [[package]] name = "dirs-next" version = "2.0.0" @@ -955,6 +915,18 @@ dependencies = [ "dirs-sys-next", ] +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + [[package]] name = "dirs-sys-next" version = "0.1.2" @@ -985,6 +957,25 @@ dependencies = [ "termcolor", ] +[[package]] +name = "env_logger" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +dependencies = [ + "humantime", + "is-terminal", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + [[package]] name = "errno" version = "0.2.8" @@ -1048,6 +1039,7 @@ dependencies = [ "essa-common", "eyre", "fern", + "flume", "log", "serde", "smol", @@ -1080,7 +1072,7 @@ dependencies = [ "essa-api", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1096,9 +1088,9 @@ dependencies = [ [[package]] name = "event-listener" -version = "2.5.2" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "eyre" @@ -1157,7 +1149,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21e16290574b39ee41c71aeb90ae960c504ebaf1e2a1c87bd52aa56ed6e1a02f" dependencies = [ - "env_logger", + "env_logger 0.9.0", "log", ] @@ -1169,9 +1161,9 @@ checksum = "279fb028e20b3c4c320317955b77c5e0c9701f05a1d309905d6fc702cdc5053e" [[package]] name = "flume" -version = "0.10.12" +version = "0.10.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "843c03199d0c0ca54bc1ea90ac0d507274c28abcc4f691ae8b4eaa375087c76a" +checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" dependencies = [ "futures-core", "futures-sink", @@ -1213,9 +1205,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.21" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" dependencies = [ "futures-channel", "futures-core", @@ -1228,9 +1220,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.21" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", "futures-sink", @@ -1238,15 +1230,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.21" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-executor" -version = "0.3.21" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" dependencies = [ "futures-core", "futures-task", @@ -1255,9 +1247,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.21" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-lite" @@ -1276,26 +1268,26 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.21" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.31", ] [[package]] name = "futures-sink" -version = "0.3.21" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.21" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-timer" @@ -1305,9 +1297,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.21" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures-channel", "futures-core", @@ -1382,7 +1374,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" dependencies = [ "fallible-iterator", - "indexmap", + "indexmap 1.9.2", "stable_deref_trait", ] @@ -1405,7 +1397,7 @@ dependencies = [ "proc-macro-hack", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1441,6 +1433,12 @@ dependencies = [ "ahash", ] +[[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" + [[package]] name = "heck" version = "0.3.3" @@ -1488,12 +1486,11 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hmac" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "crypto-mac", - "digest 0.9.0", + "digest 0.10.6", ] [[package]] @@ -1539,11 +1536,30 @@ version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" dependencies = [ - "autocfg 1.1.0", + "autocfg", "hashbrown 0.12.3", "serde", ] +[[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", +] + +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array 0.14.5", +] + [[package]] name = "instant" version = "0.1.12" @@ -1582,9 +1598,9 @@ checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" [[package]] name = "ipnetwork" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4088d739b183546b239688ddbc79891831df421773df95e236daf7867866d355" +checksum = "1f84f1612606f3753f205a4e9a2efd6fe5b4c573a6269b2cc6c3003d44a0d127" dependencies = [ "serde", ] @@ -1603,9 +1619,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.10.3" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" dependencies = [ "either", ] @@ -1667,9 +1683,12 @@ dependencies = [ [[package]] name = "keccak" -version = "0.1.0" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7" +checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" +dependencies = [ + "cpufeatures", +] [[package]] name = "kv-log-macro" @@ -1709,9 +1728,9 @@ checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" [[package]] name = "libloading" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" dependencies = [ "cfg-if", "winapi", @@ -1747,7 +1766,7 @@ version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" dependencies = [ - "autocfg 1.1.0", + "autocfg", "scopeguard", ] @@ -1802,7 +1821,16 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" dependencies = [ - "autocfg 1.1.0", + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", ] [[package]] @@ -1811,7 +1839,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" dependencies = [ - "autocfg 1.1.0", + "autocfg", ] [[package]] @@ -1820,19 +1848,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" -[[package]] -name = "mio" -version = "0.7.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" -dependencies = [ - "libc", - "log", - "miow", - "ntapi", - "winapi", -] - [[package]] name = "mio" version = "0.8.5" @@ -1845,15 +1860,6 @@ dependencies = [ "windows-sys 0.42.0", ] -[[package]] -name = "miow" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi", -] - [[package]] name = "nanorand" version = "0.7.0" @@ -1865,29 +1871,22 @@ dependencies = [ [[package]] name = "nix" -version = "0.22.3" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ "bitflags 1.3.2", - "cc", "cfg-if", "libc", - "memoffset 0.6.5", + "memoffset 0.7.1", + "pin-utils", ] [[package]] -name = "nix" -version = "0.23.1" +name = "no-std-net" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" -dependencies = [ - "bitflags 1.3.2", - "cc", - "cfg-if", - "libc", - "memoffset 0.6.5", -] +checksum = "43794a0ace135be66a25d3ae77d41b91615fb68ae937f904090203e81f755b65" [[package]] name = "nom" @@ -1899,22 +1898,12 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "ntapi" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" -dependencies = [ - "winapi", -] - [[package]] name = "num-bigint-dig" -version = "0.7.0" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4547ee5541c18742396ae2c895d0717d0f886d8823b8399cdaf7b07d63ad0480" +checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" dependencies = [ - "autocfg 0.1.8", "byteorder", "lazy_static", "libm", @@ -1934,7 +1923,7 @@ checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1943,7 +1932,7 @@ version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" dependencies = [ - "autocfg 1.1.0", + "autocfg", "num-traits", ] @@ -1953,7 +1942,7 @@ version = "0.1.42" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59" dependencies = [ - "autocfg 1.1.0", + "autocfg", "num-integer", "num-traits", ] @@ -1964,17 +1953,17 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" dependencies = [ - "autocfg 1.1.0", + "autocfg", "libm", ] [[package]] name = "num_cpus" -version = "1.13.1" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.1.19", + "hermit-abi 0.3.1", "libc", ] @@ -1996,7 +1985,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -2007,7 +1996,7 @@ checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385" dependencies = [ "crc32fast", "hashbrown 0.13.2", - "indexmap", + "indexmap 1.9.2", "memchr", ] @@ -2023,27 +2012,33 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - [[package]] name = "openssl-probe" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + [[package]] name = "ordered-float" -version = "2.10.0" +version = "3.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87" +checksum = "2a54938017eacd63036332b4ae5c8a49fc8c0c1d6d629893057e4f13609edd06" dependencies = [ "num-traits", ] +[[package]] +name = "os_str_bytes" +version = "6.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac" + [[package]] name = "parking" version = "2.0.0" @@ -2075,9 +2070,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.7" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "peeking_take_while" @@ -2087,9 +2082,9 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "pem-rfc7468" -version = "0.2.4" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84e93a3b1cc0510b03020f33f21e62acdde3dcaef432edc95bea377fbd4c2cd4" +checksum = "24d159833a9105500e0398934e205e0773f0b27529557134ecfc51c27646adac" dependencies = [ "base64ct", ] @@ -2129,7 +2124,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -2145,12 +2140,12 @@ dependencies = [ [[package]] name = "petgraph" -version = "0.6.0" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a13a2fa9d0b63e5f22328828741e523766fff0ee9e779316902290dff3f824f" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap", + "indexmap 2.0.0", ] [[package]] @@ -2170,7 +2165,7 @@ checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -2187,53 +2182,52 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkcs1" -version = "0.2.4" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "116bee8279d783c0cf370efa1a94632f2108e5ef0bb32df31f051647810a4e2c" +checksum = "eff33bdbdfc54cc98a2eca766ebdec3e1b8fb7387523d5c9c9a2891da856f719" dependencies = [ "der", - "pem-rfc7468", + "pkcs8", + "spki", "zeroize", ] [[package]] name = "pkcs8" -version = "0.7.6" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee3ef9b64d26bad0536099c816c6734379e45bbd5f14798def6809e5cc350447" +checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" dependencies = [ "der", - "pem-rfc7468", - "pkcs1", "spki", - "zeroize", ] [[package]] name = "pnet" -version = "0.28.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6d2a0409666964722368ef5fb74b9f93fac11c18bef3308693c16c6733f103" +checksum = "0caaf5b11fd907ff15cf14a4477bfabca4b37ab9e447a4f8dead969a59cdafad" dependencies = [ - "ipnetwork", "pnet_base", "pnet_datalink", "pnet_packet", - "pnet_sys", "pnet_transport", ] [[package]] name = "pnet_base" -version = "0.28.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25488cd551a753dcaaa6fffc9f69a7610a412dd8954425bf7ffad5f7d1156fb8" +checksum = "f9d3a993d49e5fd5d4d854d6999d4addca1f72d86c65adf224a36757161c02b6" +dependencies = [ + "no-std-net", +] [[package]] name = "pnet_datalink" -version = "0.28.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d1f8ab1ef6c914cf51dc5dfe0be64088ea5f3b08bbf5a31abc70356d271198" +checksum = "e466faf03a98ad27f6e15cd27a2b7cc89e73e640a43527742977bc503c37f8aa" dependencies = [ "ipnetwork", "libc", @@ -2244,30 +2238,30 @@ dependencies = [ [[package]] name = "pnet_macros" -version = "0.28.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30490e0852e58402b8fae0d39897b08a24f493023a4d6cf56b2e30f31ed57548" +checksum = "48dd52a5211fac27e7acb14cfc9f30ae16ae0e956b7b779c8214c74559cef4c3" dependencies = [ "proc-macro2", "quote", "regex", - "syn", + "syn 1.0.109", ] [[package]] name = "pnet_macros_support" -version = "0.28.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4714e10f30cab023005adce048f2d30dd4ac4f093662abf2220855655ef8f90" +checksum = "89de095dc7739349559913aed1ef6a11e73ceade4897dadc77c5e09de6740750" dependencies = [ "pnet_base", ] [[package]] name = "pnet_packet" -version = "0.28.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8588067671d03c9f4254b2e66fecb4d8b93b5d3e703195b84f311cd137e32130" +checksum = "bc3b5111e697c39c8b9795b9fdccbc301ab696699e88b9ea5a4e4628978f495f" dependencies = [ "glob", "pnet_base", @@ -2277,9 +2271,9 @@ dependencies = [ [[package]] name = "pnet_sys" -version = "0.28.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9a3f32b0df45515befd19eed04616f6b56a488da92afc61164ef455e955f07f" +checksum = "328e231f0add6d247d82421bf3790b4b33b39c8930637f428eef24c4c6a90805" dependencies = [ "libc", "winapi", @@ -2287,9 +2281,9 @@ dependencies = [ [[package]] name = "pnet_transport" -version = "0.28.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "932b2916d693bcc5fa18443dc99142e0a6fd31a6ce75a511868f7174c17e2bce" +checksum = "ff597185e6f1f5671b3122e4dba892a1c73e17c17e723d7669bd9299cbe7f124" dependencies = [ "libc", "pnet_base", @@ -2334,9 +2328,9 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro2" -version = "1.0.59" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] @@ -2363,63 +2357,59 @@ dependencies = [ [[package]] name = "quinn" -version = "0.8.2" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d147472bc9a09f13b06c044787b6683cdffa02e2865b7f0fb53d67c49ed2988e" +checksum = "2e8b432585672228923edbbf64b8b12c14e1112f62e88737655b4a083dbcd78e" dependencies = [ "bytes", - "futures-channel", - "futures-util", - "fxhash", + "pin-project-lite", "quinn-proto", "quinn-udp", - "rustls 0.20.4", + "rustc-hash", + "rustls", "thiserror", "tokio", "tracing", - "webpki 0.22.0", + "webpki", ] [[package]] name = "quinn-proto" -version = "0.8.2" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "359c5eb33845f3ee05c229e65f87cdbc503eea394964b8f1330833d460b4ff3e" +checksum = "f31999cfc7927c4e212e60fd50934ab40e8e8bfd2d493d6095d2d306bc0764d9" dependencies = [ "bytes", - "fxhash", "rand", "ring", - "rustls 0.20.4", + "rustc-hash", + "rustls", "rustls-native-certs", - "rustls-pemfile 0.2.1", "slab", "thiserror", "tinyvec", "tracing", - "webpki 0.22.0", + "webpki", ] [[package]] name = "quinn-udp" -version = "0.1.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df185e5e5f7611fa6e628ed8f9633df10114b03bbaecab186ec55822c44ac727" +checksum = "641538578b21f5e5c8ea733b736895576d0fe329bb883b937db6f4d163dbaaf4" dependencies = [ - "futures-util", "libc", - "mio 0.7.14", "quinn-proto", "socket2", - "tokio", "tracing", + "windows-sys 0.42.0", ] [[package]] name = "quote" -version = "1.0.18" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -2460,7 +2450,7 @@ version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd249e82c21598a9a426a4e00dd7adc1d640b22445ec8545feef801d1a74c221" dependencies = [ - "autocfg 1.1.0", + "autocfg", "crossbeam-deque", "either", "rayon-core", @@ -2513,9 +2503,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.5.5" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" +checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" dependencies = [ "aho-corasick", "memchr", @@ -2524,9 +2514,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.25" +version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "ring" @@ -2543,22 +2533,33 @@ dependencies = [ "winapi", ] +[[package]] +name = "ringbuffer-spsc" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fd1938faa63a2362ee1747afb2d10567d0fb1413b9cbd6198a8541485c4f773" +dependencies = [ + "array-init", + "cache-padded", +] + [[package]] name = "rsa" -version = "0.5.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05c2603e2823634ab331437001b411b9ed11660fbc4066f3908c84a9439260d" +checksum = "094052d5470cbcef561cb848a7209968c9f12dfa6d668f4bca048ac5de51099c" dependencies = [ "byteorder", - "digest 0.9.0", - "lazy_static", + "digest 0.10.6", "num-bigint-dig", "num-integer", "num-iter", "num-traits", "pkcs1", "pkcs8", - "rand", + "rand_core", + "signature", + "smallvec", "subtle", "zeroize", ] @@ -2616,27 +2617,14 @@ dependencies = [ [[package]] name = "rustls" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" -dependencies = [ - "base64 0.13.0", - "log", - "ring", - "sct 0.6.1", - "webpki 0.21.4", -] - -[[package]] -name = "rustls" -version = "0.20.4" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fbfeb8d0ddb84706bc597a5574ab8912817c52a397f819e5b614e2265206921" +checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" dependencies = [ "log", "ring", - "sct 0.7.0", - "webpki 0.22.0", + "sct", + "webpki", ] [[package]] @@ -2646,36 +2634,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" dependencies = [ "openssl-probe", - "rustls-pemfile 1.0.0", + "rustls-pemfile", "schannel", "security-framework", ] [[package]] name = "rustls-pemfile" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9" -dependencies = [ - "base64 0.13.0", -] - -[[package]] -name = "rustls-pemfile" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee86d63972a7c661d1536fefe8c3c8407321c3df668891286de28abcd087360" -dependencies = [ - "base64 0.13.0", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7522c9de787ff061458fe9a829dc790a3f5b22dc571694fc5883f448b94d9a9" +checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.13.0", + "base64 0.21.2", ] [[package]] @@ -2700,16 +2670,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -[[package]] -name = "sct" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "sct" version = "0.7.0" @@ -2751,22 +2711,22 @@ checksum = "d65bd28f48be7196d222d95b9243287f48d27aca604e08497513019ff0502cc4" [[package]] name = "serde" -version = "1.0.136" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.136" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.31", ] [[package]] @@ -2786,12 +2746,25 @@ version = "0.8.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4a521f2940385c165a24ee286aa8599633d162077a54bdcae2a6fd5a7bfa7a0" dependencies = [ - "indexmap", + "indexmap 1.9.2", "ryu", "serde", "yaml-rust", ] +[[package]] +name = "serde_yaml" +version = "0.9.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" +dependencies = [ + "indexmap 2.0.0", + "itoa", + "ryu", + "serde", + "unsafe-libyaml", +] + [[package]] name = "sha-1" version = "0.8.2" @@ -2801,7 +2774,7 @@ dependencies = [ "block-buffer 0.7.3", "digest 0.8.1", "fake-simd", - "opaque-debug 0.2.3", + "opaque-debug", ] [[package]] @@ -2817,36 +2790,30 @@ dependencies = [ [[package]] name = "sha3" -version = "0.9.1" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809" +checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" dependencies = [ - "block-buffer 0.9.0", - "digest 0.9.0", + "digest 0.10.6", "keccak", - "opaque-debug 0.3.0", ] [[package]] -name = "shared_memory" -version = "0.12.0" +name = "shellexpand" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "681a9e90340f748af3a1cc52eb2c040eee29f976b763e99ad90fc0c5df6f9791" +checksum = "83bdb7831b2d85ddf4a7b148aa19d0587eddbe8671a436b7bd1182eaad0f2829" dependencies = [ - "cfg-if", - "libc", - "nix 0.22.3", - "rand", - "winapi", + "dirs-next", ] [[package]] name = "shellexpand" -version = "2.1.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83bdb7831b2d85ddf4a7b148aa19d0587eddbe8671a436b7bd1182eaad0f2829" +checksum = "da03fa3b94cc19e3ebfc88c4229c49d8f08cdbd1228870a45f0ffdf84988e14b" dependencies = [ - "dirs-next", + "dirs", ] [[package]] @@ -2874,6 +2841,16 @@ dependencies = [ "libc", ] +[[package]] +name = "signature" +version = "1.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" +dependencies = [ + "digest 0.10.6", + "rand_core", +] + [[package]] name = "slab" version = "0.4.6" @@ -2888,9 +2865,9 @@ checksum = "03b634d87b960ab1a38c4fe143b508576f075e7c978bfad18217645ebfdfa2ec" [[package]] name = "smallvec" -version = "1.8.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "smol" @@ -2912,9 +2889,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.4.4" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi", @@ -2937,10 +2914,11 @@ dependencies = [ [[package]] name = "spki" -version = "0.4.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c01a0c15da1b0b0e1494112e7af814a678fec9bd157881b49beac661e9b6f32" +checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" dependencies = [ + "base64ct", "der", ] @@ -2964,9 +2942,9 @@ dependencies = [ [[package]] name = "strsim" -version = "0.8.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "subtle" @@ -2986,15 +2964,14 @@ dependencies = [ ] [[package]] -name = "synstructure" -version = "0.12.6" +name = "syn" +version = "2.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +checksum = "718fa2415bcb8d8bd775917a1bf12a7931b6dfa890753378538118181e0cb398" dependencies = [ "proc-macro2", "quote", - "syn", - "unicode-xid", + "unicode-ident", ] [[package]] @@ -3030,12 +3007,9 @@ dependencies = [ [[package]] name = "textwrap" -version = "0.11.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] +checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" @@ -3054,7 +3028,7 @@ checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -3078,9 +3052,9 @@ version = "1.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af" dependencies = [ - "autocfg 1.1.0", + "autocfg", "libc", - "mio 0.8.5", + "mio", "num_cpus", "pin-project-lite", "socket2", @@ -3117,7 +3091,7 @@ checksum = "2e65ce065b4b5c53e73bb28912318cb8c9e9ad3921f1d669eb0e68b4c8143a2b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -3143,16 +3117,17 @@ checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" [[package]] name = "uhlc" -version = "0.4.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d74cc14aac0f650dae365e42250073bc0f89602bad5751d6159642be37690d6" +checksum = "8d291a7454d390b753ef68df8145da18367e32883ec2fa863959f0aefb915cdb" dependencies = [ "hex", "humantime", "lazy_static", "log", "serde", - "uuid 0.8.2", + "spin 0.9.8", + "uuid 1.4.1", ] [[package]] @@ -3203,6 +3178,12 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" +[[package]] +name = "unsafe-libyaml" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa" + [[package]] name = "untrusted" version = "0.7.1" @@ -3217,7 +3198,7 @@ checksum = "c2e7e85a0596447f0f2ac090e16bc4c516c6fe91771fb0c0ccf7fa3dae896b9c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -3242,9 +3223,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.0.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cfcd319456c4d6ea10087ed423473267e1a071f3bc0aa89f80d60997843c6f0" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" dependencies = [ "getrandom", ] @@ -3269,7 +3250,7 @@ checksum = "9d4444a980afa9ef0d29c2a3f4d952ec0495a7a996a9c78b52698b71bc21edb4" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "unzip-n", ] @@ -3374,7 +3355,7 @@ dependencies = [ "log", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-shared", ] @@ -3408,7 +3389,7 @@ checksum = "99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3436,7 +3417,7 @@ checksum = "6f159a9a7d3d2301de2fc9cb88ad3459af9e95cbd5a0f57437efccc2b572a027" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -3490,7 +3471,7 @@ version = "0.103.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c437373cac5ea84f1113d648d51f71751ffbe3d90c00ae67618cf20d0b5ee7b" dependencies = [ - "indexmap", + "indexmap 1.9.2", "url", ] @@ -3506,7 +3487,7 @@ dependencies = [ "bumpalo", "cfg-if", "fxprof-processed-profile", - "indexmap", + "indexmap 1.9.2", "libc", "log", "object", @@ -3567,7 +3548,7 @@ dependencies = [ "anyhow", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasmtime-component-util", "wasmtime-wit-bindgen", "wit-parser", @@ -3627,7 +3608,7 @@ dependencies = [ "anyhow", "cranelift-entity", "gimli", - "indexmap", + "indexmap 1.9.2", "log", "object", "serde", @@ -3706,7 +3687,7 @@ dependencies = [ "anyhow", "cc", "cfg-if", - "indexmap", + "indexmap 1.9.2", "libc", "log", "mach", @@ -3801,22 +3782,21 @@ dependencies = [ [[package]] name = "webpki" -version = "0.21.4" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" +checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" dependencies = [ "ring", "untrusted", ] [[package]] -name = "webpki" -version = "0.22.0" +name = "webpki-roots" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" dependencies = [ - "ring", - "untrusted", + "webpki", ] [[package]] @@ -3853,8 +3833,8 @@ dependencies = [ "heck 0.4.0", "proc-macro2", "quote", - "shellexpand", - "syn", + "shellexpand 2.1.0", + "syn 1.0.109", "witx", ] @@ -3866,7 +3846,7 @@ checksum = "d449a448fd1cb0fdfaea3776992ae2088a5cebcd48916006f99d6e57e6dea711" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wiggle-generate", ] @@ -4043,7 +4023,7 @@ checksum = "5ca2581061573ef6d1754983d7a9b3ed5871ef859d52708ea9a0f5af32919172" dependencies = [ "anyhow", "id-arena", - "indexmap", + "indexmap 1.9.2", "log", "pulldown-cmark", "unicode-xid", @@ -4073,16 +4053,18 @@ dependencies = [ [[package]] name = "zenoh" -version = "0.6.0-dev.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?rev=d4b00540cd0faa6ce585e11862cf9740ca226489#d4b00540cd0faa6ce585e11862cf9740ca226489" +version = "0.7.0-rc" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44140d6ebcf2e52ee48acad0e9d960c2b1e868eec021da2538e58373d615fc18" dependencies = [ "async-global-executor", "async-std", "async-trait", - "base64 0.13.0", - "env_logger", + "base64 0.13.1", + "env_logger 0.10.0", "event-listener", "flume", + "form_urlencoded", "futures", "git-version", "hex", @@ -4098,7 +4080,7 @@ dependencies = [ "socket2", "stop-token", "uhlc", - "uuid 0.8.2", + "uuid 1.4.1", "vec_map", "zenoh-buffers", "zenoh-cfg-properties", @@ -4117,23 +4099,21 @@ dependencies = [ [[package]] name = "zenoh-buffers" -version = "0.6.0-dev.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?rev=d4b00540cd0faa6ce585e11862cf9740ca226489#d4b00540cd0faa6ce585e11862cf9740ca226489" +version = "0.7.0-rc" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "244d54f1228d3c53fc69483faafcfcc1b4d670b60cffce17696fc49fbc7a6608" dependencies = [ "async-std", - "bincode", "hex", - "log", - "serde", - "shared_memory", "zenoh-collections", "zenoh-core", ] [[package]] name = "zenoh-cfg-properties" -version = "0.6.0-dev.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?rev=d4b00540cd0faa6ce585e11862cf9740ca226489#d4b00540cd0faa6ce585e11862cf9740ca226489" +version = "0.7.0-rc" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a963395194bf1b64f67d89333e8089f01568ec7ac28c305847f505452a98006e" dependencies = [ "zenoh-core", "zenoh-macros", @@ -4141,8 +4121,9 @@ dependencies = [ [[package]] name = "zenoh-collections" -version = "0.6.0-dev.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?rev=d4b00540cd0faa6ce585e11862cf9740ca226489#d4b00540cd0faa6ce585e11862cf9740ca226489" +version = "0.7.0-rc" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e256d7aff2c9af765d77efbfae7fcb708d2d7f4e179aa201bff2f81ad7a3845" dependencies = [ "async-std", "async-trait", @@ -4154,15 +4135,16 @@ dependencies = [ [[package]] name = "zenoh-config" -version = "0.6.0-dev.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?rev=d4b00540cd0faa6ce585e11862cf9740ca226489#d4b00540cd0faa6ce585e11862cf9740ca226489" +version = "0.7.0-rc" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bad1ff61abf28c57e8879ec4286fa29becf7e9bf12555df9a7faddff3bc9ea1b" dependencies = [ "flume", "json5", "num_cpus", "serde", "serde_json", - "serde_yaml", + "serde_yaml 0.9.25", "validated_struct", "zenoh-cfg-properties", "zenoh-core", @@ -4172,17 +4154,21 @@ dependencies = [ [[package]] name = "zenoh-core" -version = "0.6.0-dev.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?rev=d4b00540cd0faa6ce585e11862cf9740ca226489#d4b00540cd0faa6ce585e11862cf9740ca226489" +version = "0.7.0-rc" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b0f55158f3f83555db74d4cf5ebc34f90df5d2992cc0de67eba69b99628605e" dependencies = [ "anyhow", + "async-std", "lazy_static", + "zenoh-macros", ] [[package]] name = "zenoh-crypto" -version = "0.6.0-dev.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?rev=d4b00540cd0faa6ce585e11862cf9740ca226489#d4b00540cd0faa6ce585e11862cf9740ca226489" +version = "0.7.0-rc" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "653ba15479a0e3f1a94d7f079babc52f742f3a2bd995c59bc250cfc9a789dbbc" dependencies = [ "aes", "hmac", @@ -4194,8 +4180,9 @@ dependencies = [ [[package]] name = "zenoh-link" -version = "0.6.0-dev.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?rev=d4b00540cd0faa6ce585e11862cf9740ca226489#d4b00540cd0faa6ce585e11862cf9740ca226489" +version = "0.7.0-rc" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e58770c73cf0b5ec8fbe104d609eec83f9bc3463ea23a583c8b465de77f7d27" dependencies = [ "async-std", "async-trait", @@ -4213,12 +4200,14 @@ dependencies = [ [[package]] name = "zenoh-link-commons" -version = "0.6.0-dev.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?rev=d4b00540cd0faa6ce585e11862cf9740ca226489#d4b00540cd0faa6ce585e11862cf9740ca226489" +version = "0.7.0-rc" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21aab9eeb2aba53e37aae57467ffca1268d209811c5e2f39761aab4c1343bce3" dependencies = [ "async-std", "async-trait", "flume", + "serde", "zenoh-buffers", "zenoh-cfg-properties", "zenoh-core", @@ -4228,18 +4217,19 @@ dependencies = [ [[package]] name = "zenoh-link-quic" -version = "0.6.0-dev.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?rev=d4b00540cd0faa6ce585e11862cf9740ca226489#d4b00540cd0faa6ce585e11862cf9740ca226489" +version = "0.7.0-rc" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9f1354094eb4d5e4b864b5aa385efce46f94a43f6ba57dd9ea9a017e6e74176" dependencies = [ "async-std", "async-trait", "futures", "log", "quinn", - "rustls 0.20.4", + "rustls", "rustls-native-certs", - "rustls-pemfile 0.3.0", - "webpki 0.22.0", + "rustls-pemfile", + "webpki", "zenoh-cfg-properties", "zenoh-config", "zenoh-core", @@ -4251,8 +4241,9 @@ dependencies = [ [[package]] name = "zenoh-link-tcp" -version = "0.6.0-dev.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?rev=d4b00540cd0faa6ce585e11862cf9740ca226489#d4b00540cd0faa6ce585e11862cf9740ca226489" +version = "0.7.0-rc" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ffc29707a50680dba124dd4d8bc3bc19feb158db8312433bfc3078f7b8f1ef" dependencies = [ "async-std", "async-trait", @@ -4266,14 +4257,18 @@ dependencies = [ [[package]] name = "zenoh-link-tls" -version = "0.6.0-dev.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?rev=d4b00540cd0faa6ce585e11862cf9740ca226489#d4b00540cd0faa6ce585e11862cf9740ca226489" +version = "0.7.0-rc" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a5630b3a218c7179191dab78ebc45da1837793951bddb8fda4f5900b47da552" dependencies = [ "async-rustls", "async-std", "async-trait", "futures", "log", + "rustls-pemfile", + "webpki", + "webpki-roots", "zenoh-cfg-properties", "zenoh-config", "zenoh-core", @@ -4285,8 +4280,9 @@ dependencies = [ [[package]] name = "zenoh-link-udp" -version = "0.6.0-dev.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?rev=d4b00540cd0faa6ce585e11862cf9740ca226489#d4b00540cd0faa6ce585e11862cf9740ca226489" +version = "0.7.0-rc" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "176494947bd3a6aa10baa469afa4572635822683830808cd71d5554ce15dfebb" dependencies = [ "async-std", "async-trait", @@ -4302,15 +4298,16 @@ dependencies = [ [[package]] name = "zenoh-link-unixsock_stream" -version = "0.6.0-dev.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?rev=d4b00540cd0faa6ce585e11862cf9740ca226489#d4b00540cd0faa6ce585e11862cf9740ca226489" +version = "0.7.0-rc" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d9974305820f92478490ba8b8f119eb5b7d7b4998a7125d1510f6e69f3f81d1" dependencies = [ "async-std", "async-trait", "futures", "log", - "nix 0.23.1", - "uuid 0.8.2", + "nix", + "uuid 1.4.1", "zenoh-core", "zenoh-link-commons", "zenoh-protocol-core", @@ -4319,20 +4316,22 @@ dependencies = [ [[package]] name = "zenoh-macros" -version = "0.6.0-dev.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?rev=d4b00540cd0faa6ce585e11862cf9740ca226489#d4b00540cd0faa6ce585e11862cf9740ca226489" +version = "0.7.0-rc" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a9ac20b120990778cca204ee46c43a37ed4ffbc331e95702615490f9c169de8" dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn", + "syn 1.0.109", "unzip-n", ] [[package]] name = "zenoh-plugin-trait" -version = "0.6.0-dev.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?rev=d4b00540cd0faa6ce585e11862cf9740ca226489#d4b00540cd0faa6ce585e11862cf9740ca226489" +version = "0.7.0-rc" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3b8bfb8e2625e1150dab46b7a4433f866aa06af763237d564b1aa8f6aaf0b29" dependencies = [ "libloading", "log", @@ -4344,8 +4343,9 @@ dependencies = [ [[package]] name = "zenoh-protocol" -version = "0.6.0-dev.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?rev=d4b00540cd0faa6ce585e11862cf9740ca226489#d4b00540cd0faa6ce585e11862cf9740ca226489" +version = "0.7.0-rc" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "174a00456e29d941a4230148fd184953e95883bde47a4cfc1a508e0aaec89a89" dependencies = [ "log", "uhlc", @@ -4356,21 +4356,25 @@ dependencies = [ [[package]] name = "zenoh-protocol-core" -version = "0.6.0-dev.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?rev=d4b00540cd0faa6ce585e11862cf9740ca226489#d4b00540cd0faa6ce585e11862cf9740ca226489" +version = "0.7.0-rc" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdf3eaea2095d2c13fefdae25aca813b3644fc15e1441e16a4398b5113033753" dependencies = [ "hex", + "itertools", "lazy_static", + "rand", "serde", "uhlc", - "uuid 0.8.2", + "uuid 1.4.1", "zenoh-core", ] [[package]] name = "zenoh-sync" -version = "0.6.0-dev.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?rev=d4b00540cd0faa6ce585e11862cf9740ca226489#d4b00540cd0faa6ce585e11862cf9740ca226489" +version = "0.7.0-rc" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "821070b62a55d4c8a22e1e06c939c1f2d94767e660df9fcbea377781f72f59bf" dependencies = [ "async-std", "event-listener", @@ -4382,8 +4386,9 @@ dependencies = [ [[package]] name = "zenoh-transport" -version = "0.6.0-dev.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?rev=d4b00540cd0faa6ce585e11862cf9740ca226489#d4b00540cd0faa6ce585e11862cf9740ca226489" +version = "0.7.0-rc" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce4387cfc02cb86383de8e65ab1eb204e3908c5f1db9e6b4defd8ad530c9ddea" dependencies = [ "async-executor", "async-global-executor", @@ -4393,6 +4398,7 @@ dependencies = [ "log", "paste", "rand", + "ringbuffer-spsc", "rsa", "serde", "zenoh-buffers", @@ -4409,8 +4415,9 @@ dependencies = [ [[package]] name = "zenoh-util" -version = "0.6.0-dev.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?rev=d4b00540cd0faa6ce585e11862cf9740ca226489#d4b00540cd0faa6ce585e11862cf9740ca226489" +version = "0.7.0-rc" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54646455dad3940535e97cce03f1b604265177349133903d989bc72e00011404" dependencies = [ "async-std", "clap", @@ -4423,7 +4430,8 @@ dependencies = [ "libloading", "log", "pnet", - "shellexpand", + "pnet_datalink", + "shellexpand 3.1.0", "winapi", "zenoh-cfg-properties", "zenoh-collections", @@ -4434,24 +4442,9 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d68d9dcec5f9b43a30d38c49f91dfedfaac384cb8f085faca366c26207dd1619" -dependencies = [ - "zeroize_derive", -] - -[[package]] -name = "zeroize_derive" -version = "1.3.2" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", -] +checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" [[package]] name = "zstd" diff --git a/anna-rs b/anna-rs index 7dccf47..a2547a6 160000 --- a/anna-rs +++ b/anna-rs @@ -1 +1 @@ -Subproject commit 7dccf474944ecacb992ccdce153aaf617be28be5 +Subproject commit a2547a632b38eee708fa78eb1bc5fa5deba66c72 diff --git a/common/Cargo.toml b/common/Cargo.toml index a77bcc1..0a31561 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -8,4 +8,4 @@ license = "Apache-2.0" [dependencies] # keep in sync with anna-rs -zenoh = { git = "https://github.com/eclipse-zenoh/zenoh.git", rev = "d4b00540cd0faa6ce585e11862cf9740ca226489" } +zenoh = "0.7.0-rc" diff --git a/function-executor/Cargo.toml b/function-executor/Cargo.toml index 303aec8..ef94849 100644 --- a/function-executor/Cargo.toml +++ b/function-executor/Cargo.toml @@ -10,20 +10,21 @@ version = "0.1.0" anyhow = "1.0.45" argh = "0.1.6" eyre = "0.6.5" -wasmedge-sdk = {version = "0.8.1", optional = true} -wasmtime = {version = "9.0.3", optional = true} -wasmtime-wasi = {version = "9.0.3", optional = true} +wasmedge-sdk = { version = "0.8.1", optional = true } +wasmtime = { version = "9.0.3", optional = true } +wasmtime-wasi = { version = "9.0.3", optional = true } # keep in sync with anna-rs -anna = {git = "https://github.com/essa-project/anna-rs.git"} +anna = { git = "https://github.com/essa-project/anna-rs.git" } bincode = "1.3.3" -chrono = {version = "0.4.19", default-features = false} -essa-common = {path = "../common"} +chrono = { version = "0.4.19", default-features = false } +essa-common = { path = "../common" } fern = "0.6.0" log = "0.4.14" -serde = {version = "1.0.130", features = ["derive"]} +serde = { version = "1.0.130", features = ["derive"] } smol = "1.2.5" -uuid = {version = "0.8.2", features = ["v4"]} -zenoh = {git = "https://github.com/eclipse-zenoh/zenoh.git", rev = "d4b00540cd0faa6ce585e11862cf9740ca226489"} +uuid = { version = "0.8.2", features = ["v4"] } +zenoh = "0.7.0-rc" +flume = "0.10.14" [features] default = ["wasmedge_executor"] diff --git a/function-executor/src/main.rs b/function-executor/src/main.rs index 9af0ad1..ec0318f 100644 --- a/function-executor/src/main.rs +++ b/function-executor/src/main.rs @@ -19,13 +19,14 @@ use anyhow::Context; use essa_common::{ essa_default_zenoh_prefix, executor_run_function_subscribe_topic, executor_run_module_topic, }; +use flume::RecvError; use std::{ sync::Arc, thread, time::{Duration, Instant}, }; use uuid::Uuid; -use zenoh::prelude::{Receiver, SplitBuffer, ZFuture}; +use zenoh::prelude::{sync::SyncResolve, SplitBuffer}; #[cfg(all(feature = "wasmedge_executor", feature = "wasmtime_executor"))] compile_error!( @@ -61,7 +62,7 @@ fn main() -> anyhow::Result<()> { let zenoh = Arc::new( zenoh::open(zenoh::config::Config::default()) - .wait() + .res() .map_err(|e| anyhow::anyhow!(e)) .context("failed to connect to zenoh")?, ); @@ -130,13 +131,13 @@ fn module_receive_loop( zenoh_prefix: String, ) -> anyhow::Result<()> { let mut new_modules = zenoh - .subscribe(executor_run_module_topic(args.id, &zenoh_prefix)) - .wait() + .declare_subscriber(executor_run_module_topic(args.id, &zenoh_prefix)) + .res() .map_err(|e| anyhow::anyhow!(e)) .context("failed to subscribe to new modules")?; loop { - match new_modules.receiver().recv() { + match new_modules.receiver.recv() { Ok(change) => { let wasm_bytes = change.value.payload.contiguous().into_owned(); @@ -158,7 +159,7 @@ fn module_receive_loop( log::info!("Module run finished in {:?}", Instant::now() - start); }); } - Err(zenoh::sync::channel::RecvError::Disconnected) => break, + Err(RecvError::Disconnected) => break, } } Ok(()) @@ -171,16 +172,16 @@ fn function_call_receive_loop( zenoh_prefix: String, ) -> anyhow::Result<()> { let mut function_calls = zenoh - .queryable(executor_run_function_subscribe_topic( + .declare_queryable(executor_run_function_subscribe_topic( args.id, &zenoh_prefix, )) - .wait() + .res() .map_err(|e| anyhow::anyhow!(e)) .context("failed to subscribe to new modules")?; loop { - match function_calls.receiver().recv() { + match function_calls.receiver.recv() { Ok(query) => { // start a new function executor instance to run the requested // function @@ -198,7 +199,7 @@ fn function_call_receive_loop( } }); } - Err(zenoh::sync::channel::RecvError::Disconnected) => break, + Err(RecvError::Disconnected) => break, } } Ok(()) diff --git a/function-executor/src/wasmedge.rs b/function-executor/src/wasmedge.rs index 2cf2611..7f58d7d 100644 --- a/function-executor/src/wasmedge.rs +++ b/function-executor/src/wasmedge.rs @@ -6,6 +6,7 @@ use crate::{get_args, get_module, kvs_get, kvs_put, EssaResult, FunctionExecutor use anna::{lattice::LastWriterWinsLattice, nodes::ClientNode, ClientKey}; use anyhow::Context; use essa_common::scheduler_function_call_topic; +use flume::Receiver; use std::{ collections::HashMap, sync::{Arc, Mutex}, @@ -18,8 +19,8 @@ use wasmedge_sdk::{ ValType, Vm, VmBuilder, WasmValue, }; use zenoh::{ - prelude::{Receiver, Sample, SplitBuffer, ZFuture}, - query::ReplyReceiver, + prelude::{sync::SyncResolve, Sample, SplitBuffer}, + query::Reply, queryable::Query, }; @@ -64,7 +65,7 @@ impl FunctionExecutor { /// Runs the given function of a already compiled WASM module. pub fn handle_function_call(mut self, query: Query) -> anyhow::Result<()> { - let mut topic_split = query.key_selector().as_str().split('/'); + let mut topic_split = query.key_expr().as_str().split('/'); let args_key = ClientKey::from(topic_split.next_back().context("no args key in topic")?); let function_name = topic_split .next_back() @@ -106,8 +107,8 @@ impl FunctionExecutor { // also improve performance since the receiver would no longer need to // busy-wait on the result key in the KVS anymore. if let Some(result_value) = host_state.function_result.take() { - let selector = query.key_selector().to_string(); - query.reply(Sample::new(selector, result_value)); + let selector = query.key_expr(); + query.reply(Ok(Sample::new(selector, result_value))); Ok(()) } else { @@ -702,7 +703,7 @@ struct HostState { function_result: Option>, next_result_handle: u32, - result_receivers: HashMap, + result_receivers: HashMap>, results: HashMap>>, zenoh: Arc, @@ -717,7 +718,7 @@ impl HostState { &mut self, function_name: String, args: Vec, - ) -> Result { + ) -> Result, EssaResult> { // get the requested function and check its signature let func = self .module @@ -802,13 +803,13 @@ fn call_function_extern( args_key: ClientKey, zenoh: Arc, zenoh_prefix: &str, -) -> anyhow::Result { +) -> anyhow::Result> { let topic = scheduler_function_call_topic(zenoh_prefix, &module_key, &function_name, &args_key); // send the request to the scheduler node let reply = zenoh .get(topic) - .wait() + .res() .map_err(|e| anyhow::anyhow!(e)) .context("failed to send function call request to scheduler")?; diff --git a/function-executor/src/wasmtime.rs b/function-executor/src/wasmtime.rs index 5b56f73..430a57d 100644 --- a/function-executor/src/wasmtime.rs +++ b/function-executor/src/wasmtime.rs @@ -6,13 +6,14 @@ use crate::{get_args, get_module, kvs_get, kvs_put, EssaResult, FunctionExecutor use anna::{lattice::LastWriterWinsLattice, nodes::ClientNode, ClientKey}; use anyhow::{bail, Context}; use essa_common::scheduler_function_call_topic; +use flume::Receiver; use std::{collections::HashMap, sync::Arc}; use uuid::Uuid; use wasmtime::{Caller, Engine, Extern, Linker, Module, Store, ValType}; use wasmtime_wasi::{WasiCtx, WasiCtxBuilder}; use zenoh::{ - prelude::{Receiver, Sample, SplitBuffer, ZFuture}, - query::ReplyReceiver, + prelude::{sync::SyncResolve, Sample, SplitBuffer}, + query::Reply, queryable::Query, }; @@ -70,7 +71,7 @@ impl FunctionExecutor { /// Runs the given function of a already compiled WASM module. pub fn handle_function_call(mut self, query: Query) -> anyhow::Result<()> { - let mut topic_split = query.key_selector().as_str().split('/'); + let mut topic_split = query.key_expr().as_str().split('/'); let args_key = ClientKey::from(topic_split.next_back().context("no args key in topic")?); let function_name = topic_split .next_back() @@ -117,8 +118,11 @@ impl FunctionExecutor { // busy-wait on the result key in the KVS anymore. let mut host_state = store.into_data(); if let Some(result_value) = host_state.function_result.take() { - let selector = query.key_selector().to_string(); - query.reply(Sample::new(selector, result_value)); + let selector = query.key_expr().clone(); + query + .reply(Ok(Sample::new(selector, result_value))) + .res() + .map_err(|err| anyhow::anyhow!(err))?; Ok(()) } else { @@ -580,7 +584,7 @@ struct HostState { function_result: Option>, next_result_handle: u32, - result_receivers: HashMap, + result_receivers: HashMap>, results: HashMap>>, zenoh: Arc, @@ -595,7 +599,7 @@ impl HostState { &mut self, function_name: String, args: Vec, - ) -> Result { + ) -> Result, EssaResult> { // get the requested function and check its signature let func = self .module @@ -653,7 +657,13 @@ impl HostState { std::collections::hash_map::Entry::Vacant(entry) => { if let Some(result) = self.result_receivers.remove(&handle) { let reply = result.recv().map_err(|_| EssaResult::UnknownError)?; - let value = reply.sample.value.payload.contiguous().into_owned(); + let value = reply + .sample + .map_err(|_| EssaResult::UnknownError)? + .value + .payload + .contiguous() + .into_owned(); let value = entry.insert(Arc::new(value)); Ok(value.clone()) } else { @@ -675,13 +685,13 @@ fn call_function_extern( args_key: ClientKey, zenoh: Arc, zenoh_prefix: &str, -) -> anyhow::Result { +) -> anyhow::Result> { let topic = scheduler_function_call_topic(zenoh_prefix, &module_key, &function_name, &args_key); // send the request to the scheduler node let reply = zenoh .get(topic) - .wait() + .res() .map_err(|e| anyhow::anyhow!(e)) .context("failed to send function call request to scheduler")?; diff --git a/function-scheduler/Cargo.toml b/function-scheduler/Cargo.toml index 98bd295..d997460 100644 --- a/function-scheduler/Cargo.toml +++ b/function-scheduler/Cargo.toml @@ -12,7 +12,7 @@ wasmtime = "9.0.3" wasmtime-wasi = "9.0.3" argh = "0.1.6" # keep in sync with anna-rs -zenoh = { git = "https://github.com/eclipse-zenoh/zenoh.git", rev = "d4b00540cd0faa6ce585e11862cf9740ca226489" } +zenoh = "0.7.0-rc" essa-common = { path = "../common" } smol = "1.2.5" futures = "0.3.17" diff --git a/function-scheduler/src/bin/function-scheduler.rs b/function-scheduler/src/bin/function-scheduler.rs index 0223e69..2dc9d1e 100644 --- a/function-scheduler/src/bin/function-scheduler.rs +++ b/function-scheduler/src/bin/function-scheduler.rs @@ -15,7 +15,7 @@ use essa_common::{ }; use futures::{select, StreamExt}; use zenoh::{ - prelude::{Receiver, SplitBuffer, ZFuture}, + prelude::{r#async::AsyncResolve, SplitBuffer}, queryable::Query, }; @@ -25,7 +25,8 @@ fn main() -> anyhow::Result<()> { async fn run() -> anyhow::Result<()> { let zenoh = zenoh::open(zenoh::config::Config::default()) - .wait() + .res() + .await .map_err(|e| anyhow::anyhow!(e)) .context("failed to connect to zenoh")? .into_arc(); @@ -33,19 +34,21 @@ async fn run() -> anyhow::Result<()> { // subscribe to module run requests issued through `run-function` let mut new_modules_sub = zenoh - .subscribe(scheduler_run_module_topic(zenoh_prefix)) + .declare_subscriber(scheduler_run_module_topic(zenoh_prefix)) + .res() .await .map_err(|e| anyhow::anyhow!(e)) .context("failed to subscribe to new modules")?; - let mut new_modules = new_modules_sub.receiver().fuse(); + let mut new_modules = new_modules_sub.receiver.into_stream(); // subscribe to remote function call requests issued by WASM functions let mut function_calls_sub = zenoh - .queryable(scheduler_function_call_subscribe_topic(zenoh_prefix)) + .declare_queryable(scheduler_function_call_subscribe_topic(zenoh_prefix)) + .res() .await .map_err(|e| anyhow::anyhow!(e)) .context("failed to subscribe to function calls")?; - let mut function_calls = function_calls_sub.receiver().fuse(); + let mut function_calls = function_calls_sub.receiver.into_stream(); loop { select! { @@ -81,7 +84,8 @@ async fn run_module( executor_run_module_topic(executor_id, zenoh_prefix), wasm_bytes, ) - .wait() + .res() + .await .map_err(|e| anyhow::anyhow!(e)) .context("failed to send module to executor")?; @@ -97,7 +101,7 @@ async fn call_function( // executor node 0 let executor_id = 0; - let mut topic_split = query.key_selector().as_str().split('/'); + let mut topic_split = query.key_expr().as_str().split('/'); let args = topic_split .next_back() .context("no args key in topic")? @@ -118,13 +122,14 @@ async fn call_function( let reply = zenoh .get(topic) + .res() .await .expect("failed to forward function call to executor") .recv_async() .await .expect("failed to receive reply"); - query.reply_async(reply.sample).await; + query.reply(reply.sample).res().await; }; smol::spawn(task).detach(); diff --git a/function-scheduler/src/bin/run-function.rs b/function-scheduler/src/bin/run-function.rs index 5fa6aa2..a5be7a2 100644 --- a/function-scheduler/src/bin/run-function.rs +++ b/function-scheduler/src/bin/run-function.rs @@ -7,7 +7,7 @@ use anyhow::Context; use essa_common::{essa_default_zenoh_prefix, scheduler_run_module_topic}; use std::{fs, path::PathBuf}; -use zenoh::prelude::ZFuture; +use zenoh::prelude::sync::SyncResolve; #[derive(argh::FromArgs)] /// Triggers a run of the given WASM file in essa-rs. @@ -23,7 +23,7 @@ fn main() -> anyhow::Result<()> { let wasm_bytes = fs::read(&args.wasm_file).context("failed to read given wasm file")?; let zenoh = zenoh::open(zenoh::config::Config::default()) - .wait() + .res() .map_err(|e| anyhow::anyhow!(e)) .context("failed to connect to zenoh")?; let zenoh_prefix = essa_default_zenoh_prefix(); @@ -31,13 +31,13 @@ fn main() -> anyhow::Result<()> { // pass the WASM file to the scheduler zenoh .put(scheduler_run_module_topic(zenoh_prefix), wasm_bytes) - .wait() + .res() .map_err(|e| anyhow::anyhow!(e)) .context("failed to start module")?; zenoh .close() - .wait() + .res() .map_err(|e| anyhow::anyhow!(e)) .context("failed to close zenoh")?;