missing merged file added

commons/zenoh-config/src/lib.rs

@@ -35,7 +35,7 @@ use validated_struct::ValidatedMapAssociatedTypes;
 pub use validated_struct::{GetError, ValidatedMap};
 use zenoh_core::zlock;
 pub use zenoh_protocol::core::{
-    whatami, EndPoint, Locator, WhatAmI, WhatAmIMatcher, WhatAmIMatcherVisitor, ZenohId,
+    whatami, EndPoint, Locator, Priority, WhatAmI, WhatAmIMatcher, WhatAmIMatcherVisitor, ZenohId,
 };
 use zenoh_protocol::{
     core::{key_expr::OwnedKeyExpr, Bits},
@@ -482,9 +482,6 @@ validated_struct::validator! {
         ///   To use it, you must enable zenoh's <code>unstable</code> feature flag.
         /// </div>
         AdminSpaceConf {
-            /// Enable the admin space
-            #[serde(default = "set_false")]
-            pub enabled: bool,
             /// Permissions on the admin space
             pub permissions:
             PermissionsConf {
@@ -510,11 +507,7 @@ validated_struct::validator! {
 
         /// A list of directories where plugins may be searched for if no `__path__` was specified for them.
         /// The executable's current directory will be added to the search paths.
-        pub plugins_loading: #[derive(Default)]
-        PluginsLoading {
-            pub enabled: bool,
-            pub search_dirs: Option<Vec<String>>, // TODO (low-prio): Switch this String to a PathBuf? (applies to other paths in the config as well)
-        },
+        plugins_search_dirs: Vec<String>, // TODO (low-prio): Switch this String to a PathBuf? (applies to other paths in the config as well)
         #[validated(recursive_accessors)]
         /// The configuration for plugins.
         ///
@@ -728,13 +721,10 @@ impl Config {
     }
 
     pub fn libloader(&self) -> LibLoader {
-        if self.plugins_loading.enabled {
-            match self.plugins_loading.search_dirs() {
-                Some(dirs) => LibLoader::new(dirs, true),
-                None => LibLoader::default(),
-            }
+        if self.plugins_search_dirs.is_empty() {
+            LibLoader::default()
         } else {
-            LibLoader::empty()
+            LibLoader::new(&self.plugins_search_dirs, true)
         }
     }
 }