compilation errors fixed

eclipse-zenoh · Nov 30, 2023 · fc53c38 · fc53c38
1 parent 297b202
commit fc53c38
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 11 deletions.
diff --git a/plugins/example-plugin/Cargo.toml b/plugins/example-plugin/Cargo.toml
@@ -39,7 +39,7 @@ env_logger = { workspace = true }
 futures = { workspace = true }
 log = { workspace = true }
 serde_json = { workspace = true }
-zenoh = { workspace = true, features = [ "unstable" ] }
+zenoh = { workspace = true }
 zenoh-core = { workspace = true }
 zenoh-plugin-trait = { workspace = true }
 zenoh-result = { workspace = true }

diff --git a/zenoh/Cargo.toml b/zenoh/Cargo.toml
@@ -66,8 +66,8 @@ default = [
 async-global-executor = { workspace = true }
 async-std = { workspace = true, features = ["attributes"] }
 async-trait = { workspace = true }
-const_format = { workspace = true }
 base64 = { workspace = true }
+const_format = { workspace = true }
 env_logger = { workspace = true }
 event-listener = { workspace = true }
 flume = { workspace = true }

diff --git a/zenoh/build.rs b/zenoh/build.rs
@@ -10,7 +10,6 @@
 // Contributors:
 //   ZettaScale Zenoh Team, <[email protected]>
 //
-
 fn main() {
     // Add rustc version to zenohd
     let version_meta = rustc_version::version_meta().unwrap();

diff --git a/zenoh/src/net/routing/face.rs b/zenoh/src/net/routing/face.rs
@@ -31,6 +31,7 @@ pub struct FaceState {
     pub(super) id: usize,
     pub(super) zid: ZenohId,
     pub(super) whatami: WhatAmI,
+    #[allow(dead_code)]
     pub(super) local: bool,
     #[cfg(feature = "stats")]
     pub(super) stats: Option<Arc<TransportStats>>,
@@ -80,6 +81,7 @@ impl FaceState {
         })
     }
 
+    #[cfg(feature = "unstable")]
     #[inline]
     pub fn is_local(&self) -> bool {
         self.local

diff --git a/zenoh/src/net/routing/resource.rs b/zenoh/src/net/routing/resource.rs
@@ -363,7 +363,7 @@ impl Resource {
         }
     }
 
-    #[allow(dead_code)]
+    #[cfg(test)]
     pub fn print_tree(from: &Arc<Resource>) -> String {
         let mut result = from.expr();
         result.push('\n');

diff --git a/zenoh/src/net/routing/router.rs b/zenoh/src/net/routing/router.rs
@@ -142,7 +142,7 @@ impl Tables {
         &self.root_res
     }
 
-    #[allow(dead_code)]
+    #[cfg(test)]
     pub fn print(&self) -> String {
         Resource::print_tree(&self.root_res)
     }

diff --git a/zenoh/src/plugins/sealed.rs b/zenoh/src/plugins/sealed.rs
@@ -19,12 +19,7 @@ pub use crate::runtime::Runtime;
 pub use crate::Result as ZResult;
 use zenoh_core::zconfigurable;
 
-use zenoh_plugin_trait::Plugin;
-use zenoh_plugin_trait::PluginControl;
-use zenoh_plugin_trait::PluginInstance;
-use zenoh_plugin_trait::PluginReport;
-use zenoh_plugin_trait::PluginStatusRec;
-use zenoh_plugin_trait::PluginStructVersion;
+use zenoh_plugin_trait::{Plugin, PluginControl, PluginInstance, PluginReport, PluginStatusRec, PluginStructVersion};
 use zenoh_protocol::core::key_expr::keyexpr;
 
 zconfigurable! {