diff --git a/examples/examples/z_info.rs b/examples/examples/z_info.rs index 9d3f1bb223..d2e4bfdbc0 100644 --- a/examples/examples/z_info.rs +++ b/examples/examples/z_info.rs @@ -12,7 +12,7 @@ // ZettaScale Zenoh Team, // use clap::Parser; -use zenoh::{config::ZenohId, prelude::*}; +use zenoh::{info::ZenohId, prelude::*}; use zenoh_examples::CommonArgs; #[tokio::main] diff --git a/plugins/zenoh-plugin-storage-manager/src/replica/snapshotter.rs b/plugins/zenoh-plugin-storage-manager/src/replica/snapshotter.rs index bfabe92cd3..c5b2573335 100644 --- a/plugins/zenoh-plugin-storage-manager/src/replica/snapshotter.rs +++ b/plugins/zenoh-plugin-storage-manager/src/replica/snapshotter.rs @@ -24,7 +24,7 @@ use async_std::{ }; use flume::Receiver; use futures::join; -use zenoh::{config::ZenohId, key_expr::OwnedKeyExpr, time::Timestamp}; +use zenoh::{info::ZenohId, key_expr::OwnedKeyExpr, time::Timestamp}; use zenoh_backend_traits::config::ReplicaConfig; use super::{Digest, DigestConfig, LogEntry}; diff --git a/zenoh/src/api/session.rs b/zenoh/src/api/session.rs index b100a27d84..fbbcd3a867 100644 --- a/zenoh/src/api/session.rs +++ b/zenoh/src/api/session.rs @@ -2657,7 +2657,7 @@ impl crate::net::primitives::EPrimitives for Session { /// # #[tokio::main] /// # async fn main() { /// use std::str::FromStr; -/// use zenoh::{config::ZenohId, prelude::*}; +/// use zenoh::{info::ZenohId, prelude::*}; /// /// let mut config = zenoh::config::peer(); /// config.set_id(ZenohId::from_str("221b72df20924c15b8794c6bdb471150").unwrap()); diff --git a/zenoh/src/lib.rs b/zenoh/src/lib.rs index 78895b067a..46ba83c003 100644 --- a/zenoh/src/lib.rs +++ b/zenoh/src/lib.rs @@ -207,6 +207,7 @@ pub mod session { /// Tools to access information about the current zenoh [`Session`](crate::Session). pub mod info { + pub use zenoh_protocol::core::ZenohId; pub use zenoh_protocol::core::EntityGlobalId; pub use zenoh_protocol::core::EntityId; pub use crate::api::info::{ @@ -348,7 +349,6 @@ pub mod time { /// Configuration to pass to [`open`](crate::session::open) and [`scout`](crate::scouting::scout) functions and associated constants pub mod config { - pub use zenoh_protocol::core::ZenohId; // pub use zenoh_config::{ // client, default, peer, Config, EndPoint, Locator, ModeDependentValue, PermissionsConf, // PluginLoad, ValidatedMap, ZenohId,