Config in mod config

eclipse-zenoh · Oct 7, 2024 · 07844f5 · 07844f5
1 parent cab7352
commit 07844f5
Show file tree

Hide file tree

Showing 39 changed files with 244 additions and 226 deletions.
diff --git a/examples/examples/z_delete.rs b/examples/examples/z_delete.rs
@@ -12,7 +12,7 @@
 //   ZettaScale Zenoh Team, <[email protected]>
 //
 use clap::Parser;
-use zenoh::{key_expr::KeyExpr, Config};
+use zenoh::{config::Config, key_expr::KeyExpr};
 use zenoh_examples::CommonArgs;
 
 #[tokio::main]

diff --git a/examples/examples/z_forward.rs b/examples/examples/z_forward.rs
@@ -12,7 +12,7 @@
 //   ZettaScale Zenoh Team, <[email protected]>
 //
 use clap::Parser;
-use zenoh::{key_expr::KeyExpr, Config};
+use zenoh::{config::Config, key_expr::KeyExpr};
 use zenoh_examples::CommonArgs;
 use zenoh_ext::SubscriberForward;
 

diff --git a/examples/examples/z_get.rs b/examples/examples/z_get.rs
@@ -15,8 +15,8 @@ use std::time::Duration;
 
 use clap::Parser;
 use zenoh::{
+    config::Config,
     query::{QueryTarget, Selector},
-    Config,
 };
 use zenoh_examples::CommonArgs;
 

diff --git a/examples/examples/z_info.rs b/examples/examples/z_info.rs
@@ -43,7 +43,7 @@ struct Args {
     common: CommonArgs,
 }
 
