string typedef: Fix fmt import and return type bugs (#568)

PR (#554) introduced an optimization for the String() method of typedefs. There are two issues with this change: - Since the "fmt" import was global, if fmt.Sprint was dropped from the typedef code generation the import would be unused. - Using compiled.RootTypeSpec for isStringType results in situations where a non-string type is return from a String() function resulting in uncompilable code. func(v StringReDef) String() string { x := (stringdef.StringDef)(v) return x } This happens when a type is a typedef of another string typedef. I've added generated code cases to demonstrate and verify the corrected behavior.
thriftrw · Apr 6, 2023 · cec3b68 · cec3b68
1 parent 51abcb3
commit cec3b68
Show file tree

Hide file tree

Showing 12 changed files with 168 additions and 7 deletions.
diff --git a/gen/internal/tests/collision/collision.go b/gen/internal/tests/collision/collision.go
diff --git a/gen/internal/tests/nozap/nozap.go b/gen/internal/tests/nozap/nozap.go
diff --git a/gen/internal/tests/services/services.go b/gen/internal/tests/services/services.go
diff --git a/gen/internal/tests/set_to_slice/set_to_slice.go b/gen/internal/tests/set_to_slice/set_to_slice.go
diff --git a/gen/internal/tests/stringdef/stringdef.go b/gen/internal/tests/stringdef/stringdef.go
diff --git a/gen/internal/tests/structs/structs.go b/gen/internal/tests/structs/structs.go
diff --git a/gen/internal/tests/thrift/stringdef.thrift b/gen/internal/tests/thrift/stringdef.thrift
@@ -0,0 +1 @@
+typedef string StringDef
diff --git a/gen/internal/tests/thrift/typedefs.thrift b/gen/internal/tests/thrift/typedefs.thrift
@@ -1,5 +1,6 @@
 include "./structs.thrift"
 include "./enums.thrift"
+include "./stringdef.thrift"
 
 /**
  * Number of seconds since epoch.
@@ -9,6 +10,8 @@ include "./enums.thrift"
 typedef i64 Timestamp  // alias of primitive
 typedef string State
 
+typedef stringdef.StringDef StringReDef // alias of an alias of a primitive
+
 typedef i128 UUID  // alias of struct
 
 typedef UUID MyUUID // alias of alias

diff --git a/gen/internal/tests/typedefs/typedefs.go b/gen/internal/tests/typedefs/typedefs.go
diff --git a/gen/internal/tests/uuid_conflict/uuid_conflict.go b/gen/internal/tests/uuid_conflict/uuid_conflict.go