Merge pull request #464 from epage/error

fix(ser): Report the name of the unsupported type
toml-rs · Jan 18, 2023 · b310bc9 · b310bc9
2 parents 8462fda + e2fb7b1
commit b310bc9
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 10 deletions.
diff --git a/crates/toml_edit/src/ser/item.rs b/crates/toml_edit/src/ser/item.rs
@@ -101,11 +101,11 @@ impl serde::ser::Serializer for ItemSerializer {
     }
 
     fn serialize_unit(self) -> Result<Self::Ok, Self::Error> {
-        Err(ErrorKind::UnsupportedType.into())
+        Err(ErrorKind::UnsupportedType(Some("unit")).into())
     }
 
-    fn serialize_unit_struct(self, _name: &'static str) -> Result<Self::Ok, Self::Error> {
-        Err(ErrorKind::UnsupportedType.into())
+    fn serialize_unit_struct(self, name: &'static str) -> Result<Self::Ok, Self::Error> {
+        Err(ErrorKind::UnsupportedType(Some(name)).into())
     }
 
     fn serialize_unit_variant(
@@ -130,15 +130,15 @@ impl serde::ser::Serializer for ItemSerializer {
 
     fn serialize_newtype_variant<T: ?Sized>(
         self,
-        _name: &'static str,
+        name: &'static str,
         _variant_index: u32,
         _variant: &'static str,
         _value: &T,
     ) -> Result<Self::Ok, Self::Error>
     where
         T: serde::ser::Serialize,
     {
-        Err(ErrorKind::UnsupportedType.into())
+        Err(ErrorKind::UnsupportedType(Some(name)).into())
     }
 
     fn serialize_seq(self, len: Option<usize>) -> Result<Self::SerializeSeq, Self::Error> {
@@ -189,11 +189,11 @@ impl serde::ser::Serializer for ItemSerializer {
 
     fn serialize_struct_variant(
         self,
-        _name: &'static str,
+        name: &'static str,
         _variant_index: u32,
         _variant: &'static str,
         _len: usize,
     ) -> Result<Self::SerializeStructVariant, Self::Error> {
-        Err(ErrorKind::UnsupportedType.into())
+        Err(ErrorKind::UnsupportedType(Some(name)).into())
     }
 }
diff --git a/crates/toml_edit/src/ser/mod.rs b/crates/toml_edit/src/ser/mod.rs
@@ -69,7 +69,7 @@ impl From<ErrorKind> for Error {
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 enum ErrorKind {
-    UnsupportedType,
+    UnsupportedType(Option<&'static str>),
     UnsupportedNone,
     KeyNotString,
     Custom(String),
@@ -78,7 +78,8 @@ enum ErrorKind {
 impl std::fmt::Display for ErrorKind {
     fn fmt(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
         match self {
-            ErrorKind::UnsupportedType => "unsupported Rust type".fmt(formatter),
+            ErrorKind::UnsupportedType(Some(t)) => write!(formatter, "unsupported {t} type"),
+            ErrorKind::UnsupportedType(None) => write!(formatter, "unsupported rust type"),
             ErrorKind::UnsupportedNone => "unsupported None value".fmt(formatter),
             ErrorKind::KeyNotString => "map key was not a string".fmt(formatter),
             ErrorKind::Custom(s) => s.fmt(formatter),
@@ -162,7 +163,9 @@ where
     T: serde::ser::Serialize,
 {
     let item = to_item(value)?;
-    let root = item.into_table().map_err(|_| ErrorKind::UnsupportedType)?;
+    let root = item
+        .into_table()
+        .map_err(|_| ErrorKind::UnsupportedType(None))?;
     Ok(root.into())
 }
 

diff --git a/crates/toml_edit/tests/testsuite/serde.rs b/crates/toml_edit/tests/testsuite/serde.rs
@@ -781,3 +781,22 @@ fn float_max() {
         Table(map! { a_b: Float(f64::MAX) }),
     }
 }
+
+#[test]
+fn unsupported_root_type() {
+    let native = "value";
+    let err = toml_edit::ser::to_string_pretty(&native).unwrap_err();
+    snapbox::assert_eq("unsupported rust type", err.to_string());
+}
+
+#[test]
+fn unsupported_nested_type() {
+    #[derive(Debug, Serialize, Deserialize)]
+    struct Foo {
+        unused: (),
+    }
+
+    let native = Foo { unused: () };
+    let err = toml_edit::ser::to_string_pretty(&native).unwrap_err();
+    snapbox::assert_eq("unsupported unit type", err.to_string());
+}