Add FlatMapDeserializerError

Author: andrewtoth

serde/src/private/de.rs

@@ -2,12 +2,12 @@ use crate::lib::*;
 
 use crate::de::value::{BorrowedBytesDeserializer, BytesDeserializer};
 use crate::de::{
-    Deserialize, DeserializeSeed, Deserializer, EnumAccess, Error, IntoDeserializer, VariantAccess,
-    Visitor,
+    Deserialize, DeserializeSeed, Deserializer, EnumAccess, Error, Expected, IntoDeserializer,
+    VariantAccess, Visitor,
 };
 
 #[cfg(any(feature = "std", feature = "alloc"))]
-use crate::de::{MapAccess, Unexpected};
+use crate::de::{MapAccess, StdError, Unexpected};
 
 #[cfg(any(feature = "std", feature = "alloc"))]
 pub use self::content::{
@@ -2586,6 +2586,66 @@ where
     }
 }
 
+#[cfg(any(feature = "std", feature = "alloc"))]
+#[derive(Debug)]
+pub enum FlatMapDeserializerError<E: Error> {
+    Inner(E),
+    NoVariantFoundInFlattenedData(&'static str),
+}
+
+#[cfg(any(feature = "std", feature = "alloc"))]
+impl<E: Error> Display for FlatMapDeserializerError<E> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            FlatMapDeserializerError::Inner(e) => write!(f, "{}", e),
+            FlatMapDeserializerError::NoVariantFoundInFlattenedData(name) => {
+                write!(f, "no variant of enum {} found in flattened data", name)
+            }
+        }
+    }
+}
+
+#[cfg(any(feature = "std", feature = "alloc"))]
+impl<E: Error> StdError for FlatMapDeserializerError<E> {}
+
+#[cfg(any(feature = "std", feature = "alloc"))]
+impl<E: Error> Error for FlatMapDeserializerError<E> {
+    fn custom<T>(msg: T) -> Self
+    where
+        T: Display,
+    {
+        FlatMapDeserializerError::Inner(Error::custom(msg))
+    }
+
+    fn invalid_type(unexp: Unexpected, exp: &Expected) -> Self {
+        FlatMapDeserializerError::Inner(Error::invalid_type(unexp, exp))
+    }
+
+    fn invalid_value(unexp: Unexpected, exp: &Expected) -> Self {
+        FlatMapDeserializerError::Inner(Error::invalid_value(unexp, exp))
+    }
+
+    fn invalid_length(len: usize, exp: &Expected) -> Self {
+        FlatMapDeserializerError::Inner(Error::invalid_length(len, exp))
+    }
+
+    fn unknown_variant(variant: &str, exp: &'static [&'static str]) -> Self {
+        FlatMapDeserializerError::Inner(Error::unknown_variant(variant, exp))
+    }
+
+    fn unknown_field(field: &str, exp: &'static [&'static str]) -> Self {
+        FlatMapDeserializerError::Inner(Error::unknown_field(field, exp))
+    }
+
+    fn missing_field(field: &'static str) -> Self {
+        FlatMapDeserializerError::Inner(Error::missing_field(field))
+    }
+
+    fn duplicate_field(field: &'static str) -> Self {
+        FlatMapDeserializerError::Inner(Error::duplicate_field(field))
+    }
+}
+
 #[cfg(any(feature = "std", feature = "alloc"))]
 pub struct FlatMapDeserializer<'a, 'de: 'a, E>(
     pub &'a mut Vec<Option<(Content<'de>, Content<'de>)>>,
@@ -2597,7 +2657,7 @@ impl<'a, 'de, E> FlatMapDeserializer<'a, 'de, E>
 where
     E: Error,
 {
-    fn deserialize_other<V>() -> Result<V, E> {
+    fn deserialize_other<V>() -> Result<V, FlatMapDeserializerError<E>> {
         Err(Error::custom("can only flatten structs and maps"))
     }
 }
@@ -2621,7 +2681,7 @@ impl<'a, 'de, E> Deserializer<'de> for FlatMapDeserializer<'a, 'de, E>
 where
     E: Error,
 {
-    type Error = E;
+    type Error = FlatMapDeserializerError<E>;
 
     fn deserialize_any<V>(self, visitor: V) -> Result<V::Value, Self::Error>
     where
@@ -2645,10 +2705,9 @@ where
             }
         }
 
-        Err(Error::custom(format_args!(
-            "no variant of enum {} found in flattened data",
-            name
-        )))
+        Err(FlatMapDeserializerError::NoVariantFoundInFlattenedData(
+            name,
+        ))
     }
 
     fn deserialize_map<V>(self, visitor: V) -> Result<V::Value, Self::Error>