Mass renaming, container Display impls

src/element/owned.rs

@@ -107,6 +107,14 @@ impl List {
     }
 }
 
+impl Display for List {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        let mut ivf = IonValueFormatter { output: f };
+        ivf.format_list(self).map_err(|_| std::fmt::Error)?;
+        Ok(())
+    }
+}
+
 impl IonSequence for List {
     fn iter(&self) -> ElementsIterator<'_> {
         ElementsIterator::new(&self.children)
@@ -159,6 +167,14 @@ impl SExp {
     }
 }
 
+impl Display for SExp {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        let mut ivf = IonValueFormatter { output: f };
+        ivf.format_sexp(self).map_err(|_| std::fmt::Error)?;
+        Ok(())
+    }
+}
+
 impl IonSequence for SExp {
     fn iter(&self) -> ElementsIterator<'_> {
         ElementsIterator::new(&self.children)
@@ -250,6 +266,14 @@ pub struct Struct {
     fields: Fields,
 }
 
+impl Display for Struct {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        let mut ivf = IonValueFormatter { output: f };
+        ivf.format_struct(self).map_err(|_| std::fmt::Error)?;
+        Ok(())
+    }
+}
+
 impl Struct {
     pub fn builder() -> StructBuilder {
         StructBuilder::new()
@@ -417,6 +441,30 @@ pub enum Value {
     Struct(Struct),
 }
 
+impl Display for Value {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        let mut ivf = IonValueFormatter { output: f };
+        match &self {
+            Value::Null(ion_type) => ivf.format_null(*ion_type),
+            Value::Bool(bool) => ivf.format_bool(*bool),
+            Value::Integer(integer) => ivf.format_integer(integer),
+            Value::Float(float) => ivf.format_float(*float),
+            Value::Decimal(decimal) => ivf.format_decimal(decimal),
+            Value::Timestamp(timestamp) => ivf.format_timestamp(timestamp),
+            Value::Symbol(symbol) => ivf.format_symbol(symbol),
+            Value::String(string) => ivf.format_string(string),
+            Value::Clob(clob) => ivf.format_clob(clob),
+            Value::Blob(blob) => ivf.format_blob(blob),
+            Value::Struct(struct_) => ivf.format_struct(struct_),
+            Value::SExp(sexp) => ivf.format_sexp(sexp),
+            Value::List(list) => ivf.format_list(list),
+        }
+        .map_err(|_| std::fmt::Error)?;
+
+        Ok(())
+    }
+}
+
 /// An `(annotations, value)` pair representing an Ion value.
 #[derive(Debug, Clone)]
 pub struct Element {
@@ -434,28 +482,11 @@ impl Display for Element {
     fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), std::fmt::Error> {
         let mut ivf = IonValueFormatter { output: f };
 
-        // display for annotations of this owned_element
+        // display for annotations of this element
         ivf.format_annotations(&self.annotations)
             .map_err(|_| std::fmt::Error)?;
 
-        match &self.value {
-            Value::Null(ion_type) => ivf.format_null(*ion_type),
-            Value::Bool(bool) => ivf.format_bool(*bool),
-            Value::Integer(integer) => ivf.format_integer(integer),
-            Value::Float(float) => ivf.format_float(*float),
-            Value::Decimal(decimal) => ivf.format_decimal(decimal),
-            Value::Timestamp(timestamp) => ivf.format_timestamp(timestamp),
-            Value::Symbol(symbol) => ivf.format_symbol(symbol),
-            Value::String(string) => ivf.format_string(string),
-            Value::Clob(clob) => ivf.format_clob(clob),
-            Value::Blob(blob) => ivf.format_blob(blob),
-            Value::Struct(struct_) => ivf.format_struct(struct_),
-            Value::SExp(sexp) => ivf.format_sexp(sexp),
-            Value::List(list) => ivf.format_list(list),
-        }
-        .map_err(|_| std::fmt::Error)?;
-
-        Ok(())
+        self.value.fmt(f)
     }
 }
 
@@ -867,4 +898,40 @@ mod value_tests {
             }
         }
     }
+
+    #[test]
+    fn list_display_roundtrip() {
+        let list = ion_list![1, 2, 3, true, false];
+
+        // Use the Display impl to serialize the list to text
+        let text_list = format!("{list}");
+        // Parse the result and make sure it represents the same data
+        let expected_element: Element = list.into();
+        let actual_element = Element::read_one(text_list).unwrap();
+        assert!(expected_element.ion_eq(&actual_element));
+    }
+
+    #[test]
+    fn sexp_display_roundtrip() {
+        let sexp = ion_sexp! (1 2 3 true false);
+
+        // Use the Display impl to serialize the sexp to text
+        let text_sexp = format!("{sexp}");
+        // Parse the result and make sure it represents the same data
+        let expected_element: Element = sexp.into();
+        let actual_element = Element::read_one(text_sexp).unwrap();
+        assert!(expected_element.ion_eq(&actual_element));
+    }
+
+    #[test]
+    fn struct_display_roundtrip() {
+        let struct_ = ion_struct! {"foo": 1, "bar": 2, "baz": ion_list! [true, false]};
+
+        // Use the Display impl to serialize the struct to text
+        let text_struct = format!("{struct_}");
+        // Parse the result and make sure it represents the same data
+        let expected_element: Element = struct_.into();
+        let actual_element = Element::read_one(text_struct).unwrap();
+        assert!(expected_element.ion_eq(&actual_element));
+    }
 }