tests added, leaking through zenoh-ext fixed

eclipse-zenoh · Nov 27, 2023 · e77acb8 · e77acb8
1 parent d5c95f9
commit e77acb8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -185,7 +185,7 @@ zenoh-link-unixpipe = { version = "0.11.0-dev", path = "io/zenoh-links/zenoh-lin
 zenoh-link-serial = { version = "0.11.0-dev", path = "io/zenoh-links/zenoh-link-serial" }
 zenoh-link = { version = "0.11.0-dev", path = "io/zenoh-link" }
 zenoh-link-commons = { version = "0.11.0-dev", path = "io/zenoh-link-commons" }
-zenoh = { version = "0.11.0-dev", path = "zenoh" }
+zenoh = { version = "0.11.0-dev", path = "zenoh", default-features = false }
 
 [profile.dev]
 debug = true

diff --git a/zenoh-ext/Cargo.toml b/zenoh-ext/Cargo.toml
@@ -38,7 +38,7 @@ flume = { workspace = true }
 futures = { workspace = true }
 log = { workspace = true }
 serde = { workspace = true, features = ["default"] }
-zenoh = { workspace = true, features = ["unstable"] }
+zenoh = { workspace = true, features = ["unstable"], default-features = false }
 zenoh-core = { workspace = true }
 zenoh-macros = { workspace = true }
 zenoh-result = { workspace = true }

diff --git a/zenoh-ext/src/lib.rs b/zenoh-ext/src/lib.rs
@@ -51,3 +51,11 @@ impl From<LivelinessSpace> for KeySpace {
         KeySpace::Liveliness
     }
 }
+
+#[test]
+fn test_default_features() {
+    // make sure that when inporting zenoh-ext with default features, no unwanted features are pulled from zenoh-core
+    assert_eq!(zenoh::FEATURES, concat!(
+        " zenoh/unstable",
+    ));      
+}
diff --git a/zenohd/Cargo.toml b/zenohd/Cargo.toml
@@ -37,7 +37,7 @@ git-version = { workspace = true }
 json5 = { workspace = true }
 lazy_static = { workspace = true }
 log = { workspace = true }
-zenoh = { workspace = true, features = ["unstable"] }
+zenoh = { workspace = true, default-features = true, features = ["unstable"] }
 
 [dev-dependencies]
 rand = { workspace = true, features = ["default"] }