From 72038acb0009079c0c4a405528a387c7d8d5dbeb Mon Sep 17 00:00:00 2001 From: eclipse-zenoh-bot Date: Mon, 17 Feb 2025 08:58:20 +0000 Subject: [PATCH 1/2] chore: Update git/branch zenoh-plugin-dds/Cargo.toml --- Cargo.toml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 87343428..bbb19a15 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -51,14 +51,14 @@ tracing = "0.1" zenoh = { version = "1.2.1", features = [ "plugins", "unstable", -] } -zenoh-config = { version = "1.2.1", default-features = false } +] , git = "https://github.com/eclipse-zenoh/zenoh.git" , branch = "main" } +zenoh-config = { version = "1.2.1", default-features = false , git = "https://github.com/eclipse-zenoh/zenoh.git" , branch = "main" } zenoh-ext = { version = "1.2.1", features = [ "unstable", -] } +] , git = "https://github.com/eclipse-zenoh/zenoh.git" , branch = "main" } zenoh-plugin-dds = { version = "1.2.1", path = "zenoh-plugin-dds/", default-features = false } -zenoh-plugin-rest = { version = "1.2.1", default-features = false, features=["static_plugin"]} -zenoh-plugin-trait = { version = "1.2.1", default-features = false } +zenoh-plugin-rest = { version = "1.2.1", default-features = false, features=["static_plugin"], git = "https://github.com/eclipse-zenoh/zenoh.git" , branch = "main" } +zenoh-plugin-trait = { version = "1.2.1", default-features = false , git = "https://github.com/eclipse-zenoh/zenoh.git" , branch = "main" } [profile.release] codegen-units = 1 From 57b432d4f0b7527d475d5f20030043bd944effb5 Mon Sep 17 00:00:00 2001 From: eclipse-zenoh-bot Date: Mon, 17 Feb 2025 08:59:43 +0000 Subject: [PATCH 2/2] chore: Update Cargo lockfile --- Cargo.lock | 164 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 109 insertions(+), 55 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bd7ead5c..ddcea39c 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" @@ -4352,8 +4432,7 @@ dependencies = [ [[package]] name = "zenoh" version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c67d0c09dd844e1a2724c9db46d0d003657602fd63d9d08834719f2cf1a7a4bf" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157" dependencies = [ "ahash", "async-trait", @@ -4418,8 +4497,7 @@ dependencies = [ [[package]] name = "zenoh-buffers" version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d49ad2b19eba6f432683868535afb2f0e855e97517622fed19040f2e23b4ad87" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157" dependencies = [ "zenoh-collections", ] @@ -4427,8 +4505,7 @@ dependencies = [ [[package]] name = "zenoh-codec" version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beabf6a8e419532111857afb80f94885e1ad8990dff1fb445ad8678bc5bcd476" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157" dependencies = [ "tracing", "uhlc", @@ -4439,20 +4516,19 @@ dependencies = [ [[package]] name = "zenoh-collections" version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8874b3f55b18b2f76e4f85d168483b8823f533e53203055195be6f8ba6d7d96d" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157" [[package]] name = "zenoh-config" version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b43d3402833625c278f92b8fc1375ff16f3040b57f040002563948b394243e3e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157" dependencies = [ "json5", "num_cpus", "secrecy", "serde", "serde_json", + "serde_with", "serde_yaml", "tracing", "uhlc", @@ -4468,8 +4544,7 @@ dependencies = [ [[package]] name = "zenoh-core" version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53e74d46ee6583118d27adcf2359ea11d3631ef953917627cf0ae143865dd428" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157" dependencies = [ "lazy_static", "tokio", @@ -4480,8 +4555,7 @@ dependencies = [ [[package]] name = "zenoh-crypto" version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce74f74ad24ea22b967fc7456852834f7232f44f819dad701d33b9c8dab701f0" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157" dependencies = [ "aes 0.8.4", "hmac 0.12.1", @@ -4494,8 +4568,7 @@ dependencies = [ [[package]] name = "zenoh-ext" version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb1522a154e10f1ec3e78aa7506aec32ac3ec108a40a63bf01fb9ddfd57a4ad3" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157" dependencies = [ "async-trait", "bincode", @@ -4514,8 +4587,7 @@ dependencies = [ [[package]] name = "zenoh-keyexpr" version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91a0bd4ec27d130c923eb204270f711b2e911a4a4fbb9cbdeb97ee018d793ef" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157" dependencies = [ "getrandom 0.2.15", "hashbrown 0.14.5", @@ -4530,8 +4602,7 @@ dependencies = [ [[package]] name = "zenoh-link" version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9edba775a0060980c79e9033ad9bca7186fd7c069d81fb5c778723354992f98a" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157" dependencies = [ "zenoh-config", "zenoh-link-commons", @@ -4548,8 +4619,7 @@ dependencies = [ [[package]] name = "zenoh-link-commons" version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e65ab28b339471a17c57dfbd64aeaefc84658c6a7687cc55ed035ad72ce32a9" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157" dependencies = [ "async-trait", "flume", @@ -4573,8 +4643,7 @@ dependencies = [ [[package]] name = "zenoh-link-quic" version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d006879ad2c47dfdb02a63a608161ce59705ebc5dda159d06c4f5ba138cccd6" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157" dependencies = [ "async-trait", "base64 0.22.1", @@ -4601,8 +4670,7 @@ dependencies = [ [[package]] name = "zenoh-link-tcp" version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43c7691c934f17d8d709f0e669dd1802da339509303b92f2448af0f95a482e3d" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157" dependencies = [ "async-trait", "socket2 0.5.7", @@ -4619,8 +4687,7 @@ dependencies = [ [[package]] name = "zenoh-link-tls" version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17daaa1cc3f485c6647dc3e4bfe6eecdab61c774ecf9b0db22ba84f432be1c8" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157" dependencies = [ "async-trait", "base64 0.22.1", @@ -4649,8 +4716,7 @@ dependencies = [ [[package]] name = "zenoh-link-udp" version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58826b0f1c878f72e86af9c0cc9f1f9379e9d4cdc8d21dee7063c2552c83388c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157" dependencies = [ "async-trait", "socket2 0.5.7", @@ -4669,8 +4735,7 @@ dependencies = [ [[package]] name = "zenoh-link-unixsock_stream" version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6419e5d8a50d9fb993e855622c123043a8171a18a886b52c2dba1f18b72ab3dd" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157" dependencies = [ "async-trait", "nix", @@ -4688,8 +4753,7 @@ dependencies = [ [[package]] name = "zenoh-link-ws" version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d984cb2b989844898a0ded4576e041aff9bd040460d70ab0941daeb66df1fc3" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157" dependencies = [ "async-trait", "futures-util", @@ -4709,8 +4773,7 @@ dependencies = [ [[package]] name = "zenoh-macros" version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa21d01ec1ea1cb5c6988e5ec2ac67d80ebd8ba007dc11434fbd00cea51e137" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157" dependencies = [ "proc-macro2", "quote", @@ -4746,8 +4809,7 @@ dependencies = [ [[package]] name = "zenoh-plugin-rest" version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "873b4af0f3cdf05f2d5b3515dd8eca5377137ba91bcc15da9eb434193b674721" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157" dependencies = [ "anyhow", "async-std", @@ -4772,8 +4834,7 @@ dependencies = [ [[package]] name = "zenoh-plugin-trait" version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f08bfe87c4069399f87dbcc054137c454aef7f80a8569cfedcf3a4e0606c27e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157" dependencies = [ "git-version", "libloading", @@ -4789,8 +4850,7 @@ dependencies = [ [[package]] name = "zenoh-protocol" version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d4aacecb74964bebfcbe794be07103c17786e011feefe3923e622a804c53993" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157" dependencies = [ "const_format", "rand 0.8.5", @@ -4804,8 +4864,7 @@ dependencies = [ [[package]] name = "zenoh-result" version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efae1cb81ce13775cb376d3642fd0a24261cda3fcf4f48b3161cdd6f8aacbefd" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157" dependencies = [ "anyhow", ] @@ -4813,8 +4872,7 @@ dependencies = [ [[package]] name = "zenoh-runtime" version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ec3864216182c2095467b05c551d5b2189d476a63991cbf073e79dbcbb0dfd" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157" dependencies = [ "lazy_static", "ron", @@ -4828,8 +4886,7 @@ dependencies = [ [[package]] name = "zenoh-sync" version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d902c41b93b9ec4e81e9894aa88209d4b45ac3a936802a1132992148253e6dc5" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157" dependencies = [ "event-listener 5.3.1", "futures", @@ -4842,8 +4899,7 @@ dependencies = [ [[package]] name = "zenoh-task" version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed0f18b195565c5320301658713f56000fc4af2f297a9af3c0c07bcc9f31b11f" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157" dependencies = [ "futures", "tokio", @@ -4856,8 +4912,7 @@ dependencies = [ [[package]] name = "zenoh-transport" version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b93c3e374d3248ccd9763de8364d7b94d54edf870f1c3efe950263b47bbf43b" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157" dependencies = [ "async-trait", "crossbeam-utils", @@ -4890,8 +4945,7 @@ dependencies = [ [[package]] name = "zenoh-util" version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53713d75f0308ef7d085d1ef00d6987592b2f26574575f9af9a681cf114bbd20" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157" dependencies = [ "async-trait", "const_format",