Fix Config::from_deserializer

eclipse-zenoh · Sep 17, 2024 · 30df65b · 30df65b
1 parent 1933f8f
commit 30df65b
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/zenoh/src/api/config.rs b/zenoh/src/api/config.rs
@@ -50,14 +50,22 @@ impl Config {
         self.0.remove(key)
     }
 
+    // REVIEW(fuzzypixelz): the error variant of the Result is a Result because this does
+    // deserialization AND validation.
     #[zenoh_macros::unstable]
     pub fn from_deserializer<'d, D: serde::Deserializer<'d>>(
         d: D,
     ) -> Result<Self, Result<Self, D::Error>>
     where
         Self: serde::Deserialize<'d>,
     {
-        Ok(Config(zenoh_config::Config::from_deserializer(d)?))
+        match zenoh_config::Config::from_deserializer(d) {
+            Ok(config) => Ok(Config(config)),
+            Err(result) => match result {
+                Ok(config) => Err(Ok(Config(config))),
+                Err(err) => Err(Err(err)),
+            },
+        }
     }
 }