From bae9949808e1b52f8b140702efee298da8b0abe6 Mon Sep 17 00:00:00 2001 From: Michael Ilyin Date: Wed, 11 Dec 2024 17:31:55 +0100 Subject: [PATCH] allow deprecated to enable usage of fetchng subscriber --- Cargo.lock | 78 ++++++++++++++++++++++++------------- zenoh-plugin-dds/src/lib.rs | 1 + 2 files changed, 52 insertions(+), 27 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d523a5d..9f46227 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2631,6 +2631,26 @@ dependencies = [ "thiserror", ] +[[package]] +name = "ref-cast" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccf0a6f84d5f1d581da8b41b47ec8600871962f2a528115b542b362d4b744931" +dependencies = [ + "ref-cast-impl", +] + +[[package]] +name = "ref-cast-impl" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + [[package]] name = "regex" version = "1.10.6" @@ -4332,7 +4352,7 @@ dependencies = [ [[package]] name = "zenoh" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#cc201aa1f2c0e9ec780bb6e55fdcc750434a9b2f" dependencies = [ "ahash", "async-trait", @@ -4348,6 +4368,7 @@ dependencies = [ "petgraph", "phf", "rand 0.8.5", + "ref-cast", "rustc_version 0.4.1", "serde", "serde_json", @@ -4396,7 +4417,7 @@ dependencies = [ [[package]] name = "zenoh-buffers" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#cc201aa1f2c0e9ec780bb6e55fdcc750434a9b2f" dependencies = [ "zenoh-collections", ] @@ -4404,7 +4425,7 @@ dependencies = [ [[package]] name = "zenoh-codec" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#cc201aa1f2c0e9ec780bb6e55fdcc750434a9b2f" dependencies = [ "tracing", "uhlc", @@ -4415,12 +4436,12 @@ dependencies = [ [[package]] name = "zenoh-collections" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#cc201aa1f2c0e9ec780bb6e55fdcc750434a9b2f" [[package]] name = "zenoh-config" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#cc201aa1f2c0e9ec780bb6e55fdcc750434a9b2f" dependencies = [ "json5", "num_cpus", @@ -4442,7 +4463,7 @@ dependencies = [ [[package]] name = "zenoh-core" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#cc201aa1f2c0e9ec780bb6e55fdcc750434a9b2f" dependencies = [ "lazy_static", "tokio", @@ -4453,7 +4474,7 @@ dependencies = [ [[package]] name = "zenoh-crypto" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#cc201aa1f2c0e9ec780bb6e55fdcc750434a9b2f" dependencies = [ "aes 0.8.4", "hmac 0.12.1", @@ -4466,8 +4487,9 @@ dependencies = [ [[package]] name = "zenoh-ext" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#cc201aa1f2c0e9ec780bb6e55fdcc750434a9b2f" dependencies = [ + "async-trait", "bincode", "flume", "futures", @@ -4475,6 +4497,7 @@ dependencies = [ "serde", "tokio", "tracing", + "uhlc", "zenoh", "zenoh-macros", "zenoh-util", @@ -4483,7 +4506,7 @@ dependencies = [ [[package]] name = "zenoh-keyexpr" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#cc201aa1f2c0e9ec780bb6e55fdcc750434a9b2f" dependencies = [ "hashbrown 0.14.5", "keyed-set", @@ -4497,7 +4520,7 @@ dependencies = [ [[package]] name = "zenoh-link" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#cc201aa1f2c0e9ec780bb6e55fdcc750434a9b2f" dependencies = [ "zenoh-config", "zenoh-link-commons", @@ -4514,7 +4537,7 @@ dependencies = [ [[package]] name = "zenoh-link-commons" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#cc201aa1f2c0e9ec780bb6e55fdcc750434a9b2f" dependencies = [ "async-trait", "flume", @@ -4538,7 +4561,7 @@ dependencies = [ [[package]] name = "zenoh-link-quic" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#cc201aa1f2c0e9ec780bb6e55fdcc750434a9b2f" dependencies = [ "async-trait", "base64 0.22.1", @@ -4559,12 +4582,13 @@ dependencies = [ "zenoh-link-commons", "zenoh-protocol", "zenoh-result", + "zenoh-util", ] [[package]] name = "zenoh-link-tcp" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#cc201aa1f2c0e9ec780bb6e55fdcc750434a9b2f" dependencies = [ "async-trait", "socket2 0.5.7", @@ -4581,7 +4605,7 @@ dependencies = [ [[package]] name = "zenoh-link-tls" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#cc201aa1f2c0e9ec780bb6e55fdcc750434a9b2f" dependencies = [ "async-trait", "base64 0.22.1", @@ -4610,7 +4634,7 @@ dependencies = [ [[package]] name = "zenoh-link-udp" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#cc201aa1f2c0e9ec780bb6e55fdcc750434a9b2f" dependencies = [ "async-trait", "socket2 0.5.7", @@ -4629,7 +4653,7 @@ dependencies = [ [[package]] name = "zenoh-link-unixsock_stream" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#cc201aa1f2c0e9ec780bb6e55fdcc750434a9b2f" dependencies = [ "async-trait", "nix", @@ -4647,7 +4671,7 @@ dependencies = [ [[package]] name = "zenoh-link-ws" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#cc201aa1f2c0e9ec780bb6e55fdcc750434a9b2f" dependencies = [ "async-trait", "futures-util", @@ -4667,7 +4691,7 @@ dependencies = [ [[package]] name = "zenoh-macros" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#cc201aa1f2c0e9ec780bb6e55fdcc750434a9b2f" dependencies = [ "proc-macro2", "quote", @@ -4703,7 +4727,7 @@ dependencies = [ [[package]] name = "zenoh-plugin-rest" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#cc201aa1f2c0e9ec780bb6e55fdcc750434a9b2f" dependencies = [ "anyhow", "async-std", @@ -4728,7 +4752,7 @@ dependencies = [ [[package]] name = "zenoh-plugin-trait" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#cc201aa1f2c0e9ec780bb6e55fdcc750434a9b2f" dependencies = [ "git-version", "libloading", @@ -4744,7 +4768,7 @@ dependencies = [ [[package]] name = "zenoh-protocol" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#cc201aa1f2c0e9ec780bb6e55fdcc750434a9b2f" dependencies = [ "const_format", "rand 0.8.5", @@ -4758,7 +4782,7 @@ dependencies = [ [[package]] name = "zenoh-result" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#cc201aa1f2c0e9ec780bb6e55fdcc750434a9b2f" dependencies = [ "anyhow", ] @@ -4766,7 +4790,7 @@ dependencies = [ [[package]] name = "zenoh-runtime" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#cc201aa1f2c0e9ec780bb6e55fdcc750434a9b2f" dependencies = [ "lazy_static", "ron", @@ -4779,7 +4803,7 @@ dependencies = [ [[package]] name = "zenoh-sync" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#cc201aa1f2c0e9ec780bb6e55fdcc750434a9b2f" dependencies = [ "event-listener 5.3.1", "futures", @@ -4792,7 +4816,7 @@ dependencies = [ [[package]] name = "zenoh-task" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#cc201aa1f2c0e9ec780bb6e55fdcc750434a9b2f" dependencies = [ "futures", "tokio", @@ -4805,7 +4829,7 @@ dependencies = [ [[package]] name = "zenoh-transport" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#cc201aa1f2c0e9ec780bb6e55fdcc750434a9b2f" dependencies = [ "async-trait", "crossbeam-utils", @@ -4838,7 +4862,7 @@ dependencies = [ [[package]] name = "zenoh-util" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#fb2d2bc2865beeb49a49337fcfe12654cd013ffc" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#cc201aa1f2c0e9ec780bb6e55fdcc750434a9b2f" dependencies = [ "async-trait", "const_format", diff --git a/zenoh-plugin-dds/src/lib.rs b/zenoh-plugin-dds/src/lib.rs index e39cf55..36570c8 100644 --- a/zenoh-plugin-dds/src/lib.rs +++ b/zenoh-plugin-dds/src/lib.rs @@ -11,6 +11,7 @@ // Contributors: // ZettaScale Zenoh Team, // +#![allow(deprecated)] use std::{ collections::HashMap, env,