From 6eee1ba930a018f19140aa6e98fe8f0f99369a12 Mon Sep 17 00:00:00 2001
From: Joscha <joscha@plugh.de>
Date: Mon, 21 Nov 2022 00:20:33 +0100
Subject: [PATCH] Simplify pretty printing separated elements

---
 src/pretty/basic.rs        | 20 ++++++++++++--------
 src/pretty/lit.rs          |  6 +++---
 src/pretty/program.rs      |  6 +++---
 src/pretty/table_constr.rs |  6 +++---
 src/pretty/table_destr.rs  |  6 +++---
 5 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/src/pretty/basic.rs b/src/pretty/basic.rs
index 918539e..b6812b0 100644
--- a/src/pretty/basic.rs
+++ b/src/pretty/basic.rs
@@ -18,9 +18,9 @@ impl<E, S1, S2> Separated<E, S1, S2> {
     ) -> DocBuilder<'a, D>
     where
         D: DocAllocator<'a>,
-        FE: Fn(&'a D, E) -> DocBuilder<'a, D>,
-        FS1: Fn(&'a D, S1) -> DocBuilder<'a, D>,
-        FS2: Fn(&'a D, S2) -> DocBuilder<'a, D>,
+        FE: Fn(E) -> DocBuilder<'a, D>,
+        FS1: Fn(S1) -> DocBuilder<'a, D>,
+        FS2: Fn(S2) -> DocBuilder<'a, D>,
     {
         match self {
             Self::Empty(_) => allocator.nil(),
@@ -29,13 +29,17 @@ impl<E, S1, S2> Separated<E, S1, S2> {
                 last_elems,
                 trailing,
                 span: _span,
-            } => elem_to_doc(allocator, first_elem)
-                .append(allocator.concat(last_elems.into_iter().map(|(s, e)| {
-                    separator_to_doc(allocator, s).append(elem_to_doc(allocator, e))
-                })))
+            } => elem_to_doc(first_elem)
+                .append(
+                    allocator.concat(
+                        last_elems
+                            .into_iter()
+                            .map(|(s, e)| separator_to_doc(s).append(elem_to_doc(e))),
+                    ),
+                )
                 .append(
                     trailing
-                        .map(|s| trailing_separator_to_doc(allocator, s))
+                        .map(trailing_separator_to_doc)
                         .unwrap_or_else(|| allocator.nil()),
                 ),
         }
diff --git a/src/pretty/lit.rs b/src/pretty/lit.rs
index e7263b5..45dd034 100644
--- a/src/pretty/lit.rs
+++ b/src/pretty/lit.rs
@@ -55,9 +55,9 @@ impl<'a, D: DocAllocator<'a>> Pretty<'a, D> for TableLit {
         self.elems
             .pretty(
                 allocator,
-                |a, e| a.line().append(e.pretty(a)),
-                |a, (s0, s1)| a.text(","),
-                |a, s| a.text(","),
+                |e| allocator.line().append(e.pretty(allocator)),
+                |(s0, s1)| allocator.text(","),
+                |s| allocator.text(","),
             )
             .nest(NEST_DEPTH)
             .append(allocator.line())
diff --git a/src/pretty/program.rs b/src/pretty/program.rs
index 1259c84..20c5cb1 100644
--- a/src/pretty/program.rs
+++ b/src/pretty/program.rs
@@ -23,9 +23,9 @@ impl<'a, D: DocAllocator<'a>> Pretty<'a, D> for Program {
                 .append(allocator.line())
                 .append(elems.pretty(
                     allocator,
-                    |a, e| e.pretty(a),
-                    |a, (s0, s1)| a.text(",").append(a.line()),
-                    |a, s| a.text(","),
+                    |e| e.pretty(allocator),
+                    |(s0, s1)| allocator.text(",").append(allocator.line()),
+                    |s| allocator.text(","),
                 )),
         }
     }
diff --git a/src/pretty/table_constr.rs b/src/pretty/table_constr.rs
index 288bf84..5c9a058 100644
--- a/src/pretty/table_constr.rs
+++ b/src/pretty/table_constr.rs
@@ -30,9 +30,9 @@ impl<'a, D: DocAllocator<'a>> Pretty<'a, D> for TableConstr {
         self.elems
             .pretty(
                 allocator,
-                |a, e| a.line().append(e.pretty(a)),
-                |a, (s0, s1)| a.text(","),
-                |a, s| a.text(","),
+                |e| allocator.line().append(e.pretty(allocator)),
+                |(s0, s1)| allocator.text(","),
+                |s| allocator.text(","),
             )
             .nest(NEST_DEPTH)
             .append(allocator.line())
diff --git a/src/pretty/table_destr.rs b/src/pretty/table_destr.rs
index 9191121..50fab7b 100644
--- a/src/pretty/table_destr.rs
+++ b/src/pretty/table_destr.rs
@@ -27,9 +27,9 @@ impl<'a, D: DocAllocator<'a>> Pretty<'a, D> for TablePattern {
         self.elems
             .pretty(
                 allocator,
-                |a, e| a.line().append(e.pretty(a)),
-                |a, (s0, s1)| a.text(","),
-                |a, s| a.text(","),
+                |e| allocator.line().append(e.pretty(allocator)),
+                |(s0, s1)| allocator.text(","),
+                |s| allocator.text(","),
             )
             .nest(NEST_DEPTH)
             .append(allocator.line())