From 321bad1384acc896832d07f4e0723900ba4d559e Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Tue, 8 Oct 2024 09:25:30 +0000 Subject: [PATCH] Sync lockfile with Zenoh `3740564` from `2024-10-08` --- Cargo.lock | 54 ++++++++++++++++++------------------- zenoh-plugin-dds/src/lib.rs | 5 ++-- 2 files changed, 30 insertions(+), 29 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8309a10..a65ca17 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4351,7 +4351,7 @@ dependencies = [ [[package]] name = "zenoh" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4" dependencies = [ "ahash", "async-trait", @@ -4418,7 +4418,7 @@ dependencies = [ [[package]] name = "zenoh-buffers" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4" dependencies = [ "zenoh-collections", ] @@ -4426,7 +4426,7 @@ dependencies = [ [[package]] name = "zenoh-codec" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4" dependencies = [ "tracing", "uhlc", @@ -4437,12 +4437,12 @@ dependencies = [ [[package]] name = "zenoh-collections" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4" [[package]] name = "zenoh-config" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4" dependencies = [ "json5", "num_cpus", @@ -4463,7 +4463,7 @@ dependencies = [ [[package]] name = "zenoh-core" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4" dependencies = [ "lazy_static", "tokio", @@ -4474,7 +4474,7 @@ dependencies = [ [[package]] name = "zenoh-crypto" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4" dependencies = [ "aes 0.8.4", "hmac 0.12.1", @@ -4487,7 +4487,7 @@ dependencies = [ [[package]] name = "zenoh-ext" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4" dependencies = [ "bincode", "flume", @@ -4504,7 +4504,7 @@ dependencies = [ [[package]] name = "zenoh-keyexpr" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4" dependencies = [ "hashbrown 0.14.5", "keyed-set", @@ -4518,7 +4518,7 @@ dependencies = [ [[package]] name = "zenoh-link" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4" dependencies = [ "zenoh-config", "zenoh-link-commons", @@ -4535,7 +4535,7 @@ dependencies = [ [[package]] name = "zenoh-link-commons" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4" dependencies = [ "async-trait", "flume", @@ -4558,7 +4558,7 @@ dependencies = [ [[package]] name = "zenoh-link-quic" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4" dependencies = [ "async-trait", "base64 0.22.1", @@ -4583,7 +4583,7 @@ dependencies = [ [[package]] name = "zenoh-link-tcp" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4" dependencies = [ "async-trait", "socket2 0.5.7", @@ -4600,7 +4600,7 @@ dependencies = [ [[package]] name = "zenoh-link-tls" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4" dependencies = [ "async-trait", "base64 0.22.1", @@ -4627,7 +4627,7 @@ dependencies = [ [[package]] name = "zenoh-link-udp" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4" dependencies = [ "async-trait", "socket2 0.5.7", @@ -4646,7 +4646,7 @@ dependencies = [ [[package]] name = "zenoh-link-unixsock_stream" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4" dependencies = [ "async-trait", "nix", @@ -4664,7 +4664,7 @@ dependencies = [ [[package]] name = "zenoh-link-ws" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4" dependencies = [ "async-trait", "futures-util", @@ -4684,7 +4684,7 @@ dependencies = [ [[package]] name = "zenoh-macros" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4" dependencies = [ "proc-macro2", "quote", @@ -4720,7 +4720,7 @@ dependencies = [ [[package]] name = "zenoh-plugin-rest" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4" dependencies = [ "anyhow", "async-std", @@ -4745,7 +4745,7 @@ dependencies = [ [[package]] name = "zenoh-plugin-trait" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4" dependencies = [ "git-version", "libloading", @@ -4761,7 +4761,7 @@ dependencies = [ [[package]] name = "zenoh-protocol" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4" dependencies = [ "const_format", "rand 0.8.5", @@ -4775,7 +4775,7 @@ dependencies = [ [[package]] name = "zenoh-result" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4" dependencies = [ "anyhow", ] @@ -4783,7 +4783,7 @@ dependencies = [ [[package]] name = "zenoh-runtime" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4" dependencies = [ "lazy_static", "ron", @@ -4796,7 +4796,7 @@ dependencies = [ [[package]] name = "zenoh-sync" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4" dependencies = [ "event-listener 5.3.1", "futures", @@ -4809,7 +4809,7 @@ dependencies = [ [[package]] name = "zenoh-task" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4" dependencies = [ "futures", "tokio", @@ -4822,7 +4822,7 @@ dependencies = [ [[package]] name = "zenoh-transport" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4" dependencies = [ "async-trait", "crossbeam-utils", @@ -4855,7 +4855,7 @@ dependencies = [ [[package]] name = "zenoh-util" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4" dependencies = [ "async-trait", "const_format", diff --git a/zenoh-plugin-dds/src/lib.rs b/zenoh-plugin-dds/src/lib.rs index 1392a37..e39cf55 100644 --- a/zenoh-plugin-dds/src/lib.rs +++ b/zenoh-plugin-dds/src/lib.rs @@ -40,6 +40,7 @@ use tokio::task::JoinHandle; use tracing::{debug, error, info, trace, warn}; use zenoh::{ bytes::{Encoding, ZBytes}, + handlers::FifoChannelHandler, internal::{ plugins::{RunningPlugin, RunningPluginTrait, ZenohPlugin}, runtime::Runtime, @@ -783,7 +784,7 @@ impl<'a> DdsPluginRuntime<'a> { group_subscriber: &Receiver, dds_disco_rcv: &Receiver, admin_keyexpr_prefix: OwnedKeyExpr, - admin_queryable: &Queryable>, + admin_queryable: &Queryable>, ) { debug!(r#"Run in "local discovery" mode"#); @@ -976,7 +977,7 @@ impl<'a> DdsPluginRuntime<'a> { group_subscriber: &Receiver, dds_disco_rcv: &Receiver, admin_keyexpr_prefix: OwnedKeyExpr, - admin_queryable: &Queryable>, + admin_queryable: &Queryable>, ) { debug!(r#"Run in "forward discovery" mode"#);