-fn parse_args() -> zenoh::Config {
+fn parse_args() -> zenoh::config::Config {
     let args = Args::parse();
     args.common.into()
 }
diff --git a/examples/examples/z_ping.rs b/examples/examples/z_ping.rs
@@ -14,7 +14,7 @@
 use std::time::{Duration, Instant};
 
 use clap::Parser;
-use zenoh::{bytes::ZBytes, key_expr::keyexpr, qos::CongestionControl, Config, Wait};
+use zenoh::{bytes::ZBytes, config::Config, key_expr::keyexpr, qos::CongestionControl, Wait};
 use zenoh_examples::CommonArgs;
 
 fn main() {

diff --git a/examples/examples/z_pong.rs b/examples/examples/z_pong.rs
@@ -12,7 +12,7 @@
 //   ZettaScale Zenoh Team, <[email protected]>
 //
 use clap::Parser;
-use zenoh::{key_expr::keyexpr, qos::CongestionControl, Config, Wait};
+use zenoh::{config::Config, key_expr::keyexpr, qos::CongestionControl, Wait};
 use zenoh_examples::CommonArgs;
 
 fn main() {

diff --git a/examples/examples/z_pub.rs b/examples/examples/z_pub.rs
@@ -14,7 +14,7 @@
 use std::time::Duration;
 
 use clap::Parser;
-use zenoh::{bytes::Encoding, key_expr::KeyExpr, Config};
+use zenoh::{bytes::Encoding, config::Config, key_expr::KeyExpr};
 use zenoh_examples::CommonArgs;
 
 #[tokio::main]

diff --git a/examples/examples/z_pull.rs b/examples/examples/z_pull.rs
@@ -14,7 +14,7 @@
 use std::time::Duration;
 
 use clap::Parser;
-use zenoh::{handlers::RingChannel, key_expr::KeyExpr, Config};
+use zenoh::{config::Config, handlers::RingChannel, key_expr::KeyExpr};
 use zenoh_examples::CommonArgs;
 
 #[tokio::main]

diff --git a/examples/examples/z_put.rs b/examples/examples/z_put.rs
@@ -12,7 +12,7 @@
 //   ZettaScale Zenoh Team, <[email protected]>
 //
 use clap::Parser;
-use zenoh::{key_expr::KeyExpr, Config};
+use zenoh::{config::Config, key_expr::KeyExpr};
 use zenoh_examples::CommonArgs;
 
 #[tokio::main]

diff --git a/examples/examples/z_put_float.rs b/examples/examples/z_put_float.rs
@@ -12,7 +12,7 @@
 //   ZettaScale Zenoh Team, <[email protected]>
 //
 use clap::Parser;
-use zenoh::{key_expr::KeyExpr, Config};
+use zenoh::{config::Config, key_expr::KeyExpr};
 use zenoh_examples::CommonArgs;
 use zenoh_ext::z_serialize;
 

diff --git a/examples/examples/z_queryable.rs b/examples/examples/z_queryable.rs
@@ -12,7 +12,7 @@
 //   ZettaScale Zenoh Team, <[email protected]>
 //
 use clap::Parser;
-use zenoh::{key_expr::KeyExpr, Config};
+use zenoh::{config::Config, key_expr::KeyExpr};
 use zenoh_examples::CommonArgs;
 
 #[tokio::main]

diff --git a/examples/examples/z_scout.rs b/examples/examples/z_scout.rs
@@ -11,7 +11,10 @@
 // Contributors:
 //   ZettaScale Zenoh Team, <[email protected]>
 //
-use zenoh::{config::WhatAmI, scout, Config};
+use zenoh::{
+    config::{Config, WhatAmI},
+    scout,
+};
 
 #[tokio::main]
 async fn main() {

diff --git a/examples/examples/z_storage.rs b/examples/examples/z_storage.rs
@@ -18,9 +18,9 @@ use std::collections::HashMap;
 use clap::Parser;
 use futures::select;
 use zenoh::{
+    config::Config,
     key_expr::{keyexpr, KeyExpr},
     sample::{Sample, SampleKind},
-    Config,
 };
 use zenoh_examples::CommonArgs;
 

diff --git a/examples/examples/z_sub.rs b/examples/examples/z_sub.rs
@@ -12,7 +12,7 @@
 //   ZettaScale Zenoh Team, <[email protected]>
 //
 use clap::Parser;
-use zenoh::{key_expr::KeyExpr, Config};
+use zenoh::{config::Config, key_expr::KeyExpr};
 use zenoh_examples::CommonArgs;
 
 #[tokio::main]

diff --git a/examples/examples/z_sub_thr.rs b/examples/examples/z_sub_thr.rs
@@ -14,7 +14,7 @@
 use std::time::Instant;
 
 use clap::Parser;
-use zenoh::{Config, Wait};
+use zenoh::{config::Config, Wait};
 use zenoh_examples::CommonArgs;
 
 struct Stats {

diff --git a/examples/src/lib.rs b/examples/src/lib.rs
@@ -3,7 +3,7 @@
 //! Check ../README.md for usage.
 //!
 
-use zenoh::{config::WhatAmI, Config};
+use zenoh::config::{Config, WhatAmI};
 
 #[derive(clap::ValueEnum, Clone, Copy, PartialEq, Eq, Hash, Debug)]
 pub enum Wai {

diff --git a/plugins/zenoh-plugin-storage-manager/tests/operations.rs b/plugins/zenoh-plugin-storage-manager/tests/operations.rs
@@ -20,7 +20,8 @@ use std::{str::FromStr, thread::sleep};
 
 use tokio::runtime::Runtime;
 use zenoh::{
-    internal::zasync_executor_init, query::Reply, sample::Sample, time::Timestamp, Config, Session,
+    config::Config, internal::zasync_executor_init, query::Reply, sample::Sample, time::Timestamp,
+    Session,
 };
 use zenoh_plugin_trait::Plugin;
 

diff --git a/plugins/zenoh-plugin-storage-manager/tests/wildcard.rs b/plugins/zenoh-plugin-storage-manager/tests/wildcard.rs
@@ -21,7 +21,8 @@ use std::{str::FromStr, thread::sleep};
 // use std::collections::HashMap;
 use tokio::runtime::Runtime;
 use zenoh::{
-    internal::zasync_executor_init, query::Reply, sample::Sample, time::Timestamp, Config, Session,
+    config::Config, internal::zasync_executor_init, query::Reply, sample::Sample, time::Timestamp,
+    Session,
 };
 use zenoh_plugin_trait::Plugin;
 

diff --git a/zenoh-ext/examples/examples/z_member.rs b/zenoh-ext/examples/examples/z_member.rs
@@ -14,7 +14,7 @@
 use std::{sync::Arc, time::Duration};
 
 use futures::StreamExt;
-use zenoh::Config;
+use zenoh::config::Config;
 use zenoh_ext::group::*;
 
 #[tokio::main]

diff --git a/zenoh-ext/examples/src/lib.rs b/zenoh-ext/examples/src/lib.rs
@@ -2,7 +2,7 @@
 //! See the code in ../examples/
 //! Check ../README.md for usage.
 //!
-use zenoh::{config::WhatAmI, Config};
+use zenoh::config::{Config, WhatAmI};
 
 #[derive(clap::ValueEnum, Clone, Copy, PartialEq, Eq, Hash, Debug)]
 pub enum Wai {

diff --git a/zenoh-ext/tests/liveliness.rs b/zenoh-ext/tests/liveliness.rs
@@ -36,7 +36,7 @@ async fn test_liveliness_querying_subscriber_clique() {
     zenoh_util::init_log_from_env_or("error");
 
     let peer1 = {
-        let mut c = zenoh::Config::default();
+        let mut c = zenoh::config::default();
         c.listen
             .endpoints
             .set(vec![PEER1_ENDPOINT.parse::<EndPoint>().unwrap()])
@@ -49,7 +49,7 @@ async fn test_liveliness_querying_subscriber_clique() {
     };
 
     let peer2 = {
-        let mut c = zenoh::Config::default();
+        let mut c = zenoh::config::default();
         c.connect
             .endpoints
             .set(vec![PEER1_ENDPOINT.parse::<EndPoint>().unwrap()])
@@ -114,7 +114,7 @@ async fn test_liveliness_querying_subscriber_brokered() {
     zenoh_util::init_log_from_env_or("error");
 
     let router = {
-        let mut c = zenoh::Config::default();
+        let mut c = zenoh::config::default();
         c.listen
             .endpoints
             .set(vec![ROUTER_ENDPOINT.parse::<EndPoint>().unwrap()])
@@ -127,7 +127,7 @@ async fn test_liveliness_querying_subscriber_brokered() {
     };
 
     let client1 = {
-        let mut c = zenoh::Config::default();
+        let mut c = zenoh::config::default();
         c.connect
             .endpoints
             .set(vec![ROUTER_ENDPOINT.parse::<EndPoint>().unwrap()])
@@ -140,7 +140,7 @@ async fn test_liveliness_querying_subscriber_brokered() {
     };
 
     let client2 = {
-        let mut c = zenoh::Config::default();
+        let mut c = zenoh::config::default();
         c.connect
             .endpoints
             .set(vec![ROUTER_ENDPOINT.parse::<EndPoint>().unwrap()])
@@ -153,7 +153,7 @@ async fn test_liveliness_querying_subscriber_brokered() {
     };
 
     let client3 = {
-        let mut c = zenoh::Config::default();
+        let mut c = zenoh::config::default();
         c.connect
             .endpoints
             .set(vec![ROUTER_ENDPOINT.parse::<EndPoint>().unwrap()])
@@ -220,7 +220,7 @@ async fn test_liveliness_fetching_subscriber_clique() {
     zenoh_util::init_log_from_env_or("error");
 
     let peer1 = {
-        let mut c = zenoh::Config::default();
+        let mut c = zenoh::config::default();
         c.listen
             .endpoints
             .set(vec![PEER1_ENDPOINT.parse::<EndPoint>().unwrap()])
@@ -233,7 +233,7 @@ async fn test_liveliness_fetching_subscriber_clique() {
     };
 
     let peer2 = {
-        let mut c = zenoh::Config::default();
+        let mut c = zenoh::config::default();
         c.connect
             .endpoints
             .set(vec![PEER1_ENDPOINT.parse::<EndPoint>().unwrap()])
@@ -302,7 +302,7 @@ async fn test_liveliness_fetching_subscriber_brokered() {
     zenoh_util::init_log_from_env_or("error");
 
     let router = {
-        let mut c = zenoh::Config::default();
+        let mut c = zenoh::config::default();
         c.listen
             .endpoints
             .set(vec![ROUTER_ENDPOINT.parse::<EndPoint>().unwrap()])
@@ -315,7 +315,7 @@ async fn test_liveliness_fetching_subscriber_brokered() {
     };
 
     let client1 = {
-        let mut c = zenoh::Config::default();
+        let mut c = zenoh::config::default();
         c.connect
             .endpoints
             .set(vec![ROUTER_ENDPOINT.parse::<EndPoint>().unwrap()])
@@ -328,7 +328,7 @@ async fn test_liveliness_fetching_subscriber_brokered() {
     };
 
     let client2 = {
-        let mut c = zenoh::Config::default();
+        let mut c = zenoh::config::default();
         c.connect
             .endpoints
             .set(vec![ROUTER_ENDPOINT.parse::<EndPoint>().unwrap()])
@@ -341,7 +341,7 @@ async fn test_liveliness_fetching_subscriber_brokered() {
     };
 
     let client3 = {
-        let mut c = zenoh::Config::default();
+        let mut c = zenoh::config::default();
         c.connect
             .endpoints
             .set(vec![ROUTER_ENDPOINT.parse::<EndPoint>().unwrap()])

diff --git a/zenoh/src/api/publisher.rs b/zenoh/src/api/publisher.rs
@@ -860,7 +860,7 @@ impl<Handler> IntoFuture for MatchingListenerUndeclaration<Handler> {
 
 #[cfg(test)]
 mod tests {
-    use crate::{sample::SampleKind, Config, Wait};
+    use crate::{config::Config, sample::SampleKind, Wait};
 
     #[cfg(feature = "internal")]
     #[test]

diff --git a/zenoh/src/api/scouting.rs b/zenoh/src/api/scouting.rs
@@ -28,8 +28,8 @@ use zenoh_task::TerminatableTask;
 
 use crate::{
     api::handlers::{locked, Callback, DefaultHandler, IntoHandler},
+    config::Config,
     net::runtime::{orchestrator::Loop, Runtime},
-    Config,
 };
 
 /// A builder for initializing a [`Scout`].

diff --git a/zenoh/src/api/session.rs b/zenoh/src/api/session.rs
@@ -101,12 +101,12 @@ use super::{
 #[cfg(feature = "unstable")]
 use crate::api::selector::ZenohParameters;
 use crate::{
+    config::Config,
     net::{
         primitives::Primitives,
         routing::dispatcher::face::Face,
         runtime::{Runtime, RuntimeBuilder},
     },
-    Config,
 };
 
 zconfigurable! {

diff --git a/zenoh/src/lib.rs b/zenoh/src/lib.rs
@@ -119,7 +119,6 @@ pub use zenoh_util::{init_log_from_env_or, try_init_log_from_env};
 
 #[doc(inline)]
 pub use crate::{
-    config::Config,
     scouting::scout,
     session::{open, Session},
 };

diff --git a/zenoh/tests/acl.rs b/zenoh/tests/acl.rs
@@ -21,7 +21,11 @@ mod test {
     };
 
     use tokio::runtime::Handle;
-    use zenoh::{config::WhatAmI, sample::SampleKind, Config, Session};
+    use zenoh::{
+        config::{Config, WhatAmI},
+        sample::SampleKind,
+        Session,
+    };
     use zenoh_config::{EndPoint, ModeDependentValue};
     use zenoh_core::{zlock, ztimeout};
 
@@ -75,7 +79,7 @@ mod test {
 
     async fn get_client_sessions(port: u16) -> (Session, Session) {
         println!("Opening client sessions");
-        let mut config = zenoh::Config::default();
+        let mut config = zenoh::config::default();
         config.set_mode(Some(WhatAmI::Client)).unwrap();
         config
             .connect
@@ -88,7 +92,7 @@ mod test {
 
         let s01 = ztimeout!(zenoh::open(config)).unwrap();
 
-        let mut config = zenoh::Config::default();
+        let mut config = zenoh::config::default();
         config.set_mode(Some(WhatAmI::Client)).unwrap();
         config
             .connect