Fix error on parsing NULL input

Allow `YamlValueData::Null` to be parsed in `deserialize_map()`. Integration test case included. Signed-off-by: Gris Ge <[email protected]>
nispor · Jan 4, 2025 · cc562d5 · cc562d5
1 parent 756007f
commit cc562d5
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 1 deletion.
diff --git a/src/deserializer.rs b/src/deserializer.rs
@@ -280,6 +280,9 @@ impl<'de> Deserializer<'de> for &mut RmsdDeserializer {
             // where we can use `Option::take()` to move data out.
             let access = YamlValueMapAccess::new(*v.clone());
             visitor.visit_map(access)
+        } else if let YamlValueData::Null = &self.parsed.data {
+            let access = YamlValueMapAccess::new(Default::default());
+            visitor.visit_map(access)
         } else {
             Err(RmsdError::unexpected_yaml_node_type(
                 format!("Expecting a map, got {}", self.parsed.data),

diff --git a/src/map.rs b/src/map.rs
@@ -10,7 +10,7 @@ use crate::{
     YamlTokenData, YamlValue, YamlValueData,
 };
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq, Default)]
 pub struct YamlValueMap(IndexMap<YamlValue, YamlValue>);
 
 impl std::hash::Hash for YamlValueMap {

diff --git a/src/value.rs b/src/value.rs
@@ -307,6 +307,11 @@ impl YamlValue {
                 }
                 YamlTokenData::MapKeyIndicator => get_map(iter, false),
                 YamlTokenData::LocalTag(_) => get_tag(iter),
+                YamlTokenData::Null => Ok(YamlValue {
+                    start: token.start,
+                    end: token.end,
+                    data: YamlValueData::Null,
+                }),
                 _ => {
                     if iter.data.get(1).and_then(|t| {
                         t.as_ref()

diff --git a/tests/from_str.rs b/tests/from_str.rs
@@ -338,3 +338,15 @@ fn test_signed_interger() -> Result<(), RmsdError> {
     );
     Ok(())
 }
+
+#[test]
+fn test_empty_input() -> Result<(), RmsdError> {
+    #[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
+    struct FooTest {
+        #[serde(default)]
+        uint_a: u32,
+    }
+
+    assert_eq!(FooTest { uint_a: 0 }, rmsd_yaml::from_str::<FooTest>("")?);
+    Ok(())
+}