Replace SerdeDeDataProvider with BufferProvider

provider/core/src/error.rs

@@ -59,10 +59,10 @@ pub enum Error {
     /// An error occured during serialization or deserialization.
     #[cfg(feature = "erased-serde")]
     #[displaydoc("Serde error: {0}")]
-    Serde(erased_serde::Error),
+    Serialize(crate::serde::SerializeError),
 
     #[displaydoc("Error while deserializing: {0}")]
-    ProviderSerde(crate::serde::Error),
+    Deserialize(crate::serde::DeserializeError),
 
     /// The data provider encountered some other error when loading the resource, such as I/O.
     #[displaydoc("Failed to load resource: {0}")]
@@ -72,16 +72,15 @@ pub enum Error {
 #[cfg(feature = "std")]
 impl std::error::Error for Error {}
 
-#[cfg(feature = "erased-serde")]
-impl From<erased_serde::Error> for Error {
-    fn from(e: erased_serde::Error) -> Self {
-        Error::Serde(e)
+impl From<crate::serde::SerializeError> for Error {
+    fn from(e: crate::serde::SerializeError) -> Self {
+        Error::Serialize(e)
     }
 }
 
-impl From<crate::serde::Error> for Error {
-    fn from(e: crate::serde::Error) -> Self {
-        Error::ProviderSerde(e)
+impl From<crate::serde::DeserializeError> for Error {
+    fn from(e: crate::serde::DeserializeError) -> Self {
+        Error::Deserialize(e)
     }
 }
 

provider/core/src/serde/de.rs

@@ -3,14 +3,82 @@
 // (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ).
 
 use super::BufferFormat;
-use super::Error;
 use crate::buffer_provider::BufferProvider;
 use crate::prelude::*;
 use core::marker::PhantomData;
 use serde::de::Deserialize;
 use yoke::trait_hack::YokeTraitHack;
 use yoke::Yokeable;
 
+/// Error type for deserialization.
+#[derive(displaydoc::Display, Debug)]
+pub enum Error {
+    /// An error originating in [`serde_json`].
+    #[cfg(feature = "provider_json")]
+    #[displaydoc("{0}")]
+    Json(serde_json::error::Error),
+
+    /// An error originating in [`bincode`].
+    #[cfg(feature = "provider_bincode1")]
+    #[displaydoc("{0}")]
+    Bincode1(bincode::Error),
+
+    /// An error originating in [`postcard`].
+    #[cfg(feature = "provider_postcard07")]
+    #[displaydoc("{0}")]
+    Postcard07(postcard::Error),
+
+    /// An error indicating that the desired buffer format is not available. This usually
+    /// means that a required feature was not enabled
+    #[allow(dead_code)]
+    #[displaydoc("Unavailable buffer format: {0:?} (do you need to enable a feature?)")]
+    UnavailableFormat(BufferFormat),
+
+    /// An error indicating that the buffer format could not be deduced. This is usually
+    /// unexpected and could indicate a problem with the data pipeline setup.
+    #[displaydoc("Buffer format not specified")]
+    FormatNotSpecified,
+}
+
+#[cfg(feature = "provider_json")]
+impl From<serde_json::error::Error> for Error {
+    fn from(e: serde_json::error::Error) -> Self {
+        Error::Json(e)
+    }
+}
+
+#[cfg(feature = "provider_bincode1")]
+impl From<bincode::Error> for Error {
+    fn from(e: bincode::Error) -> Self {
+        Error::Bincode1(e)
+    }
+}
+
+#[cfg(feature = "provider_postcard07")]
+impl From<postcard::Error> for Error {
+    fn from(e: postcard::Error) -> Self {
+        Error::Postcard07(e)
+    }
+}
+
+/// Returns an error if the buffer format is not enabled.
+pub fn check_format_supported(buffer_format: BufferFormat) -> Result<(), Error> {
+    match buffer_format {
+        #[cfg(feature = "provider_json")]
+        BufferFormat::Json => Ok(()),
+
+        #[cfg(feature = "provider_bincode1")]
+        BufferFormat::Bincode1 => Ok(()),
+
+        #[cfg(feature = "provider_postcard07")]
+        BufferFormat::Postcard07 => Ok(()),
+
+        // Allowed for cases in which all features are enabled
+        #[allow(unreachable_patterns)]
+        _ => Err(Error::UnavailableFormat(buffer_format)),
+    }
+}
+
 /// A [`BufferProvider`] that deserializes its data using Serde.
 pub struct DeserializingBufferProvider<'a, P: ?Sized>(&'a P);
 

provider/core/src/serde/mod.rs

@@ -25,9 +25,12 @@
 mod de;
 mod ser;
 
+pub use ser::Error as SerializeError;
 pub use ser::SerializeBox;
 pub use ser::SerializeMarker;
 
+pub use de::Error as DeserializeError;
+pub use de::check_format_supported;
 pub use de::AsDeserializingBufferProvider;
 pub use de::DeserializingBufferProvider;
 
@@ -42,72 +45,3 @@ pub enum BufferFormat {
     /// Serialize using Postcard version 0.7.
     Postcard07,
 }
-
-/// An Error type specifically for the [`Deserializer`](serde::Deserializer)
-#[derive(displaydoc::Display, Debug)]
-pub enum Error {
-    /// An error originating in [`serde_json`].
-    #[cfg(feature = "provider_json")]
-    #[displaydoc("{0}")]
-    Json(serde_json::error::Error),
-
-    /// An error originating in [`bincode`].
-    #[cfg(feature = "provider_bincode1")]
-    #[displaydoc("{0}")]
-    Bincode1(bincode::Error),
-
-    /// An error originating in [`postcard`].
-    #[cfg(feature = "provider_postcard07")]
-    #[displaydoc("{0}")]
-    Postcard07(postcard::Error),
-
-    /// An error indicating that the desired buffer format is not available. This usually
-    /// means that a required feature was not enabled
-    #[allow(dead_code)]
-    #[displaydoc("Unavailable buffer format: {0:?} (do you need to enable a feature?)")]
-    UnavailableFormat(BufferFormat),
-
-    /// An error indicating that the buffer format could not be deduced. This is usually
-    /// unexpected and could indicate a problem with the data pipeline setup.
-    #[displaydoc("Buffer format not specified")]
-    FormatNotSpecified,
-}
-
-#[cfg(feature = "provider_json")]
-impl From<serde_json::error::Error> for Error {
-    fn from(e: serde_json::error::Error) -> Self {
-        Error::Json(e)
-    }
-}
-
-#[cfg(feature = "provider_bincode1")]
-impl From<bincode::Error> for Error {
-    fn from(e: bincode::Error) -> Self {
-        Error::Bincode1(e)
-    }
-}
-
-#[cfg(feature = "provider_postcard07")]
-impl From<postcard::Error> for Error {
-    fn from(e: postcard::Error) -> Self {
-        Error::Postcard07(e)
-    }
-}
-
-/// Returns an error if the buffer format is not enabled.
-pub fn check_format_supported(buffer_format: BufferFormat) -> Result<(), Error> {
-    match buffer_format {
-        #[cfg(feature = "provider_json")]
-        BufferFormat::Json => Ok(()),
-
-        #[cfg(feature = "provider_bincode1")]
-        BufferFormat::Bincode1 => Ok(()),
-
-        #[cfg(feature = "provider_postcard07")]
-        BufferFormat::Postcard07 => Ok(()),
-
-        // Allowed for cases in which all features are enabled
-        #[allow(unreachable_patterns)]
-        _ => Err(Error::UnavailableFormat(buffer_format)),
-    }
-}

provider/core/src/serde/ser.rs

@@ -8,6 +8,22 @@ use alloc::boxed::Box;
 use core::ops::Deref;
 use crate::dynutil::UpcastDataPayload;
 
+/// Error type for serialization.
+#[derive(displaydoc::Display, Debug)]
+pub enum Error {
+    /// An error originating in [`erased_serde`].
+    #[cfg(feature = "provider_json")]
+    #[displaydoc("{0}")]
+    Serde(erased_serde::Error),
+}
+
+#[cfg(feature = "erased-serde")]
+impl From<erased_serde::Error> for Error {
+    fn from(e: erased_serde::Error) -> Self {
+        Error::Serde(e)
+    }
+}
+
 /// A wrapper around `Box<erased_serde::Serialize>` for integration with DataProvider.
 #[derive(yoke::Yokeable)]
 pub struct SerializeBox(Box<dyn erased_serde::Serialize>);
@@ -64,7 +80,7 @@ impl DataPayload<SerializeMarker> {
     /// ).expect("Serialization should succeed");
     /// assert_eq!("{\"message\":\"(und) Hello World\"}".as_bytes(), buffer);
     /// ```
-    pub fn serialize(&self, mut serializer: &mut dyn erased_serde::Serializer) -> Result<(), DataError> {
+    pub fn serialize(&self, mut serializer: &mut dyn erased_serde::Serializer) -> Result<(), Error> {
         self.get().erased_serialize(&mut serializer)?;
         Ok(())
     }