Fix deserialization of single element to Option<Vec<NonString>> value

jplatte · Mar 28, 2024 · 2aca384 · 2aca384
1 parent 63c9c33
commit 2aca384
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/de/part.rs b/src/de/part.rs
@@ -84,7 +84,7 @@ impl<'de> de::Deserializer<'de> for Part<'de> {
     where
         V: de::Visitor<'de>,
     {
-        visitor.visit_seq(PartSeqAccess(Some(self.0)))
+        visitor.visit_seq(PartSeqAccess(Some(self)))
     }
 
     forward_to_deserialize_any! {
@@ -131,7 +131,7 @@ impl<'de> de::EnumAccess<'de> for Part<'de> {
     }
 }
 
-struct PartSeqAccess<'de>(Option<Cow<'de, str>>);
+struct PartSeqAccess<'de>(Option<Part<'de>>);
 
 impl<'de> de::SeqAccess<'de> for PartSeqAccess<'de> {
     type Error = Error;
@@ -141,7 +141,7 @@ impl<'de> de::SeqAccess<'de> for PartSeqAccess<'de> {
         T: de::DeserializeSeed<'de>,
     {
         match self.0.take() {
-            Some(value) => seed.deserialize(value.into_deserializer()).map(Some),
+            Some(value) => seed.deserialize(value).map(Some),
             None => Ok(None),
         }
     }

diff --git a/src/de/tests.rs b/src/de/tests.rs
@@ -99,6 +99,18 @@ fn deserialize_option_vec() {
     );
 }
 
+#[test]
+fn deserialize_option_vec_int() {
+    #[derive(Deserialize, PartialEq, Debug)]
+    struct Form {
+        value: Option<Vec<i32>>,
+    }
+
+    assert_eq!(super::from_str(""), Ok(Form { value: None }));
+    assert_eq!(super::from_str("value=0"), Ok(Form { value: Some(vec![0]) }));
+    assert_eq!(super::from_str("value=3&value=-1"), Ok(Form { value: Some(vec![3, -1]) }));
+}
+
 #[test]
 fn deserialize_option_no_value() {
     #[derive(Deserialize, PartialEq, Debug)]