From c81eecd644f6232bfd6e64840a9f41c9e738a205 Mon Sep 17 00:00:00 2001 From: Ayaz Hafiz Date: Tue, 9 Aug 2022 18:04:35 -0700 Subject: [PATCH] Print back records without trailing comma --- crates/compiler/test_derive/src/encoding.rs | 9 +++----- .../compiler/test_derive/src/pretty_print.rs | 21 +++++++++++-------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/crates/compiler/test_derive/src/encoding.rs b/crates/compiler/test_derive/src/encoding.rs index 1c72e631af..5131918a7f 100644 --- a/crates/compiler/test_derive/src/encoding.rs +++ b/crates/compiler/test_derive/src/encoding.rs @@ -174,10 +174,7 @@ fn one_field_record() { \#Derived.bytes, #Derived.fmt -> Encode.appendWith #Derived.bytes - (Encode.record - [ - { value: Encode.toEncoder #Derived.rcd.a, key: "a", }, - ]) + (Encode.record [{ value: Encode.toEncoder #Derived.rcd.a, key: "a" }]) #Derived.fmt "### ) @@ -202,8 +199,8 @@ fn two_field_record() { #Derived.bytes (Encode.record [ - { value: Encode.toEncoder #Derived.rcd.a, key: "a", }, - { value: Encode.toEncoder #Derived.rcd.b, key: "b", }, + { value: Encode.toEncoder #Derived.rcd.a, key: "a" }, + { value: Encode.toEncoder #Derived.rcd.b, key: "b" }, ]) #Derived.fmt "### diff --git a/crates/compiler/test_derive/src/pretty_print.rs b/crates/compiler/test_derive/src/pretty_print.rs index ea7abe3e59..d263b3a15e 100644 --- a/crates/compiler/test_derive/src/pretty_print.rs +++ b/crates/compiler/test_derive/src/pretty_print.rs @@ -178,15 +178,18 @@ fn expr<'a>(c: &Ctx, p: EPrec, f: &'a Arena<'a>, e: &'a Expr) -> DocBuilder<'a, Record { fields, .. } => f .reflow("{") .append( - f.concat(fields.iter().map(|(name, field)| { - let field = f - .text(name.as_str()) - .append(f.reflow(": ")) - .append(expr(c, Free, f, &field.loc_expr.value)) - .nest(2) - .group(); - f.line().append(field).append(",") - })) + f.intersperse( + fields.iter().map(|(name, field)| { + let field = f + .text(name.as_str()) + .append(f.reflow(": ")) + .append(expr(c, Free, f, &field.loc_expr.value)) + .nest(2) + .group(); + f.line().append(field) + }), + f.reflow(","), + ) .nest(2) .group(), )