Use reflect for struct string representation

Summary: Reduce code bloat -> speed up build. Reviewed By: leoleovich Differential Revision: D63625719 fbshipit-source-id: 7ad2495a338756c98c29da95def625c70ce7a16e
facebook · Oct 1, 2024 · 4d7e521 · 4d7e521
1 parent ab4f277
commit 4d7e521
Show file tree

Hide file tree

Showing 110 changed files with 1,921 additions and 13,305 deletions.
diff --git a/thrift/compiler/generate/templates/go/svcs.go.mustache b/thrift/compiler/generate/templates/go/svcs.go.mustache
@@ -22,7 +22,6 @@ import (
     "context"
     "fmt"
     "reflect"
-    "strings"
 
     {{#program:thrift_imports}}
     {{program:go_package_alias}} "{{program:go_import_path}}"
@@ -40,7 +39,6 @@ import (
 var _ = context.Background
 var _ = fmt.Printf
 var _ = reflect.Ptr
-var _ = strings.Split
 var _ = thrift.ZERO
 {{#program:gen_metadata?}}
 {{#program:import_metadata_package?}}

diff --git a/thrift/compiler/generate/templates/go/types.go.mustache b/thrift/compiler/generate/templates/go/types.go.mustache
@@ -19,7 +19,6 @@
 import (
     "fmt"
     "reflect"
-    "strings"
 
     {{#program:thrift_imports}}
     {{program:go_package_alias}} "{{program:go_import_path}}"
@@ -31,7 +30,6 @@ import (
 // (needed to ensure safety because of naive import list construction)
 var _ = fmt.Printf
 var _ = reflect.Ptr
-var _ = strings.Split
 var _ = thrift.ZERO
 
 {{! Typedefs }}

diff --git a/thrift/compiler/generate/templates/go/types/field_method_to_string.mustache b/thrift/compiler/generate/templates/go/types/field_method_to_string.mustache
diff --git a/thrift/compiler/generate/templates/go/types/struct_method_string.mustache b/thrift/compiler/generate/templates/go/types/struct_method_string.mustache
@@ -20,21 +20,6 @@
 
 }}
 func (x *{{struct:go_name}}) String() string {
-    {{!
-        NOTE: Go may invoke String() method on a nil pointer,
-        so an explicit nil check is required for safety.
-    }}
-    if x == nil {
-        return "<nil>"
-    }
-
-    var sb strings.Builder
-
-    sb.WriteString("{{struct:go_name}}({")
-    {{#struct:fields_sorted}}
-    sb.WriteString(fmt.Sprintf("{{field:go_name}}:%s{{^last?}} {{/last?}}", x.toString{{field:key_str}}()))
-    {{/struct:fields_sorted}}
-    sb.WriteString("})")
-
-    return sb.String()
+    return thrift.StructToString(reflect.ValueOf(x))
 }
+{{!newline}}
diff --git a/thrift/compiler/generate/templates/go/types/struct_methods.mustache b/thrift/compiler/generate/templates/go/types/struct_methods.mustache
@@ -56,13 +56,6 @@
 }}{{#struct:fields_sorted}}
 {{> types/field_method_read}}
 
-{{/struct:fields_sorted}}{{!
-
-  toString method.
-
-}}{{#struct:fields_sorted}}
-{{> types/field_method_to_string}}
-
 {{/struct:fields_sorted}}{{!
 
   DefaultGet method.

diff --git a/thrift/compiler/lib/go/util.h b/thrift/compiler/lib/go/util.h
@@ -95,7 +95,6 @@ class codegen_data {
       {"thrift", 0},
       {"context", 0},
       {"fmt", 0},
-      {"strings", 0},
       {"sync", 0},
       {"metadata", 0},
       {"maps", 0},

diff --git a/thrift/compiler/test/fixtures/adapter/out/go/gen-go/module/svcs.go b/thrift/compiler/test/fixtures/adapter/out/go/gen-go/module/svcs.go
@@ -10,7 +10,6 @@ import (
     "context"
     "fmt"
     "reflect"
-    "strings"
 
     thrift "github.com/facebook/fbthrift/thrift/lib/go/thrift/types"
     metadata "github.com/facebook/fbthrift/thrift/lib/thrift/metadata"
@@ -20,7 +19,6 @@ import (
 var _ = context.Background
 var _ = fmt.Printf
 var _ = reflect.Ptr
-var _ = strings.Split
 var _ = thrift.ZERO
 var _ = metadata.GoUnusedProtection__