Fix config rexport (#1436)

* Fix config rexport * Remove unstable_config rexports * Rename unstable_config features to internal_config
eclipse-zenoh · Sep 18, 2024 · 91d823d · 91d823d
1 parent adc50a9
commit 91d823d
Show file tree

Hide file tree

Showing 14 changed files with 29 additions and 19 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/commons/zenoh-macros/src/lib.rs b/commons/zenoh-macros/src/lib.rs
@@ -183,7 +183,7 @@ pub fn unstable(attr: TokenStream, tokens: TokenStream) -> TokenStream {
 
 // FIXME(fuzzypixelz): refactor `unstable` macro to accept arguments
 #[proc_macro_attribute]
-pub fn unstable_config(args: TokenStream, tokens: TokenStream) -> TokenStream {
+pub fn internal_config(args: TokenStream, tokens: TokenStream) -> TokenStream {
     let tokens = unstable_doc(args, tokens);
     let mut item = match parse_annotable_item!(tokens) {
         Ok(item) => item,
@@ -195,7 +195,7 @@ pub fn unstable_config(args: TokenStream, tokens: TokenStream) -> TokenStream {
         Err(err) => return err.into_compile_error().into(),
     };
 
-    let feature_gate: Attribute = parse_quote!(#[cfg(feature = "unstable_config")]);
+    let feature_gate: Attribute = parse_quote!(#[cfg(feature = "internal_config")]);
     attrs.push(feature_gate);
 
     TokenStream::from(item.to_token_stream())

diff --git a/zenoh/Cargo.toml b/zenoh/Cargo.toml
@@ -64,8 +64,8 @@ transport_udp = ["zenoh-transport/transport_udp"]
 transport_unixsock-stream = ["zenoh-transport/transport_unixsock-stream"]
 transport_ws = ["zenoh-transport/transport_ws"]
 transport_vsock = ["zenoh-transport/transport_vsock"]
-unstable = ["unstable_config", "zenoh-keyexpr/unstable"]
-unstable_config = []
+unstable = ["internal_config", "zenoh-keyexpr/unstable"]
+internal_config = []
 
 [dependencies]
 tokio = { workspace = true, features = ["rt", "macros", "time"] }

diff --git a/zenoh/src/api/config.rs b/zenoh/src/api/config.rs
@@ -91,7 +91,7 @@ impl Config {
     }
 }
 
-#[zenoh_macros::unstable_config]
+#[zenoh_macros::internal_config]
 impl std::ops::Deref for Config {
     type Target = zenoh_config::Config;
 
@@ -100,7 +100,7 @@ impl std::ops::Deref for Config {
     }
 }
 
-#[zenoh_macros::unstable_config]
+#[zenoh_macros::internal_config]
 impl std::ops::DerefMut for Config {
     fn deref_mut(&mut self) -> &mut <Self as std::ops::Deref>::Target {
         &mut self.0

diff --git a/zenoh/src/lib.rs b/zenoh/src/lib.rs
@@ -353,7 +353,7 @@ pub mod time {
 
 /// Configuration to pass to [`open`] and [`scout`] functions and associated constants
 pub mod config {
-    pub use zenoh_config::{WhatAmI, WhatAmIMatcher};
+    pub use zenoh_config::{EndPoint, Locator, WhatAmI, WhatAmIMatcher, ZenohId};
 
     pub use crate::api::config::Config;
     #[zenoh_macros::unstable]

diff --git a/zenoh/tests/acl.rs b/zenoh/tests/acl.rs
@@ -12,7 +12,7 @@
 //   ZettaScale Zenoh Team, <[email protected]>
 //
 
-#![cfg(feature = "unstable_config")]
+#![cfg(feature = "internal_config")]
 #![cfg(target_family = "unix")]
 mod test {
     use std::{

diff --git a/zenoh/tests/authentication.rs b/zenoh/tests/authentication.rs
@@ -12,7 +12,7 @@
 //   ZettaScale Zenoh Team, <[email protected]>
 //
 
-#![cfg(feature = "unstable_config")]
+#![cfg(feature = "internal_config")]
 
 mod test {
     use std::{

diff --git a/zenoh/tests/connection_retry.rs b/zenoh/tests/connection_retry.rs
@@ -12,7 +12,7 @@
 //   ZettaScale Zenoh Team, <[email protected]>
 //
 
-#![cfg(feature = "unstable_config")]
+#![cfg(feature = "internal_config")]
 
 use zenoh::{Config, Wait};
 use zenoh_config::{ConnectionRetryConf, EndPoint, ModeDependent};

diff --git a/zenoh/tests/events.rs b/zenoh/tests/events.rs
@@ -12,7 +12,7 @@
 //   ZettaScale Zenoh Team, <[email protected]>
 //
 
-#![cfg(feature = "unstable_config")]
+#![cfg(feature = "internal_config")]
 
 use std::time::Duration;
 

diff --git a/zenoh/tests/interceptors.rs b/zenoh/tests/interceptors.rs
@@ -12,7 +12,7 @@
 //   ZettaScale Zenoh Team, <[email protected]>
 //
 
-#![cfg(feature = "unstable_config")]
+#![cfg(feature = "internal_config")]
 #![cfg(unix)]
 
 use std::{

diff --git a/zenoh/tests/open_time.rs b/zenoh/tests/open_time.rs
@@ -12,7 +12,7 @@
 //   ZettaScale Zenoh Team, <[email protected]>
 //
 
-#![cfg(feature = "unstable_config")]
+#![cfg(feature = "internal_config")]
 #![allow(unused)]
 use std::{
     future::IntoFuture,

diff --git a/zenoh/tests/routing.rs b/zenoh/tests/routing.rs
@@ -12,7 +12,7 @@
 //   ZettaScale Zenoh Team, <[email protected]>
 //
 
-#![cfg(feature = "unstable_config")]
+#![cfg(feature = "internal_config")]
 
 use std::{
     sync::{

diff --git a/zenoh/tests/session.rs b/zenoh/tests/session.rs
@@ -12,7 +12,7 @@
 //   ZettaScale Zenoh Team, <[email protected]>
 //
 
-#![cfg(feature = "unstable_config")]
+#![cfg(feature = "internal_config")]
 
 use std::{
     sync::{

diff --git a/zenoh/tests/unicity.rs b/zenoh/tests/unicity.rs
@@ -12,7 +12,7 @@
 //   ZettaScale Zenoh Team, <[email protected]>
 //
 
-#![cfg(feature = "unstable_config")]
+#![cfg(feature = "internal_config")]
 
 use std::{
     sync::{