Exclude unions form default values

Summary: Union fields should remain uninitialized in the constructor. Reviewed By: leoleovich Differential Revision: D45885017 fbshipit-source-id: 384ebffec5b60dd550a6357fb5aaa7eaa6d9cffb
paulbiss · May 17, 2023 · 57df0a2 · 57df0a2
1 parent fa232ac
commit 57df0a2
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 94 deletions.
diff --git a/...d-party/thrift/src/thrift/compiler/generate/templates/go/types/struct_method_new.mustache b/...d-party/thrift/src/thrift/compiler/generate/templates/go/types/struct_method_new.mustache
@@ -21,6 +21,7 @@
 }}
 func {{struct:go_qualified_new_func}}() *{{struct:go_name}} {
     return (&{{struct:go_name}}{}){{!
+      }}{{^struct:union?}}{{!
       }}{{#struct:fields}}{{!
 
         // Fields with given default values.
@@ -46,6 +47,7 @@ func {{struct:go_qualified_new_func}}() *{{struct:go_name}} {
         }}){{/field:optional?}}{{!
         }}{{/field:value}}{{!
 
-      }}{{/struct:fields}}
+      }}{{/struct:fields}}{{!
+      }}{{/struct:union?}}
 }
 {{!newline}}
diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/adapter/gen-go_mstch/module/types.go b/third-party/thrift/src/thrift/compiler/test/fixtures/adapter/gen-go_mstch/module/types.go
diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/basic/gen-go_mstch/module/types.go b/third-party/thrift/src/thrift/compiler/test/fixtures/basic/gen-go_mstch/module/types.go
diff --git a/...party/thrift/src/thrift/compiler/test/fixtures/complex-union/gen-go_mstch/module/types.go b/...party/thrift/src/thrift/compiler/test/fixtures/complex-union/gen-go_mstch/module/types.go
diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/constants/gen-go_mstch/module/types.go b/third-party/thrift/src/thrift/compiler/test/fixtures/constants/gen-go_mstch/module/types.go
diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/doctext/gen-go_mstch/module/types.go b/third-party/thrift/src/thrift/compiler/test/fixtures/doctext/gen-go_mstch/module/types.go
diff --git a/...arty/thrift/src/thrift/compiler/test/fixtures/no-legacy-apis/gen-go_mstch/module/types.go b/...arty/thrift/src/thrift/compiler/test/fixtures/no-legacy-apis/gen-go_mstch/module/types.go
diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/patch/gen-go_mstch/module/types.go b/third-party/thrift/src/thrift/compiler/test/fixtures/patch/gen-go_mstch/module/types.go
diff --git a/.../src/thrift/compiler/test/fixtures/patch/gen-go_mstch/thrift/lib/thrift/standard/types.go b/.../src/thrift/compiler/test/fixtures/patch/gen-go_mstch/thrift/lib/thrift/standard/types.go
diff --git a/...ty/thrift/src/thrift/compiler/test/fixtures/terse_write/gen-go_mstch/terse_write/types.go b/...ty/thrift/src/thrift/compiler/test/fixtures/terse_write/gen-go_mstch/terse_write/types.go