Fix data option deserialization

Author: Will Nelson

resp/src/data/de.rs

@@ -207,9 +207,19 @@ impl<'de> de::Deserializer<'de> for Data<'de> {
 		self.deserialize_map(visitor)
 	}
 
+	fn deserialize_option<V>(self, visitor: V) -> Result<V::Value, Self::Error>
+	where
+		V: de::Visitor<'de>,
+	{
+		match self {
+			Self::Null => visitor.visit_none(),
+			_ => visitor.visit_some(self),
+		}
+	}
+
 	forward_to_deserialize_any! {
 		bool i8 i16 i32 i64 i128 u8 u16 u32 u64 u128 f32 f64 char str string
-		bytes byte_buf option unit unit_struct newtype_struct seq tuple
+		bytes byte_buf unit unit_struct newtype_struct seq tuple
 		tuple_struct enum identifier ignored_any
 	}
 }

src/model/stream/read.rs

@@ -39,7 +39,7 @@ pub struct ReadResponse<'a>(
 mod test {
 	use std::borrow::Cow;
 
-	use redust_resp::{array, from_data, Data};
+	use redust_resp::{array, from_bytes, from_data, Data};
 
 	use crate::model::stream::{
 		read::{Field, Key, Value},
@@ -49,7 +49,7 @@ mod test {
 	use super::ReadResponse;
 
 	#[test]
-	fn stream_read() {
+	fn stream_read_some() {
 		let data = array![array![
 			Data::BulkString(b"foo"[..].into()),
 			array![array![
@@ -61,10 +61,21 @@ mod test {
 			]]
 		]];
 
-		let resp: ReadResponse = from_data(data).expect("read data");
+		let resp = from_data::<Option<ReadResponse>>(data)
+			.expect("read data")
+			.expect("some");
 		assert_eq!(
 			resp.0[&Key(b"foo"[..].into())].0[&Id(1, 0)][&Field(b"abc"[..].into())],
 			Value(Cow::from(&b"def"[..]))
 		);
 	}
+
+	#[test]
+	fn stream_read_none() {
+		let bytes = b"*-1\r\n";
+
+		let (resp, rem) = from_bytes::<Option<ReadResponse>>(bytes).expect("read data");
+		assert_eq!(resp, None);
+		assert_eq!(rem, []);
+	}
 }