From f4b6d8d9fd35e16141fa2bb9201b645106e05ce3 Mon Sep 17 00:00:00 2001 From: eclipse-zenoh-bot <61247838+eclipse-zenoh-bot@users.noreply.github.com> Date: Sat, 8 Feb 2025 01:18:08 +0100 Subject: [PATCH] build: Sync with eclipse-zenoh/zenoh@ed56b57 from 2025-02-07 (#335) Co-authored-by: eclipse-zenoh-bot --- Cargo.lock | 223 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 163 insertions(+), 60 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6b586ba..08c849a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -744,6 +744,41 @@ dependencies = [ "cipher 0.2.5", ] +[[package]] +name = "darling" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.77", +] + +[[package]] +name = "darling_macro" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.77", +] + [[package]] name = "dashmap" version = "5.5.3" @@ -751,7 +786,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown", + "hashbrown 0.14.5", "lock_api", "once_cell", "parking_lot_core 0.9.10", @@ -809,6 +844,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", + "serde", ] [[package]] @@ -1231,13 +1267,19 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap", + "indexmap 2.5.0", "slab", "tokio", "tokio-util", "tracing", ] +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + [[package]] name = "hashbrown" version = "0.14.5" @@ -1260,6 +1302,12 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + [[package]] name = "hkdf" version = "0.10.0" @@ -1451,6 +1499,12 @@ dependencies = [ "cc", ] +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + [[package]] name = "idna" version = "0.5.0" @@ -1461,6 +1515,17 @@ dependencies = [ "unicode-normalization", ] +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", + "serde", +] + [[package]] name = "indexmap" version = "2.5.0" @@ -1468,7 +1533,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.14.5", + "serde", ] [[package]] @@ -1678,7 +1744,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0a3ec39d2dc17953a1540d63906a112088f79b2e46833b4ed65bc9de3904ae34" dependencies = [ - "hashbrown", + "hashbrown 0.14.5", ] [[package]] @@ -2147,7 +2213,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap", + "indexmap 2.5.0", ] [[package]] @@ -3085,13 +3151,43 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_with" +version = "3.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa" +dependencies = [ + "base64 0.22.1", + "chrono", + "hex", + "indexmap 1.9.3", + "indexmap 2.5.0", + "serde", + "serde_derive", + "serde_json", + "serde_with_macros", + "time 0.3.36", +] + +[[package]] +name = "serde_with_macros" +version = "3.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.77", +] + [[package]] name = "serde_yaml" version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap", + "indexmap 2.5.0", "itoa", "ryu", "serde", @@ -3343,6 +3439,12 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + [[package]] name = "subtle" version = "2.6.1" @@ -3637,7 +3739,7 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "hashbrown", + "hashbrown 0.14.5", "pin-project-lite", "tokio", ] @@ -4308,8 +4410,8 @@ dependencies = [ [[package]] name = "zenoh" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#31e415af1c158155f839afe4cb02c86d79c78781" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed56b577049f8a0b6d26553c3b72692bd6539134" dependencies = [ "ahash", "async-trait", @@ -4402,16 +4504,16 @@ dependencies = [ [[package]] name = "zenoh-buffers" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#31e415af1c158155f839afe4cb02c86d79c78781" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed56b577049f8a0b6d26553c3b72692bd6539134" dependencies = [ "zenoh-collections", ] [[package]] name = "zenoh-codec" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#31e415af1c158155f839afe4cb02c86d79c78781" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed56b577049f8a0b6d26553c3b72692bd6539134" dependencies = [ "tracing", "uhlc", @@ -4421,19 +4523,20 @@ dependencies = [ [[package]] name = "zenoh-collections" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#31e415af1c158155f839afe4cb02c86d79c78781" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed56b577049f8a0b6d26553c3b72692bd6539134" [[package]] name = "zenoh-config" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#31e415af1c158155f839afe4cb02c86d79c78781" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed56b577049f8a0b6d26553c3b72692bd6539134" dependencies = [ "json5", "num_cpus", "secrecy", "serde", "serde_json", + "serde_with", "serde_yaml", "tracing", "uhlc", @@ -4448,8 +4551,8 @@ dependencies = [ [[package]] name = "zenoh-core" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#31e415af1c158155f839afe4cb02c86d79c78781" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed56b577049f8a0b6d26553c3b72692bd6539134" dependencies = [ "lazy_static", "tokio", @@ -4459,8 +4562,8 @@ dependencies = [ [[package]] name = "zenoh-crypto" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#31e415af1c158155f839afe4cb02c86d79c78781" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed56b577049f8a0b6d26553c3b72692bd6539134" dependencies = [ "aes 0.8.4", "hmac 0.12.1", @@ -4472,11 +4575,11 @@ dependencies = [ [[package]] name = "zenoh-keyexpr" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#31e415af1c158155f839afe4cb02c86d79c78781" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed56b577049f8a0b6d26553c3b72692bd6539134" dependencies = [ "getrandom 0.2.15", - "hashbrown", + "hashbrown 0.14.5", "keyed-set", "rand 0.8.5", "schemars", @@ -4487,8 +4590,8 @@ dependencies = [ [[package]] name = "zenoh-link" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#31e415af1c158155f839afe4cb02c86d79c78781" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed56b577049f8a0b6d26553c3b72692bd6539134" dependencies = [ "zenoh-config", "zenoh-link-commons", @@ -4504,8 +4607,8 @@ dependencies = [ [[package]] name = "zenoh-link-commons" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#31e415af1c158155f839afe4cb02c86d79c78781" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed56b577049f8a0b6d26553c3b72692bd6539134" dependencies = [ "async-trait", "flume", @@ -4528,8 +4631,8 @@ dependencies = [ [[package]] name = "zenoh-link-quic" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#31e415af1c158155f839afe4cb02c86d79c78781" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed56b577049f8a0b6d26553c3b72692bd6539134" dependencies = [ "async-trait", "base64 0.22.1", @@ -4555,8 +4658,8 @@ dependencies = [ [[package]] name = "zenoh-link-tcp" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#31e415af1c158155f839afe4cb02c86d79c78781" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed56b577049f8a0b6d26553c3b72692bd6539134" dependencies = [ "async-trait", "socket2 0.5.7", @@ -4572,8 +4675,8 @@ dependencies = [ [[package]] name = "zenoh-link-tls" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#31e415af1c158155f839afe4cb02c86d79c78781" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed56b577049f8a0b6d26553c3b72692bd6539134" dependencies = [ "async-trait", "base64 0.22.1", @@ -4601,8 +4704,8 @@ dependencies = [ [[package]] name = "zenoh-link-udp" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#31e415af1c158155f839afe4cb02c86d79c78781" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed56b577049f8a0b6d26553c3b72692bd6539134" dependencies = [ "async-trait", "socket2 0.5.7", @@ -4620,8 +4723,8 @@ dependencies = [ [[package]] name = "zenoh-link-unixsock_stream" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#31e415af1c158155f839afe4cb02c86d79c78781" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed56b577049f8a0b6d26553c3b72692bd6539134" dependencies = [ "async-trait", "nix", @@ -4638,8 +4741,8 @@ dependencies = [ [[package]] name = "zenoh-link-ws" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#31e415af1c158155f839afe4cb02c86d79c78781" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed56b577049f8a0b6d26553c3b72692bd6539134" dependencies = [ "async-trait", "futures-util", @@ -4658,8 +4761,8 @@ dependencies = [ [[package]] name = "zenoh-macros" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#31e415af1c158155f839afe4cb02c86d79c78781" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed56b577049f8a0b6d26553c3b72692bd6539134" dependencies = [ "proc-macro2", "quote", @@ -4669,8 +4772,8 @@ dependencies = [ [[package]] name = "zenoh-plugin-trait" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#31e415af1c158155f839afe4cb02c86d79c78781" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed56b577049f8a0b6d26553c3b72692bd6539134" dependencies = [ "git-version", "libloading", @@ -4685,8 +4788,8 @@ dependencies = [ [[package]] name = "zenoh-protocol" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#31e415af1c158155f839afe4cb02c86d79c78781" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed56b577049f8a0b6d26553c3b72692bd6539134" dependencies = [ "const_format", "rand 0.8.5", @@ -4699,16 +4802,16 @@ dependencies = [ [[package]] name = "zenoh-result" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#31e415af1c158155f839afe4cb02c86d79c78781" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed56b577049f8a0b6d26553c3b72692bd6539134" dependencies = [ "anyhow", ] [[package]] name = "zenoh-runtime" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#31e415af1c158155f839afe4cb02c86d79c78781" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed56b577049f8a0b6d26553c3b72692bd6539134" dependencies = [ "lazy_static", "ron", @@ -4721,8 +4824,8 @@ dependencies = [ [[package]] name = "zenoh-sync" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#31e415af1c158155f839afe4cb02c86d79c78781" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed56b577049f8a0b6d26553c3b72692bd6539134" dependencies = [ "event-listener 5.3.1", "futures", @@ -4734,8 +4837,8 @@ dependencies = [ [[package]] name = "zenoh-task" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#31e415af1c158155f839afe4cb02c86d79c78781" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed56b577049f8a0b6d26553c3b72692bd6539134" dependencies = [ "futures", "tokio", @@ -4747,8 +4850,8 @@ dependencies = [ [[package]] name = "zenoh-transport" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#31e415af1c158155f839afe4cb02c86d79c78781" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed56b577049f8a0b6d26553c3b72692bd6539134" dependencies = [ "async-trait", "crossbeam-utils", @@ -4780,8 +4883,8 @@ dependencies = [ [[package]] name = "zenoh-util" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#31e415af1c158155f839afe4cb02c86d79c78781" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed56b577049f8a0b6d26553c3b72692bd6539134" dependencies = [ "async-trait", "const_format", @@ -4805,8 +4908,8 @@ dependencies = [ [[package]] name = "zenoh_backend_traits" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#31e415af1c158155f839afe4cb02c86d79c78781" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ed56b577049f8a0b6d26553c3b72692bd6539134" dependencies = [ "async-trait", "const_format",