From 618bed1ff9c2ef17cf73860182b6849b68f06fb2 Mon Sep 17 00:00:00 2001 From: Michael Ilyin Date: Tue, 23 Apr 2024 09:57:24 +0200 Subject: [PATCH] restored zenoh-macro for zenoh-ext --- Cargo.lock | 1 + zenoh-ext/Cargo.toml | 1 + zenoh-ext/src/publication_cache.rs | 2 +- zenoh-ext/src/querying_subscriber.rs | 4 ++-- zenoh/src/lib.rs | 1 - 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4244273f87..737cb62f75 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5249,6 +5249,7 @@ dependencies = [ "tokio", "tracing", "zenoh", + "zenoh-macros", "zenoh-util", ] diff --git a/zenoh-ext/Cargo.toml b/zenoh-ext/Cargo.toml index 61b0bf13df..402d37e5f4 100644 --- a/zenoh-ext/Cargo.toml +++ b/zenoh-ext/Cargo.toml @@ -51,6 +51,7 @@ serde = { workspace = true, features = ["default"] } serde_cbor = { workspace = true } serde_json = { workspace = true } zenoh = { workspace = true, features = ["unstable"], default-features = false } +zenoh-macros = { workspace = true } [package.metadata.docs.rs] features = ["unstable"] diff --git a/zenoh-ext/src/publication_cache.rs b/zenoh-ext/src/publication_cache.rs index b6a380d766..7080b44ac4 100644 --- a/zenoh-ext/src/publication_cache.rs +++ b/zenoh-ext/src/publication_cache.rs @@ -66,7 +66,7 @@ impl<'a, 'b, 'c> PublicationCacheBuilder<'a, 'b, 'c> { /// Restrict the matching queries that will be receive by this [`PublicationCache`]'s queryable /// to the ones that have the given [`Locality`](zenoh::prelude::Locality). - #[zenoh::internal::unstable] + #[zenoh_macros::unstable] #[inline] pub fn queryable_allowed_origin(mut self, origin: Locality) -> Self { self.queryable_origin = Some(origin); diff --git a/zenoh-ext/src/querying_subscriber.rs b/zenoh-ext/src/querying_subscriber.rs index 1bce18a64f..35eb9afe46 100644 --- a/zenoh-ext/src/querying_subscriber.rs +++ b/zenoh-ext/src/querying_subscriber.rs @@ -163,7 +163,7 @@ impl<'a, 'b, Handler> QueryingSubscriberBuilder<'a, 'b, crate::UserSpace, Handle /// Restrict the matching publications that will be receive by this [`Subscriber`] /// to the ones that have the given [`Locality`](zenoh::prelude::Locality). - #[zenoh::internal::unstable] + #[zenoh_macros::unstable] #[inline] pub fn allowed_origin(mut self, origin: Locality) -> Self { self.origin = origin; @@ -523,7 +523,7 @@ where /// Restrict the matching publications that will be receive by this [`FetchingSubscriber`] /// to the ones that have the given [`Locality`](zenoh::prelude::Locality). - #[zenoh::internal::unstable] + #[zenoh_macros::unstable] #[inline] pub fn allowed_origin(mut self, origin: Locality) -> Self { self.origin = origin; diff --git a/zenoh/src/lib.rs b/zenoh/src/lib.rs index bf6675f63b..47c95f2d52 100644 --- a/zenoh/src/lib.rs +++ b/zenoh/src/lib.rs @@ -357,7 +357,6 @@ pub mod internal { pub use zenoh_core::zerror; pub use zenoh_core::zlock; pub use zenoh_core::ztimeout; - pub use zenoh_macros::unstable; pub use zenoh_result::bail; pub use zenoh_sync::Condition; pub use zenoh_task::TaskController;