From 3b580757b3a661ee312ee59d21982fe4faa8a6e1 Mon Sep 17 00:00:00 2001 From: Michael Ilyin Date: Mon, 15 Jan 2024 18:35:53 +0100 Subject: [PATCH] update to long_version --- Cargo.lock | 158 +++++++++++++++++------------------ zenoh-bridge-dds/src/main.rs | 8 +- zenoh-plugin-dds/src/lib.rs | 40 ++------- 3 files changed, 90 insertions(+), 116 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0b2fc6c4..8dc6d38c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -128,9 +128,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.5" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6" +checksum = "4cd2405b3ac1faab2990b74d728624cd9fd115651fcecc7c2d8daf01376275ba" dependencies = [ "anstyle", "anstyle-parse", @@ -321,8 +321,8 @@ dependencies = [ "futures-io", "futures-lite 2.2.0", "parking", - "polling 3.3.1", - "rustix 0.38.28", + "polling 3.3.2", + "rustix 0.38.30", "slab", "tracing", "windows-sys 0.52.0", @@ -367,7 +367,7 @@ dependencies = [ "cfg-if 1.0.0", "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.28", + "rustix 0.38.30", "windows-sys 0.48.0", ] @@ -414,7 +414,7 @@ dependencies = [ "cfg-if 1.0.0", "futures-core", "futures-io", - "rustix 0.38.28", + "rustix 0.38.30", "signal-hook-registry", "slab", "windows-sys 0.48.0", @@ -537,9 +537,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.6" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c79fed4cdb43e993fcdadc7e58a09fd0e3e649c4436fa11da71c9f1f3ee7feb9" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64ct" @@ -787,9 +787,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.14" +version = "4.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33e92c5c1a78c62968ec57dbc2440366a2d6e5a23faf829970ff1585dc6b18e2" +checksum = "80932e03c33999b9235edb8655bc9df3204adc9887c2f95b50cb1deb9fd54253" dependencies = [ "clap_builder", "clap_derive", @@ -797,9 +797,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.14" +version = "4.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4323769dc8a61e2c39ad7dc26f6f2800524691a44d74fe3d1071a5c24db6370" +checksum = "d6c0db58c659eef1c73e444d298c27322a1b52f6927d2ad470c0c0f96fa7b8fa" dependencies = [ "anstream", "anstyle", @@ -1477,9 +1477,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.22" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" +checksum = "b553656127a00601c8ae5590fcfdc118e4083a7924b6cf4ffc1ea4b99dc429d7" dependencies = [ "bytes", "fnv", @@ -1802,7 +1802,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" dependencies = [ "hermit-abi 0.3.3", - "rustix 0.38.28", + "rustix 0.38.30", "windows-sys 0.52.0", ] @@ -1823,9 +1823,9 @@ checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "js-sys" -version = "0.3.66" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" dependencies = [ "wasm-bindgen", ] @@ -1849,9 +1849,9 @@ checksum = "2a071f4f7efc9a9118dfb627a0a94ef247986e1ab8606a4c806ae2b3aa3b6978" dependencies = [ "ahash", "anyhow", - "base64 0.21.6", + "base64 0.21.7", "bytecount", - "clap 4.4.14", + "clap 4.4.17", "fancy-regex", "fraction", "getrandom 0.2.12", @@ -1873,9 +1873,9 @@ dependencies = [ [[package]] name = "keccak" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" +checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654" dependencies = [ "cpufeatures", ] @@ -1980,9 +1980,9 @@ dependencies = [ [[package]] name = "lz4_flex" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ea9b256699eda7b0387ffbc776dd625e28bde3918446381781245b7a50349d8" +checksum = "912b45c753ff5f7f5208307e8ace7d2a2e30d024e26d3509f3dce546c044ce15" dependencies = [ "twox-hash", ] @@ -2509,14 +2509,14 @@ dependencies = [ [[package]] name = "polling" -version = "3.3.1" +version = "3.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf63fa624ab313c11656b4cda960bfc46c410187ad493c41f6ba2d8c1e991c9e" +checksum = "545c980a3880efd47b2e262f6a4bb6daad6555cf3367aa9c4e52895f69537a41" dependencies = [ "cfg-if 1.0.0", "concurrent-queue", "pin-project-lite 0.2.13", - "rustix 0.38.28", + "rustix 0.38.30", "tracing", "windows-sys 0.52.0", ] @@ -2752,7 +2752,7 @@ version = "0.11.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41" dependencies = [ - "base64 0.21.6", + "base64 0.21.7", "bytes", "encoding_rs", "futures-core", @@ -2892,9 +2892,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.28" +version = "0.38.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" +checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" dependencies = [ "bitflags 2.4.1", "errno", @@ -2946,7 +2946,7 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.21.6", + "base64 0.21.7", ] [[package]] @@ -2955,7 +2955,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35e4980fa29e4c4b212ffb3db068a564cbf560e51d3944b7c88bd8bf5bec64f4" dependencies = [ - "base64 0.21.6", + "base64 0.21.7", "rustls-pki-types", ] @@ -3287,9 +3287,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "2593d31f82ead8df961d8bd23a64c2ccf2eb5dd34b0a34bfb4dd54011c72009e" [[package]] name = "socket2" @@ -4046,9 +4046,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.89" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" dependencies = [ "cfg-if 1.0.0", "serde", @@ -4058,9 +4058,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.89" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" dependencies = [ "bumpalo", "log", @@ -4073,9 +4073,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.39" +version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" +checksum = "bde2032aeb86bdfaecc8b261eef3cba735cc426c1f3a3416d1e0791be95fc461" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -4085,9 +4085,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.89" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4095,9 +4095,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.89" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" dependencies = [ "proc-macro2", "quote", @@ -4108,15 +4108,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.89" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" +checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" [[package]] name = "web-sys" -version = "0.3.66" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" +checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed" dependencies = [ "js-sys", "wasm-bindgen", @@ -4140,7 +4140,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.28", + "rustix 0.38.30", ] [[package]] @@ -4328,12 +4328,12 @@ dependencies = [ [[package]] name = "zenoh" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#5d1cd5da213db4414650cba080db6ea4263287fc" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#428bae77dd5464c0dd04865478459303cda1267b" dependencies = [ "async-global-executor", "async-std", "async-trait", - "base64 0.21.6", + "base64 0.21.7", "const_format", "env_logger", "event-listener 4.0.3", @@ -4393,7 +4393,7 @@ dependencies = [ [[package]] name = "zenoh-buffers" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#5d1cd5da213db4414650cba080db6ea4263287fc" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#428bae77dd5464c0dd04865478459303cda1267b" dependencies = [ "zenoh-collections", ] @@ -4401,7 +4401,7 @@ dependencies = [ [[package]] name = "zenoh-codec" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#5d1cd5da213db4414650cba080db6ea4263287fc" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#428bae77dd5464c0dd04865478459303cda1267b" dependencies = [ "log", "serde", @@ -4413,12 +4413,12 @@ dependencies = [ [[package]] name = "zenoh-collections" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#5d1cd5da213db4414650cba080db6ea4263287fc" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#428bae77dd5464c0dd04865478459303cda1267b" [[package]] name = "zenoh-config" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#5d1cd5da213db4414650cba080db6ea4263287fc" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#428bae77dd5464c0dd04865478459303cda1267b" dependencies = [ "flume", "json5", @@ -4437,7 +4437,7 @@ dependencies = [ [[package]] name = "zenoh-core" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#5d1cd5da213db4414650cba080db6ea4263287fc" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#428bae77dd5464c0dd04865478459303cda1267b" dependencies = [ "async-std", "lazy_static", @@ -4447,7 +4447,7 @@ dependencies = [ [[package]] name = "zenoh-crypto" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#5d1cd5da213db4414650cba080db6ea4263287fc" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#428bae77dd5464c0dd04865478459303cda1267b" dependencies = [ "aes 0.8.3", "hmac 0.12.1", @@ -4460,7 +4460,7 @@ dependencies = [ [[package]] name = "zenoh-ext" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#5d1cd5da213db4414650cba080db6ea4263287fc" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#428bae77dd5464c0dd04865478459303cda1267b" dependencies = [ "async-std", "bincode", @@ -4480,7 +4480,7 @@ dependencies = [ [[package]] name = "zenoh-keyexpr" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#5d1cd5da213db4414650cba080db6ea4263287fc" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#428bae77dd5464c0dd04865478459303cda1267b" dependencies = [ "hashbrown 0.14.3", "keyed-set", @@ -4494,7 +4494,7 @@ dependencies = [ [[package]] name = "zenoh-link" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#5d1cd5da213db4414650cba080db6ea4263287fc" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#428bae77dd5464c0dd04865478459303cda1267b" dependencies = [ "async-std", "async-trait", @@ -4513,7 +4513,7 @@ dependencies = [ [[package]] name = "zenoh-link-commons" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#5d1cd5da213db4414650cba080db6ea4263287fc" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#428bae77dd5464c0dd04865478459303cda1267b" dependencies = [ "async-std", "async-trait", @@ -4530,12 +4530,12 @@ dependencies = [ [[package]] name = "zenoh-link-quic" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#5d1cd5da213db4414650cba080db6ea4263287fc" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#428bae77dd5464c0dd04865478459303cda1267b" dependencies = [ "async-rustls", "async-std", "async-trait", - "base64 0.21.6", + "base64 0.21.7", "futures", "log", "quinn", @@ -4556,7 +4556,7 @@ dependencies = [ [[package]] name = "zenoh-link-tcp" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#5d1cd5da213db4414650cba080db6ea4263287fc" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#428bae77dd5464c0dd04865478459303cda1267b" dependencies = [ "async-std", "async-trait", @@ -4572,12 +4572,12 @@ dependencies = [ [[package]] name = "zenoh-link-tls" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#5d1cd5da213db4414650cba080db6ea4263287fc" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#428bae77dd5464c0dd04865478459303cda1267b" dependencies = [ "async-rustls", "async-std", "async-trait", - "base64 0.21.6", + "base64 0.21.7", "futures", "log", "rustls", @@ -4597,7 +4597,7 @@ dependencies = [ [[package]] name = "zenoh-link-udp" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#5d1cd5da213db4414650cba080db6ea4263287fc" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#428bae77dd5464c0dd04865478459303cda1267b" dependencies = [ "async-std", "async-trait", @@ -4616,7 +4616,7 @@ dependencies = [ [[package]] name = "zenoh-link-unixsock_stream" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#5d1cd5da213db4414650cba080db6ea4263287fc" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#428bae77dd5464c0dd04865478459303cda1267b" dependencies = [ "async-std", "async-trait", @@ -4634,7 +4634,7 @@ dependencies = [ [[package]] name = "zenoh-link-ws" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#5d1cd5da213db4414650cba080db6ea4263287fc" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#428bae77dd5464c0dd04865478459303cda1267b" dependencies = [ "async-std", "async-trait", @@ -4654,7 +4654,7 @@ dependencies = [ [[package]] name = "zenoh-macros" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#5d1cd5da213db4414650cba080db6ea4263287fc" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#428bae77dd5464c0dd04865478459303cda1267b" dependencies = [ "proc-macro2", "quote", @@ -4696,12 +4696,12 @@ dependencies = [ [[package]] name = "zenoh-plugin-rest" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#5d1cd5da213db4414650cba080db6ea4263287fc" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#428bae77dd5464c0dd04865478459303cda1267b" dependencies = [ "anyhow", "async-std", - "base64 0.21.6", - "clap 4.4.14", + "base64 0.21.7", + "clap 4.4.17", "const_format", "env_logger", "flume", @@ -4725,7 +4725,7 @@ dependencies = [ [[package]] name = "zenoh-plugin-trait" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#5d1cd5da213db4414650cba080db6ea4263287fc" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#428bae77dd5464c0dd04865478459303cda1267b" dependencies = [ "const_format", "libloading", @@ -4741,7 +4741,7 @@ dependencies = [ [[package]] name = "zenoh-protocol" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#5d1cd5da213db4414650cba080db6ea4263287fc" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#428bae77dd5464c0dd04865478459303cda1267b" dependencies = [ "const_format", "hex", @@ -4757,7 +4757,7 @@ dependencies = [ [[package]] name = "zenoh-result" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#5d1cd5da213db4414650cba080db6ea4263287fc" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#428bae77dd5464c0dd04865478459303cda1267b" dependencies = [ "anyhow", ] @@ -4765,7 +4765,7 @@ dependencies = [ [[package]] name = "zenoh-sync" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#5d1cd5da213db4414650cba080db6ea4263287fc" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#428bae77dd5464c0dd04865478459303cda1267b" dependencies = [ "async-std", "event-listener 4.0.3", @@ -4780,7 +4780,7 @@ dependencies = [ [[package]] name = "zenoh-transport" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#5d1cd5da213db4414650cba080db6ea4263287fc" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#428bae77dd5464c0dd04865478459303cda1267b" dependencies = [ "async-executor", "async-global-executor", @@ -4811,11 +4811,11 @@ dependencies = [ [[package]] name = "zenoh-util" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#5d1cd5da213db4414650cba080db6ea4263287fc" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#428bae77dd5464c0dd04865478459303cda1267b" dependencies = [ "async-std", "async-trait", - "clap 4.4.14", + "clap 4.4.17", "const_format", "flume", "futures", diff --git a/zenoh-bridge-dds/src/main.rs b/zenoh-bridge-dds/src/main.rs index 0d811a54..547b5c03 100644 --- a/zenoh-bridge-dds/src/main.rs +++ b/zenoh-bridge-dds/src/main.rs @@ -13,6 +13,8 @@ use async_liveliness_monitor::LivelinessMonitor; // ZettaScale Zenoh Team, // use clap::{App, Arg}; +use zenoh_plugin_dds::DDSPlugin; +use zenoh_plugin_trait::Plugin; use std::str::FromStr; use std::time::{Duration, SystemTime}; use zenoh::config::{Config, ModeDependentValue}; @@ -42,8 +44,8 @@ macro_rules! insert_json5 { fn parse_args() -> (Config, Option) { let mut app = App::new("zenoh bridge for DDS") - .version(zenoh_plugin_dds::GIT_VERSION) - .long_version(zenoh_plugin_dds::LONG_VERSION.as_str()) + .version(DDSPlugin::PLUGIN_VERSION) + .long_version(DDSPlugin::PLUGIN_LONG_VERSION) // // zenoh related arguments: // @@ -234,7 +236,7 @@ r#"--watchdog=[PERIOD] 'Experimental!! Run a watchdog thread that monitors the #[async_std::main] async fn main() { env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("z=info")).init(); - log::info!("zenoh-bridge-dds {}", *zenoh_plugin_dds::LONG_VERSION); + log::info!("zenoh-bridge-dds {}", DDSPlugin::PLUGIN_LONG_VERSION); let (config, watchdog_period) = parse_args(); let rest_plugin = config.plugin("rest").is_some(); diff --git a/zenoh-plugin-dds/src/lib.rs b/zenoh-plugin-dds/src/lib.rs index ace8056a..80bcf030 100644 --- a/zenoh-plugin-dds/src/lib.rs +++ b/zenoh-plugin-dds/src/lib.rs @@ -19,7 +19,6 @@ use cyclors::qos::{ use cyclors::*; use flume::{unbounded, Receiver, Sender}; use futures::select; -use git_version::git_version; use log::{debug, error, info, trace, warn}; use route_dds_zenoh::RouteDDSZenoh; use serde::ser::SerializeStruct; @@ -43,9 +42,9 @@ use zenoh::queryable::{Query, Queryable}; use zenoh::runtime::Runtime; use zenoh::Result as ZResult; use zenoh::Session; -use zenoh_core::{bail, zerror}; +use zenoh_core::zerror; use zenoh_ext::{SessionExt, SubscriberBuilderExt}; -use zenoh_plugin_trait::{plugin_version, Plugin, PluginControl}; +use zenoh_plugin_trait::{plugin_long_version, plugin_version, Plugin, PluginControl}; use zenoh_util::{Timed, TimedEvent, Timer}; pub mod config; @@ -63,8 +62,6 @@ use crate::ros_discovery::{ }; use crate::route_zenoh_dds::RouteZenohDDS; -pub const GIT_VERSION: &str = git_version!(prefix = "v", cargo_prefix = "v"); - macro_rules! ke_for_sure { ($val:expr) => { unsafe { keyexpr::from_str_unchecked($val) } @@ -78,7 +75,6 @@ macro_rules! member_id { } lazy_static::lazy_static!( - pub static ref LONG_VERSION: String = format!("{} built with {}", GIT_VERSION, env!("RUSTC_VERSION")); static ref LOG_PAYLOAD: bool = std::env::var("Z_LOG_PAYLOAD").is_ok(); static ref KE_PREFIX_ADMIN_SPACE: &'static keyexpr = ke_for_sure!("@/service"); @@ -130,6 +126,7 @@ impl Plugin for DDSPlugin { const DEFAULT_NAME: &'static str = "zenoh-plugin-dds"; const PLUGIN_VERSION: &'static str = plugin_version!(); + const PLUGIN_LONG_VERSION: &'static str = plugin_long_version!(); fn start(name: &str, runtime: &Self::StartArgs) -> ZResult { // Try to initiate login. @@ -147,39 +144,14 @@ impl Plugin for DDSPlugin { Ok(Box::new(DDSPlugin)) } } -impl RunningPluginTrait for DDSPlugin { - fn config_checker( - &self, - _path: &str, - _old: &serde_json::Map, - _new: &serde_json::Map, - ) -> ZResult>> { - bail!("DDSPlugin does not support hot configuration changes.") - } - - fn adminspace_getter<'a>( - &'a self, - selector: &'a Selector<'a>, - plugin_status_key: &str, - ) -> ZResult> { - let mut responses = Vec::new(); - let version_key = [plugin_status_key, "/__version__"].concat(); - if selector.key_expr.intersects(ke_for_sure!(&version_key)) { - responses.push(zenoh::plugins::Response::new( - version_key, - GIT_VERSION.into(), - )); - } - Ok(responses) - } -} +impl RunningPluginTrait for DDSPlugin {} pub async fn run(runtime: Runtime, config: Config) { // Try to initiate login. // Required in case of dynamic lib, otherwise no logs. // But cannot be done twice in case of static link. let _ = env_logger::try_init(); - debug!("DDS plugin {}", LONG_VERSION.as_str()); + debug!("DDS plugin {}", DDSPlugin::PLUGIN_LONG_VERSION); debug!("DDS plugin {:?}", config); // open zenoh-net Session @@ -645,7 +617,7 @@ impl<'a> DdsPluginRuntime<'a> { .map(serde_json::to_value) .transpose(), AdminRef::Config => Some(serde_json::to_value(self)).transpose(), - AdminRef::Version => Ok(Some(Value::String(LONG_VERSION.clone()))), + AdminRef::Version => Ok(Some(DDSPlugin::PLUGIN_LONG_VERSION.into())), } }