Merge pull request #1601 from Jezza/jezza/fix

Fix version macro & config deserialisation.

commons/zenoh-config/src/mode_dependent.rs

@@ -189,6 +189,13 @@ impl<'a> serde::Deserialize<'a> for ModeDependentValue<i64> {
                 Ok(ModeDependentValue::Unique(value))
             }
 
+            fn visit_u64<E>(self, value: u64) -> Result<Self::Value, E>
+            where
+                E: de::Error,
+            {
+                Ok(ModeDependentValue::Unique(value as i64))
+            }
+
             fn visit_map<M>(self, map: M) -> Result<Self::Value, M::Error>
             where
                 M: MapAccess<'de>,
@@ -222,6 +229,13 @@ impl<'a> serde::Deserialize<'a> for ModeDependentValue<f64> {
                 Ok(ModeDependentValue::Unique(value))
             }
 
+            fn visit_u64<E>(self, value: u64) -> Result<Self::Value, E>
+            where
+                E: de::Error,
+            {
+                Ok(ModeDependentValue::Unique(value as f64))
+            }
+
             fn visit_i64<E>(self, value: i64) -> Result<Self::Value, E>
             where
                 E: de::Error,

plugins/zenoh-plugin-trait/src/lib.rs

@@ -18,7 +18,7 @@
 //!
 //! To build a plugin, implement [`Plugin`].
 //!
-//! If building a plugin for [`zenohd`](https://crates.io/crates/zenoh), you should use the types exported in [`zenoh::plugins`](https://docs.rs/zenoh/latest/zenoh/plugins) to fill [`Plugin`]'s associated types.  
+//! If building a plugin for [`zenohd`](https://crates.io/crates/zenoh), you should use the types exported in [`zenoh::plugins`](https://docs.rs/zenoh/latest/zenoh/plugins) to fill [`Plugin`]'s associated types.
 //! To check your plugin typing for `zenohd`, have your plugin implement [`zenoh::plugins::ZenohPlugin`](https://docs.rs/zenoh/latest/zenoh/plugins/struct.ZenohPlugin)
 //!
 //! Plugin is a struct which implements the [`Plugin`] trait. This trait has two associated types:
@@ -51,3 +51,8 @@ use zenoh_util::concat_enabled_features;
 
 pub const FEATURES: &str =
     concat_enabled_features!(prefix = "zenoh-plugin-trait", features = ["default"]);
+
+#[doc(hidden)]
+pub mod export {
+    pub use git_version;
+}

plugins/zenoh-plugin-trait/src/plugin.rs

@@ -202,7 +202,7 @@ macro_rules! plugin_version {
 #[macro_export]
 macro_rules! plugin_long_version {
     () => {
-        git_version::git_version!(prefix = "v", cargo_prefix = "v")
+        $crate::export::git_version::git_version!(prefix = "v", cargo_prefix = "v")
     };
 }