Get rid of deserialize_option! macro

MapValueDeseriaizer and SeqItemDeserializer should emit error on DeEvent::Eof
instead of calling Visitor::visit_none(). We delegate emitting appropriate error
to the Some variant.

The content of deserialize_option! macro was inlined and handling of DeEvent::Eof
was removed from MapValueDeseriaizer and SeqItemDeserializer.

This does not change existing behavior, because Eof in the middle of struct anyway
would be captured by `read_to_end()` call at the end of structure deserialization,
but this change will report an error in appropriate place, which would important
when we implement error position tracking

Author: Mingun

src/de/map.rs

@@ -543,11 +543,14 @@ where
 
     forward!(deserialize_any);
 
-    fn deserialize_option<V>(self, visitor: V) -> Result<V::Value, DeError>
+    fn deserialize_option<V>(self, visitor: V) -> Result<V::Value, Self::Error>
     where
         V: Visitor<'de>,
     {
-        deserialize_option!(self.map.de, self, visitor)
+        match self.map.de.peek()? {
+            DeEvent::Text(t) if t.is_empty() => visitor.visit_none(),
+            _ => visitor.visit_some(self),
+        }
     }
 
     /// Forwards deserialization of the inner type. Always calls [`Visitor::visit_newtype_struct`]
@@ -870,11 +873,14 @@ where
 
     forward!(deserialize_any);
 
-    fn deserialize_option<V>(self, visitor: V) -> Result<V::Value, DeError>
+    fn deserialize_option<V>(self, visitor: V) -> Result<V::Value, Self::Error>
     where
         V: Visitor<'de>,
     {
-        deserialize_option!(self.map.de, self, visitor)
+        match self.map.de.peek()? {
+            DeEvent::Text(t) if t.is_empty() => visitor.visit_none(),
+            _ => visitor.visit_some(self),
+        }
     }
 
     /// Forwards deserialization of the inner type. Always calls [`Visitor::visit_newtype_struct`]

src/de/mod.rs

@@ -1954,16 +1954,6 @@ macro_rules! deserialize_primitives {
     };
 }
 
-macro_rules! deserialize_option {
-    ($de:expr, $deserializer:ident, $visitor:ident) => {
-        match $de.peek()? {
-            DeEvent::Text(t) if t.is_empty() => $visitor.visit_none(),
-            DeEvent::Eof => $visitor.visit_none(),
-            _ => $visitor.visit_some($deserializer),
-        }
-    };
-}
-
 mod key;
 mod map;
 mod resolver;
@@ -2875,7 +2865,11 @@ where
     where
         V: Visitor<'de>,
     {
-        deserialize_option!(self, self, visitor)
+        match self.peek()? {
+            DeEvent::Text(t) if t.is_empty() => visitor.visit_none(),
+            DeEvent::Eof => visitor.visit_none(),
+            _ => visitor.visit_some(self),
+        }
     }
 
     fn deserialize_any<V>(self, visitor: V) -> Result<V::Value, DeError>