From 92bedf1d5b6d611206c9ff914448af157b7f4c31 Mon Sep 17 00:00:00 2001 From: Luca Cominardi Date: Thu, 19 Sep 2024 17:20:55 +0200 Subject: [PATCH 1/2] Align Rust with Reliability exported in zenoh::qos --- zenoh-plugin-ros1/src/ros_to_zenoh_bridge/aloha_declaration.rs | 3 +-- zenoh-plugin-ros1/src/ros_to_zenoh_bridge/zenoh_client.rs | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/zenoh-plugin-ros1/src/ros_to_zenoh_bridge/aloha_declaration.rs b/zenoh-plugin-ros1/src/ros_to_zenoh_bridge/aloha_declaration.rs index b2bfc7b..05a7913 100644 --- a/zenoh-plugin-ros1/src/ros_to_zenoh_bridge/aloha_declaration.rs +++ b/zenoh-plugin-ros1/src/ros_to_zenoh_bridge/aloha_declaration.rs @@ -23,8 +23,7 @@ use std::{ use zenoh::{ internal::buffers::ZBuf, key_expr::OwnedKeyExpr, - pubsub::Reliability, - qos::{CongestionControl, Priority}, + qos::{CongestionControl, Priority, Reliability}, sample::Locality, Session, }; diff --git a/zenoh-plugin-ros1/src/ros_to_zenoh_bridge/zenoh_client.rs b/zenoh-plugin-ros1/src/ros_to_zenoh_bridge/zenoh_client.rs index 386715e..3890be9 100644 --- a/zenoh-plugin-ros1/src/ros_to_zenoh_bridge/zenoh_client.rs +++ b/zenoh-plugin-ros1/src/ros_to_zenoh_bridge/zenoh_client.rs @@ -17,8 +17,7 @@ use std::fmt::Display; use tracing::debug; use zenoh::{ key_expr::KeyExpr, - pubsub::Reliability, - qos::CongestionControl, + qos::{CongestionControl, Reliability}, query::Selector, sample::{Locality, Sample}, Result as ZResult, Session, From 930494f6f37984e1c98744ff0cb26f25bf416efd Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Thu, 19 Sep 2024 17:33:06 +0200 Subject: [PATCH 2/2] `cargo update zenoh` --- Cargo.lock | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 779dce3..67ac7ad 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5044,7 +5044,7 @@ dependencies = [ [[package]] name = "zenoh" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#db755e3e75733b10cd9b9fa63acb624fd4e57a39" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7599ef3ef184d19f1d297f48cb2099de9866ffb" dependencies = [ "ahash", "async-trait", @@ -5110,7 +5110,7 @@ dependencies = [ [[package]] name = "zenoh-buffers" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#db755e3e75733b10cd9b9fa63acb624fd4e57a39" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7599ef3ef184d19f1d297f48cb2099de9866ffb" dependencies = [ "zenoh-collections", ] @@ -5118,7 +5118,7 @@ dependencies = [ [[package]] name = "zenoh-codec" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#db755e3e75733b10cd9b9fa63acb624fd4e57a39" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7599ef3ef184d19f1d297f48cb2099de9866ffb" dependencies = [ "tracing", "uhlc", @@ -5129,12 +5129,12 @@ dependencies = [ [[package]] name = "zenoh-collections" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#db755e3e75733b10cd9b9fa63acb624fd4e57a39" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7599ef3ef184d19f1d297f48cb2099de9866ffb" [[package]] name = "zenoh-config" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#db755e3e75733b10cd9b9fa63acb624fd4e57a39" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7599ef3ef184d19f1d297f48cb2099de9866ffb" dependencies = [ "json5", "num_cpus", @@ -5155,7 +5155,7 @@ dependencies = [ [[package]] name = "zenoh-core" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#db755e3e75733b10cd9b9fa63acb624fd4e57a39" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7599ef3ef184d19f1d297f48cb2099de9866ffb" dependencies = [ "lazy_static", "tokio", @@ -5166,7 +5166,7 @@ dependencies = [ [[package]] name = "zenoh-crypto" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#db755e3e75733b10cd9b9fa63acb624fd4e57a39" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7599ef3ef184d19f1d297f48cb2099de9866ffb" dependencies = [ "aes 0.8.4", "hmac 0.12.1", @@ -5179,7 +5179,7 @@ dependencies = [ [[package]] name = "zenoh-keyexpr" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#db755e3e75733b10cd9b9fa63acb624fd4e57a39" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7599ef3ef184d19f1d297f48cb2099de9866ffb" dependencies = [ "hashbrown 0.14.5", "keyed-set", @@ -5193,7 +5193,7 @@ dependencies = [ [[package]] name = "zenoh-link" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#db755e3e75733b10cd9b9fa63acb624fd4e57a39" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7599ef3ef184d19f1d297f48cb2099de9866ffb" dependencies = [ "zenoh-config", "zenoh-link-commons", @@ -5210,7 +5210,7 @@ dependencies = [ [[package]] name = "zenoh-link-commons" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#db755e3e75733b10cd9b9fa63acb624fd4e57a39" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7599ef3ef184d19f1d297f48cb2099de9866ffb" dependencies = [ "async-trait", "flume", @@ -5233,7 +5233,7 @@ dependencies = [ [[package]] name = "zenoh-link-quic" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#db755e3e75733b10cd9b9fa63acb624fd4e57a39" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7599ef3ef184d19f1d297f48cb2099de9866ffb" dependencies = [ "async-trait", "base64 0.22.1", @@ -5258,7 +5258,7 @@ dependencies = [ [[package]] name = "zenoh-link-tcp" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#db755e3e75733b10cd9b9fa63acb624fd4e57a39" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7599ef3ef184d19f1d297f48cb2099de9866ffb" dependencies = [ "async-trait", "socket2 0.5.7", @@ -5275,7 +5275,7 @@ dependencies = [ [[package]] name = "zenoh-link-tls" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#db755e3e75733b10cd9b9fa63acb624fd4e57a39" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7599ef3ef184d19f1d297f48cb2099de9866ffb" dependencies = [ "async-trait", "base64 0.22.1", @@ -5302,7 +5302,7 @@ dependencies = [ [[package]] name = "zenoh-link-udp" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#db755e3e75733b10cd9b9fa63acb624fd4e57a39" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7599ef3ef184d19f1d297f48cb2099de9866ffb" dependencies = [ "async-trait", "socket2 0.5.7", @@ -5321,7 +5321,7 @@ dependencies = [ [[package]] name = "zenoh-link-unixsock_stream" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#db755e3e75733b10cd9b9fa63acb624fd4e57a39" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7599ef3ef184d19f1d297f48cb2099de9866ffb" dependencies = [ "async-trait", "nix", @@ -5339,7 +5339,7 @@ dependencies = [ [[package]] name = "zenoh-link-ws" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#db755e3e75733b10cd9b9fa63acb624fd4e57a39" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7599ef3ef184d19f1d297f48cb2099de9866ffb" dependencies = [ "async-trait", "futures-util", @@ -5359,7 +5359,7 @@ dependencies = [ [[package]] name = "zenoh-macros" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#db755e3e75733b10cd9b9fa63acb624fd4e57a39" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7599ef3ef184d19f1d297f48cb2099de9866ffb" dependencies = [ "proc-macro2", "quote", @@ -5370,7 +5370,7 @@ dependencies = [ [[package]] name = "zenoh-plugin-rest" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#db755e3e75733b10cd9b9fa63acb624fd4e57a39" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7599ef3ef184d19f1d297f48cb2099de9866ffb" dependencies = [ "anyhow", "base64 0.22.1", @@ -5426,7 +5426,7 @@ dependencies = [ [[package]] name = "zenoh-plugin-trait" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#db755e3e75733b10cd9b9fa63acb624fd4e57a39" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7599ef3ef184d19f1d297f48cb2099de9866ffb" dependencies = [ "git-version", "libloading", @@ -5442,7 +5442,7 @@ dependencies = [ [[package]] name = "zenoh-protocol" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#db755e3e75733b10cd9b9fa63acb624fd4e57a39" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7599ef3ef184d19f1d297f48cb2099de9866ffb" dependencies = [ "const_format", "rand 0.8.5", @@ -5456,7 +5456,7 @@ dependencies = [ [[package]] name = "zenoh-result" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#db755e3e75733b10cd9b9fa63acb624fd4e57a39" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7599ef3ef184d19f1d297f48cb2099de9866ffb" dependencies = [ "anyhow", ] @@ -5464,7 +5464,7 @@ dependencies = [ [[package]] name = "zenoh-runtime" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#db755e3e75733b10cd9b9fa63acb624fd4e57a39" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7599ef3ef184d19f1d297f48cb2099de9866ffb" dependencies = [ "lazy_static", "ron", @@ -5477,7 +5477,7 @@ dependencies = [ [[package]] name = "zenoh-sync" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#db755e3e75733b10cd9b9fa63acb624fd4e57a39" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7599ef3ef184d19f1d297f48cb2099de9866ffb" dependencies = [ "event-listener 5.3.1", "futures 0.3.30", @@ -5490,7 +5490,7 @@ dependencies = [ [[package]] name = "zenoh-task" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#db755e3e75733b10cd9b9fa63acb624fd4e57a39" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7599ef3ef184d19f1d297f48cb2099de9866ffb" dependencies = [ "futures 0.3.30", "tokio", @@ -5503,7 +5503,7 @@ dependencies = [ [[package]] name = "zenoh-transport" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#db755e3e75733b10cd9b9fa63acb624fd4e57a39" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7599ef3ef184d19f1d297f48cb2099de9866ffb" dependencies = [ "async-trait", "crossbeam-utils", @@ -5536,7 +5536,7 @@ dependencies = [ [[package]] name = "zenoh-util" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#db755e3e75733b10cd9b9fa63acb624fd4e57a39" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7599ef3ef184d19f1d297f48cb2099de9866ffb" dependencies = [ "async-trait", "const_format",