Fix pretty-print implementation to not use transmute. (#541)

partiql-ast/src/pretty.rs

@@ -697,60 +697,32 @@ impl PrettyDoc for Struct {
         D::Doc: Clone,
         A: Clone,
     {
-        let wrapped = self.fields.iter().map(|p| unsafe {
-            let x: &'b StructExprPair = std::mem::transmute(p);
-            x
-        });
-        pretty_seq(wrapped, "{", "}", ",", PRETTY_INDENT_MINOR_NEST, arena)
-    }
-}
-
-pub struct StructExprPair(pub ExprPair);
-
-impl PrettyDoc for StructExprPair {
-    fn pretty_doc<'b, D, A>(&'b self, arena: &'b D) -> DocBuilder<'b, D, A>
-    where
-        D: DocAllocator<'b, A>,
-        D::Doc: Clone,
-        A: Clone,
-    {
-        let k = self.0.first.pretty_doc(arena);
-        let v = self.0.second.pretty_doc(arena);
-        let sep = arena.text(": ");
-
-        k.append(sep).group().append(v).group()
-    }
-}
+        let fields = self.fields.iter().map(|expr_pair| {
+            let k = expr_pair.first.pretty_doc(arena);
+            let v = expr_pair.second.pretty_doc(arena);
+            let sep = arena.text(": ");
 
-impl PrettyDoc for StructLit {
-    fn pretty_doc<'b, D, A>(&'b self, arena: &'b D) -> DocBuilder<'b, D, A>
-    where
-        D: DocAllocator<'b, A>,
-        D::Doc: Clone,
-        A: Clone,
-    {
-        let wrapped = self.fields.iter().map(|p| unsafe {
-            let x: &'b StructLitField = std::mem::transmute(p);
-            x
+            k.append(sep).group().append(v).group()
         });
-        pretty_seq(wrapped, "{", "}", ",", PRETTY_INDENT_MINOR_NEST, arena)
+        pretty_seq_doc(fields, "{", None, "}", ",", PRETTY_INDENT_MINOR_NEST, arena)
     }
 }
 
-pub struct StructLitField(pub LitField);
-
-impl PrettyDoc for StructLitField {
+impl PrettyDoc for StructLit {
     fn pretty_doc<'b, D, A>(&'b self, arena: &'b D) -> DocBuilder<'b, D, A>
     where
         D: DocAllocator<'b, A>,
         D::Doc: Clone,
         A: Clone,
     {
-        let k = self.0.first.pretty_doc(arena);
-        let v = self.0.second.pretty_doc(arena);
-        let sep = arena.text(": ");
+        let fields = self.fields.iter().map(|expr_pair| {
+            let k = expr_pair.first.pretty_doc(arena);
+            let v = expr_pair.second.pretty_doc(arena);
+            let sep = arena.text(": ");
 
-        k.append(sep).group().append(v).group()
+            k.append(sep).group().append(v).group()
+        });
+        pretty_seq_doc(fields, "{", None, "}", ",", PRETTY_INDENT_MINOR_NEST, arena)
     }
 }
 

partiql-value/src/pretty.rs

@@ -1,6 +1,7 @@
 use crate::{Bag, DateTime, List, Tuple, Value};
 use partiql_common::pretty::{
-    pretty_prefixed_doc, pretty_seq, pretty_surrounded, PrettyDoc, PRETTY_INDENT_MINOR_NEST,
+    pretty_prefixed_doc, pretty_seq, pretty_seq_doc, pretty_surrounded, PrettyDoc,
+    PRETTY_INDENT_MINOR_NEST,
 };
 use pretty::{DocAllocator, DocBuilder};
 
@@ -84,36 +85,20 @@ impl PrettyDoc for Bag {
 }
 
 impl PrettyDoc for Tuple {
-    #[inline]
     fn pretty_doc<'b, D, A>(&'b self, arena: &'b D) -> DocBuilder<'b, D, A>
     where
         D: DocAllocator<'b, A>,
         D::Doc: Clone,
         A: Clone,
     {
-        let wrapped = self.pairs().map(|p| unsafe {
-            let x: &'b StructValuePair<'b> = std::mem::transmute(&p);
-            x
-        });
-        pretty_seq(wrapped, "{", "}", ",", PRETTY_INDENT_MINOR_NEST, arena)
-    }
-}
+        let seq = self.pairs().map(|(k, v)| {
+            let k = k.pretty_doc(arena);
+            let v = v.pretty_doc(arena);
+            let sep = arena.text(": ");
 
-pub struct StructValuePair<'a>((&'a String, &'a Value));
-
-impl PrettyDoc for StructValuePair<'_> {
-    fn pretty_doc<'b, D, A>(&'b self, arena: &'b D) -> DocBuilder<'b, D, A>
-    where
-        D: DocAllocator<'b, A>,
-        D::Doc: Clone,
-        A: Clone,
-    {
-        let (k, v) = self.0;
-        let k = k.pretty_doc(arena);
-        let v = v.pretty_doc(arena);
-        let sep = arena.text(": ");
-
-        k.append(sep).group().append(v).group()
+            k.append(sep).group().append(v).group()
+        });
+        pretty_seq_doc(seq, "{", None, "}", ",", PRETTY_INDENT_MINOR_NEST, arena)
     }
 }