diff --git a/Cargo.lock b/Cargo.lock index 0be6ab3..ea69b4c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -768,7 +768,7 @@ dependencies = [ "bitflags 1.3.2", "clap_lex", "indexmap 1.9.3", - "strsim", + "strsim 0.10.0", "termcolor", "textwrap", ] @@ -957,6 +957,41 @@ dependencies = [ "serde_json", ] +[[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 0.11.1", + "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 = "data-encoding" version = "2.6.0" @@ -995,6 +1030,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", + "serde", ] [[package]] @@ -1593,6 +1629,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" @@ -1611,6 +1653,7 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown 0.12.3", + "serde", ] [[package]] @@ -1621,6 +1664,7 @@ checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", "hashbrown 0.14.5", + "serde", ] [[package]] @@ -3097,6 +3141,36 @@ 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" @@ -3343,6 +3417,12 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[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" @@ -4351,8 +4431,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", @@ -4416,16 +4496,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", @@ -4435,19 +4515,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", @@ -4462,8 +4543,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", @@ -4473,8 +4554,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", @@ -4486,8 +4567,8 @@ dependencies = [ [[package]] name = "zenoh-ext" -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", "bincode", @@ -4505,8 +4586,8 @@ 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 0.14.5", @@ -4520,8 +4601,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", @@ -4537,8 +4618,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", @@ -4561,8 +4642,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", @@ -4588,8 +4669,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", @@ -4605,8 +4686,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", @@ -4634,8 +4715,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", @@ -4653,8 +4734,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", @@ -4671,8 +4752,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", @@ -4691,8 +4772,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", @@ -4727,8 +4808,8 @@ dependencies = [ [[package]] name = "zenoh-plugin-rest" -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", "async-std", @@ -4752,8 +4833,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", @@ -4768,8 +4849,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", @@ -4782,16 +4863,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", @@ -4804,8 +4885,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", @@ -4817,8 +4898,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", @@ -4830,8 +4911,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", @@ -4863,8 +4944,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",