From 91104574801472df0246cc86dcc95870164a20d1 Mon Sep 17 00:00:00 2001
From: Brendan Hansknecht <brendan.hansknecht@gmail.com>
Date: Sat, 13 Jul 2024 09:48:59 -0700
Subject: [PATCH] cleanup refcount generation for record fields

---
 crates/glue/src/RustGlue.roc | 58 +++++++++++-------------------------
 1 file changed, 18 insertions(+), 40 deletions(-)

diff --git a/crates/glue/src/RustGlue.roc b/crates/glue/src/RustGlue.roc
index 68e9e2cb17..61402a838d 100644
--- a/crates/glue/src/RustGlue.roc
+++ b/crates/glue/src/RustGlue.roc
@@ -2121,47 +2121,25 @@ generateRocRefcounted = \buf, types, type, escapedName ->
         Str.concat buf "roc_refcounted_noop_impl!($(escapedName));\n\n"
 
 generateRocRefcountedNamedFields = \types, fields, mode, wrapper ->
+    fieldName = \name ->
+        escapedName = escapeKW name
+        when wrapper is
+            Struct -> escapedName
+            Tag -> "f$(escapedName)"
+
+    methodName =
+        when mode is
+            Inc -> "inc"
+            Dec -> "dec"
+
     walker =
-        when (wrapper, mode) is
-            (Struct, Inc) ->
-                \accum, { name: fieldName, id } ->
-                    escapedFieldName = escapeKW fieldName
-                    if containsRefcounted types (Types.shape types id) then
-                        Str.concat
-                            accum
-                            "$(indent) self.$(escapedFieldName).inc();\n"
-                    else
-                        accum
-
-            (Struct, Dec) ->
-                \accum, { name: fieldName, id } ->
-                    escapedFieldName = escapeKW fieldName
-                    if containsRefcounted types (Types.shape types id) then
-                        Str.concat
-                            accum
-                            "$(indent) self.$(escapedFieldName).dec();\n"
-                    else
-                        accum
-
-            (Tag, Inc) ->
-                \accum, { name: fieldName, id } ->
-                    escapedFieldName = escapeKW fieldName
-                    if containsRefcounted types (Types.shape types id) then
-                        Str.concat
-                            accum
-                            "$(indent) self.f$(escapedFieldName).inc();\n"
-                    else
-                        accum
-
-            (Tag, Dec) ->
-                \accum, { name: fieldName, id } ->
-                    escapedFieldName = escapeKW fieldName
-                    if containsRefcounted types (Types.shape types id) then
-                        Str.concat
-                            accum
-                            "$(indent) self.f$(escapedFieldName).dec();\n"
-                    else
-                        accum
+        \accum, { name, id } ->
+            if containsRefcounted types (Types.shape types id) then
+                Str.concat
+                    accum
+                    "$(indent) self.$(fieldName name).$(methodName)();\n"
+            else
+                accum
 
     List.walk fields "" walker