From 8837a25b6f63ca7ef273db7e4b02294e843c8389 Mon Sep 17 00:00:00 2001
From: Ryan Hang <rhang@uber.com>
Date: Mon, 3 Apr 2023 22:11:06 -0700
Subject: [PATCH 1/5] Preparing release v1.30.0

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b4e4257..ca6b23ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [1.30.0] - 2023-04-04
 ### Added
 - AddTemplate template option.
 - thriftbreak: support for changed types, new files, and optional JSON output.
@@ -434,7 +434,7 @@ this release.
 ### Added
 - Initial release.
 
-[Unreleased]: https://github.com/thriftrw/thriftrw-go/compare/v1.29.2...HEAD
+[1.30.0]: https://github.com/thriftrw/thriftrw-go/compare/v1.29.2...v1.30.0
 [1.29.2]: https://github.com/thriftrw/thriftrw-go/compare/v1.29.1...v1.29.2
 [1.29.1]: https://github.com/thriftrw/thriftrw-go/compare/v1.29.0...v1.29.1
 [1.29.0]: https://github.com/thriftrw/thriftrw-go/compare/v1.28.0...v1.29.0

From cec3b68cf9b4971ef26e42f4d97ab873c7af7fc8 Mon Sep 17 00:00:00 2001
From: r-hang <rhang@uber.com>
Date: Wed, 5 Apr 2023 16:24:25 -0700
Subject: [PATCH 2/5] 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.
---
 gen/internal/tests/collision/collision.go     |  2 +
 gen/internal/tests/nozap/nozap.go             |  3 +
 gen/internal/tests/services/services.go       |  2 +-
 .../tests/set_to_slice/set_to_slice.go        |  6 ++
 gen/internal/tests/stringdef/stringdef.go     | 69 ++++++++++++++++
 gen/internal/tests/structs/structs.go         |  2 +
 gen/internal/tests/thrift/stringdef.thrift    |  1 +
 gen/internal/tests/thrift/typedefs.thrift     |  3 +
 gen/internal/tests/typedefs/typedefs.go       | 79 ++++++++++++++++++-
 .../tests/uuid_conflict/uuid_conflict.go      |  2 +-
 gen/typedef.go                                |  4 +-
 plugin/api/api.go                             |  2 +
 12 files changed, 168 insertions(+), 7 deletions(-)
 create mode 100644 gen/internal/tests/stringdef/stringdef.go
 create mode 100644 gen/internal/tests/thrift/stringdef.thrift

diff --git a/gen/internal/tests/collision/collision.go b/gen/internal/tests/collision/collision.go
index 92a152a6..33bac909 100644
--- a/gen/internal/tests/collision/collision.go
+++ b/gen/internal/tests/collision/collision.go
@@ -673,6 +673,7 @@ func (v LittlePotatoe) ToWire() (wire.Value, error) {
 // String returns a readable string representation of LittlePotatoe.
 func (v LittlePotatoe) String() string {
 	x := (int64)(v)
+
 	return fmt.Sprint(x)
 }
 
@@ -2511,6 +2512,7 @@ func (v LittlePotatoe2) ToWire() (wire.Value, error) {
 // String returns a readable string representation of LittlePotatoe2.
 func (v LittlePotatoe2) String() string {
 	x := (float64)(v)
+
 	return fmt.Sprint(x)
 }
 
diff --git a/gen/internal/tests/nozap/nozap.go b/gen/internal/tests/nozap/nozap.go
index f8bb037b..7b31c012 100644
--- a/gen/internal/tests/nozap/nozap.go
+++ b/gen/internal/tests/nozap/nozap.go
@@ -1373,6 +1373,7 @@ func (v *Primitives) ToWire() (wire.Value, error) {
 // String returns a readable string representation of Primitives.
 func (v *Primitives) String() string {
 	x := (*PrimitiveRequiredStruct)(v)
+
 	return fmt.Sprint(x)
 }
 
@@ -1412,6 +1413,7 @@ func (v StringList) ToWire() (wire.Value, error) {
 // String returns a readable string representation of StringList.
 func (v StringList) String() string {
 	x := ([]string)(v)
+
 	return fmt.Sprint(x)
 }
 
@@ -1598,6 +1600,7 @@ func (v StringMap) ToWire() (wire.Value, error) {
 // String returns a readable string representation of StringMap.
 func (v StringMap) String() string {
 	x := (map[string]string)(v)
+
 	return fmt.Sprint(x)
 }
 
diff --git a/gen/internal/tests/services/services.go b/gen/internal/tests/services/services.go
index 8f338cf4..60f0ce88 100644
--- a/gen/internal/tests/services/services.go
+++ b/gen/internal/tests/services/services.go
@@ -537,7 +537,7 @@ func (v Key) ToWire() (wire.Value, error) {
 // String returns a readable string representation of Key.
 func (v Key) String() string {
 	x := (string)(v)
-	return x
+	return (string)(x)
 }
 
 func (v Key) Encode(sw stream.Writer) error {
diff --git a/gen/internal/tests/set_to_slice/set_to_slice.go b/gen/internal/tests/set_to_slice/set_to_slice.go
index 61cbecfb..0cd9b6af 100644
--- a/gen/internal/tests/set_to_slice/set_to_slice.go
+++ b/gen/internal/tests/set_to_slice/set_to_slice.go
@@ -63,6 +63,7 @@ func (v AnotherStringList) ToWire() (wire.Value, error) {
 // String returns a readable string representation of AnotherStringList.
 func (v AnotherStringList) String() string {
 	x := (MyStringList)(v)
+
 	return fmt.Sprint(x)
 }
 
@@ -1673,6 +1674,7 @@ func (v FooList) ToWire() (wire.Value, error) {
 // String returns a readable string representation of FooList.
 func (v FooList) String() string {
 	x := ([]*Foo)(v)
+
 	return fmt.Sprint(x)
 }
 
@@ -1720,6 +1722,7 @@ func (v MyStringList) ToWire() (wire.Value, error) {
 // String returns a readable string representation of MyStringList.
 func (v MyStringList) String() string {
 	x := (StringList)(v)
+
 	return fmt.Sprint(x)
 }
 
@@ -1767,6 +1770,7 @@ func (v StringList) ToWire() (wire.Value, error) {
 // String returns a readable string representation of StringList.
 func (v StringList) String() string {
 	x := ([]string)(v)
+
 	return fmt.Sprint(x)
 }
 
@@ -1814,6 +1818,7 @@ func (v StringListList) ToWire() (wire.Value, error) {
 // String returns a readable string representation of StringListList.
 func (v StringListList) String() string {
 	x := ([][]string)(v)
+
 	return fmt.Sprint(x)
 }
 
@@ -1982,6 +1987,7 @@ func (v StringSet) ToWire() (wire.Value, error) {
 // String returns a readable string representation of StringSet.
 func (v StringSet) String() string {
 	x := (map[string]struct{})(v)
+
 	return fmt.Sprint(x)
 }
 
diff --git a/gen/internal/tests/stringdef/stringdef.go b/gen/internal/tests/stringdef/stringdef.go
new file mode 100644
index 00000000..52979598
--- /dev/null
+++ b/gen/internal/tests/stringdef/stringdef.go
@@ -0,0 +1,69 @@
+// Code generated by thriftrw v1.30.0. DO NOT EDIT.
+// @generated
+
+package stringdef
+
+import (
+	stream "go.uber.org/thriftrw/protocol/stream"
+	thriftreflect "go.uber.org/thriftrw/thriftreflect"
+	wire "go.uber.org/thriftrw/wire"
+)
+
+type StringDef string
+
+// StringDefPtr returns a pointer to a StringDef
+func (v StringDef) Ptr() *StringDef {
+	return &v
+}
+
+// ToWire translates StringDef into a Thrift-level intermediate
+// representation. This intermediate representation may be serialized
+// into bytes using a ThriftRW protocol implementation.
+func (v StringDef) ToWire() (wire.Value, error) {
+	x := (string)(v)
+	return wire.NewValueString(x), error(nil)
+}
+
+// String returns a readable string representation of StringDef.
+func (v StringDef) String() string {
+	x := (string)(v)
+	return (string)(x)
+}
+
+func (v StringDef) Encode(sw stream.Writer) error {
+	x := (string)(v)
+	return sw.WriteString(x)
+}
+
+// FromWire deserializes StringDef from its Thrift-level
+// representation. The Thrift-level representation may be obtained
+// from a ThriftRW protocol implementation.
+func (v *StringDef) FromWire(w wire.Value) error {
+	x, err := w.GetString(), error(nil)
+	*v = (StringDef)(x)
+	return err
+}
+
+// Decode deserializes StringDef directly off the wire.
+func (v *StringDef) Decode(sr stream.Reader) error {
+	x, err := sr.ReadString()
+	*v = (StringDef)(x)
+	return err
+}
+
+// Equals returns true if this StringDef is equal to the provided
+// StringDef.
+func (lhs StringDef) Equals(rhs StringDef) bool {
+	return ((string)(lhs) == (string)(rhs))
+}
+
+// ThriftModule represents the IDL file used to generate this package.
+var ThriftModule = &thriftreflect.ThriftModule{
+	Name:     "stringdef",
+	Package:  "go.uber.org/thriftrw/gen/internal/tests/stringdef",
+	FilePath: "stringdef.thrift",
+	SHA1:     "313c35c10839a4442eb270df8e6acda528af9293",
+	Raw:      rawIDL,
+}
+
+const rawIDL = "typedef string StringDef\n"
diff --git a/gen/internal/tests/structs/structs.go b/gen/internal/tests/structs/structs.go
index c0253e84..15b383d0 100644
--- a/gen/internal/tests/structs/structs.go
+++ b/gen/internal/tests/structs/structs.go
@@ -3384,6 +3384,7 @@ func (v *List) ToWire() (wire.Value, error) {
 // String returns a readable string representation of List.
 func (v *List) String() string {
 	x := (*Node)(v)
+
 	return fmt.Sprint(x)
 }
 
@@ -7994,6 +7995,7 @@ func (v UserMap) ToWire() (wire.Value, error) {
 // String returns a readable string representation of UserMap.
 func (v UserMap) String() string {
 	x := (map[string]*User)(v)
+
 	return fmt.Sprint(x)
 }
 
diff --git a/gen/internal/tests/thrift/stringdef.thrift b/gen/internal/tests/thrift/stringdef.thrift
new file mode 100644
index 00000000..fba1a8ef
--- /dev/null
+++ 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
index fb24db14..5868835f 100644
--- 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
index b05a3973..ef2352d1 100644
--- a/gen/internal/tests/typedefs/typedefs.go
+++ b/gen/internal/tests/typedefs/typedefs.go
@@ -10,6 +10,7 @@ import (
 	fmt "fmt"
 	multierr "go.uber.org/multierr"
 	enums "go.uber.org/thriftrw/gen/internal/tests/enums"
+	stringdef "go.uber.org/thriftrw/gen/internal/tests/stringdef"
 	structs "go.uber.org/thriftrw/gen/internal/tests/structs"
 	stream "go.uber.org/thriftrw/protocol/stream"
 	thriftreflect "go.uber.org/thriftrw/thriftreflect"
@@ -165,6 +166,7 @@ func (v BinarySet) ToWire() (wire.Value, error) {
 // String returns a readable string representation of BinarySet.
 func (v BinarySet) String() string {
 	x := ([][]byte)(v)
+
 	return fmt.Sprint(x)
 }
 
@@ -722,6 +724,7 @@ func (v EdgeMap) String() string {
 		Key   *structs.Edge
 		Value *structs.Edge
 	})(v)
+
 	return fmt.Sprint(x)
 }
 
@@ -1230,6 +1233,7 @@ func (v EventGroup) ToWire() (wire.Value, error) {
 // String returns a readable string representation of EventGroup.
 func (v EventGroup) String() string {
 	x := ([]*Event)(v)
+
 	return fmt.Sprint(x)
 }
 
@@ -1423,6 +1427,7 @@ func (v FrameGroup) ToWire() (wire.Value, error) {
 // String returns a readable string representation of FrameGroup.
 func (v FrameGroup) String() string {
 	x := ([]*structs.Frame)(v)
+
 	return fmt.Sprint(x)
 }
 
@@ -1487,6 +1492,7 @@ func (v MyEnum) ToWire() (wire.Value, error) {
 // String returns a readable string representation of MyEnum.
 func (v MyEnum) String() string {
 	x := (enums.EnumWithValues)(v)
+
 	return fmt.Sprint(x)
 }
 
@@ -1534,6 +1540,7 @@ func (v *MyUUID) ToWire() (wire.Value, error) {
 // String returns a readable string representation of MyUUID.
 func (v *MyUUID) String() string {
 	x := (*UUID)(v)
+
 	return fmt.Sprint(x)
 }
 
@@ -1577,6 +1584,7 @@ func (v PDF) ToWire() (wire.Value, error) {
 // String returns a readable string representation of PDF.
 func (v PDF) String() string {
 	x := ([]byte)(v)
+
 	return fmt.Sprint(x)
 }
 
@@ -1870,6 +1878,7 @@ func (v PointMap) String() string {
 		Key   *structs.Point
 		Value *structs.Point
 	})(v)
+
 	return fmt.Sprint(x)
 }
 
@@ -1934,7 +1943,7 @@ func (v State) ToWire() (wire.Value, error) {
 // String returns a readable string representation of State.
 func (v State) String() string {
 	x := (string)(v)
-	return x
+	return (string)(x)
 }
 
 func (v State) Encode(sw stream.Writer) error {
@@ -2131,6 +2140,7 @@ func (v StateMap) ToWire() (wire.Value, error) {
 // String returns a readable string representation of StateMap.
 func (v StateMap) String() string {
 	x := (map[State]int64)(v)
+
 	return fmt.Sprint(x)
 }
 
@@ -2165,6 +2175,66 @@ func (v StateMap) MarshalLogObject(enc zapcore.ObjectEncoder) error {
 	return ((_Map_State_I64_Zapper)((map[State]int64)(v))).MarshalLogObject(enc)
 }
 
+func _StringDef_Read(w wire.Value) (stringdef.StringDef, error) {
+	var x stringdef.StringDef
+	err := x.FromWire(w)
+	return x, err
+}
+
+func _StringDef_Decode(sr stream.Reader) (stringdef.StringDef, error) {
+	var x stringdef.StringDef
+	err := x.Decode(sr)
+	return x, err
+}
+
+type StringReDef stringdef.StringDef
+
+// StringReDefPtr returns a pointer to a StringReDef
+func (v StringReDef) Ptr() *StringReDef {
+	return &v
+}
+
+// ToWire translates StringReDef into a Thrift-level intermediate
+// representation. This intermediate representation may be serialized
+// into bytes using a ThriftRW protocol implementation.
+func (v StringReDef) ToWire() (wire.Value, error) {
+	x := (stringdef.StringDef)(v)
+	return x.ToWire()
+}
+
+// String returns a readable string representation of StringReDef.
+func (v StringReDef) String() string {
+	x := (stringdef.StringDef)(v)
+	return (string)(x)
+}
+
+func (v StringReDef) Encode(sw stream.Writer) error {
+	x := (stringdef.StringDef)(v)
+	return x.Encode(sw)
+}
+
+// FromWire deserializes StringReDef from its Thrift-level
+// representation. The Thrift-level representation may be obtained
+// from a ThriftRW protocol implementation.
+func (v *StringReDef) FromWire(w wire.Value) error {
+	x, err := _StringDef_Read(w)
+	*v = (StringReDef)(x)
+	return err
+}
+
+// Decode deserializes StringReDef directly off the wire.
+func (v *StringReDef) Decode(sr stream.Reader) error {
+	x, err := _StringDef_Decode(sr)
+	*v = (StringReDef)(x)
+	return err
+}
+
+// Equals returns true if this StringReDef is equal to the provided
+// StringReDef.
+func (lhs StringReDef) Equals(rhs StringReDef) bool {
+	return ((stringdef.StringDef)(lhs) == (stringdef.StringDef)(rhs))
+}
+
 // Number of seconds since epoch.
 //
 // Deprecated: Use ISOTime instead.
@@ -2186,6 +2256,7 @@ func (v Timestamp) ToWire() (wire.Value, error) {
 // String returns a readable string representation of Timestamp.
 func (v Timestamp) String() string {
 	x := (int64)(v)
+
 	return fmt.Sprint(x)
 }
 
@@ -2789,6 +2860,7 @@ func (v *UUID) ToWire() (wire.Value, error) {
 // String returns a readable string representation of UUID.
 func (v *UUID) String() string {
 	x := (*I128)(v)
+
 	return fmt.Sprint(x)
 }
 
@@ -3085,12 +3157,13 @@ var ThriftModule = &thriftreflect.ThriftModule{
 	Name:     "typedefs",
 	Package:  "go.uber.org/thriftrw/gen/internal/tests/typedefs",
 	FilePath: "typedefs.thrift",
-	SHA1:     "333cb75491c993220f7695108fa91a4a8a299a48",
+	SHA1:     "49d5bbfb109fd427820d1c1593fe41677b13dd69",
 	Includes: []*thriftreflect.ThriftModule{
 		enums.ThriftModule,
+		stringdef.ThriftModule,
 		structs.ThriftModule,
 	},
 	Raw: rawIDL,
 }
 
-const rawIDL = "include \"./structs.thrift\"\ninclude \"./enums.thrift\"\n\n/**\n * Number of seconds since epoch.\n *\n * Deprecated: Use ISOTime instead.\n */\ntypedef i64 Timestamp  // alias of primitive\ntypedef string State\n\ntypedef i128 UUID  // alias of struct\n\ntypedef UUID MyUUID // alias of alias\n\ntypedef list<Event> EventGroup  // alias fo collection\n\nstruct i128 {\n    1: required i64 high\n    2: required i64 low\n}\n\nstruct Event {\n    1: required UUID uuid  // required typedef\n    2: optional Timestamp time  // optional typedef\n}\n\nstruct TransitiveTypedefField {\n    1: required MyUUID defUUID  // required typedef of alias\n}\n\nstruct DefaultPrimitiveTypedef {\n    1: optional State state = \"hello\"\n}\n\nstruct Transition {\n    1: required State fromState\n    2: required State toState\n    3: optional EventGroup events\n}\n\ntypedef binary PDF  // alias of []byte\n\ntypedef set<structs.Frame> FrameGroup\n\ntypedef map<structs.Point, structs.Point> PointMap\n\ntypedef set<binary> BinarySet\n\ntypedef map<structs.Edge, structs.Edge> EdgeMap\n\ntypedef map<State, i64> StateMap\n\ntypedef enums.EnumWithValues MyEnum\n"
+const rawIDL = "include \"./structs.thrift\"\ninclude \"./enums.thrift\"\ninclude \"./stringdef.thrift\"\n\n/**\n * Number of seconds since epoch.\n *\n * Deprecated: Use ISOTime instead.\n */\ntypedef i64 Timestamp  // alias of primitive\ntypedef string State\n\ntypedef stringdef.StringDef StringReDef // alias of an alias of a primitive\n\ntypedef i128 UUID  // alias of struct\n\ntypedef UUID MyUUID // alias of alias\n\ntypedef list<Event> EventGroup  // alias fo collection\n\nstruct i128 {\n    1: required i64 high\n    2: required i64 low\n}\n\nstruct Event {\n    1: required UUID uuid  // required typedef\n    2: optional Timestamp time  // optional typedef\n}\n\nstruct TransitiveTypedefField {\n    1: required MyUUID defUUID  // required typedef of alias\n}\n\nstruct DefaultPrimitiveTypedef {\n    1: optional State state = \"hello\"\n}\n\nstruct Transition {\n    1: required State fromState\n    2: required State toState\n    3: optional EventGroup events\n}\n\ntypedef binary PDF  // alias of []byte\n\ntypedef set<structs.Frame> FrameGroup\n\ntypedef map<structs.Point, structs.Point> PointMap\n\ntypedef set<binary> BinarySet\n\ntypedef map<structs.Edge, structs.Edge> EdgeMap\n\ntypedef map<State, i64> StateMap\n\ntypedef enums.EnumWithValues MyEnum\n"
diff --git a/gen/internal/tests/uuid_conflict/uuid_conflict.go b/gen/internal/tests/uuid_conflict/uuid_conflict.go
index 0588f31b..36e813bc 100644
--- a/gen/internal/tests/uuid_conflict/uuid_conflict.go
+++ b/gen/internal/tests/uuid_conflict/uuid_conflict.go
@@ -33,7 +33,7 @@ func (v UUID) ToWire() (wire.Value, error) {
 // String returns a readable string representation of UUID.
 func (v UUID) String() string {
 	x := (string)(v)
-	return x
+	return (string)(x)
 }
 
 func (v UUID) Encode(sw stream.Writer) error {
diff --git a/gen/typedef.go b/gen/typedef.go
index ed1447d4..32ad419c 100644
--- a/gen/typedef.go
+++ b/gen/typedef.go
@@ -83,7 +83,6 @@ func (t *typedefGenerator) Decoder(g Generator, spec *compile.TypedefSpec) (stri
 func typedef(g Generator, spec *compile.TypedefSpec) error {
 	err := g.DeclareFromTemplate(
 		`
-		<$fmt := import "fmt">
 		<$stream := import "go.uber.org/thriftrw/protocol/stream">
 		<$wire := import "go.uber.org/thriftrw/wire">
 		<$typedefType := typeReference .>
@@ -113,8 +112,9 @@ func typedef(g Generator, spec *compile.TypedefSpec) error {
 		func (<$v> <$typedefType>) String() string {
 			<$x> := (<typeReference .Target>)(<$v>)
 			<if isStringType .Target ->
-				return <$x>
+				return (string)(<$x>)
 			<- else ->
+				<$fmt := import "fmt">
 				return <$fmt>.Sprint(<$x>)
 			<- end>
 		}
diff --git a/plugin/api/api.go b/plugin/api/api.go
index a14c0a54..4d2186fa 100644
--- a/plugin/api/api.go
+++ b/plugin/api/api.go
@@ -4077,6 +4077,7 @@ func (v ModuleID) ToWire() (wire.Value, error) {
 // String returns a readable string representation of ModuleID.
 func (v ModuleID) String() string {
 	x := (int32)(v)
+
 	return fmt.Sprint(x)
 }
 
@@ -4797,6 +4798,7 @@ func (v ServiceID) ToWire() (wire.Value, error) {
 // String returns a readable string representation of ServiceID.
 func (v ServiceID) String() string {
 	x := (int32)(v)
+
 	return fmt.Sprint(x)
 }
 

From 36f2477e5cfc909c2377b5e44cba2c6ec60daccc Mon Sep 17 00:00:00 2001
From: Ryan Hang <rhang@uber.com>
Date: Thu, 6 Apr 2023 11:22:31 -0700
Subject: [PATCH 3/5] Release v1.30.0 (#569)

This commit serves as the v1.30.0 release.

The commit merged in (#567) was never tagged and released as v1.30.0 as
a bug was found in that commit before we tagged a release for it. This commit
contains the fix for the aforementioned bug.

This release contains the following changes:
- AddTemplate template option.
- thriftbreak: support for changed types, new files, and optional JSON output.
- String() performance improvements for string type definitions.
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca6b23ac..a18d0f06 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [1.30.0] - 2023-04-04
+## [1.30.0] - 2023-04-06
 ### Added
 - AddTemplate template option.
 - thriftbreak: support for changed types, new files, and optional JSON output.

From 93c59ebf3785dfb2294e8a29ac0a8b15b74ee008 Mon Sep 17 00:00:00 2001
From: Ryan Hang <rhang@uber.com>
Date: Thu, 8 Jun 2023 19:11:53 -0700
Subject: [PATCH 4/5] Preparing release v1.31.0

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb0bd19a..d84df79a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [1.31.0] - 2023-06-09
 ### Changed
 - StreamReader ReadString() and WriteString() performance improvements.
 
@@ -438,7 +438,7 @@ this release.
 ### Added
 - Initial release.
 
-[Unreleased]: https://github.com/thriftrw/thriftrw-go/compare/v1.30.0...HEAD
+[1.31.0]: https://github.com/thriftrw/thriftrw-go/compare/v1.30.0...v1.31.0
 [1.30.0]: https://github.com/thriftrw/thriftrw-go/compare/v1.29.2...v1.30.0
 [1.29.2]: https://github.com/thriftrw/thriftrw-go/compare/v1.29.1...v1.29.2
 [1.29.1]: https://github.com/thriftrw/thriftrw-go/compare/v1.29.0...v1.29.1

From f409fbf6154fedf43a0c4d76b0a9852ef665df07 Mon Sep 17 00:00:00 2001
From: Ryan Hang <rhang@uber.com>
Date: Fri, 9 Jun 2023 11:27:39 -0700
Subject: [PATCH 5/5] Back to development

---
 CHANGELOG.md                                                  | 4 ++++
 gen/internal/tests/collision/collision.go                     | 2 +-
 gen/internal/tests/constants/constants.go                     | 2 +-
 gen/internal/tests/containers/containers.go                   | 2 +-
 .../enum-text-marshal-strict/enum-text-marshal-strict.go      | 2 +-
 gen/internal/tests/enum_conflict/enum_conflict.go             | 2 +-
 gen/internal/tests/enums/enums.go                             | 2 +-
 gen/internal/tests/exceptions/exceptions.go                   | 2 +-
 gen/internal/tests/hyphenated-file/hyphenated-file.go         | 2 +-
 gen/internal/tests/hyphenated_file/hyphenated_file.go         | 2 +-
 gen/internal/tests/non_hyphenated/non_hyphenated.go           | 2 +-
 gen/internal/tests/nozap/nozap.go                             | 2 +-
 gen/internal/tests/other_constants/other_constants.go         | 2 +-
 gen/internal/tests/services/services.go                       | 2 +-
 gen/internal/tests/set_to_slice/set_to_slice.go               | 2 +-
 gen/internal/tests/stringdef/stringdef.go                     | 2 +-
 gen/internal/tests/structs/structs.go                         | 2 +-
 gen/internal/tests/typedefs/typedefs.go                       | 2 +-
 gen/internal/tests/unions/unions.go                           | 2 +-
 gen/internal/tests/uuid_conflict/uuid_conflict.go             | 2 +-
 internal/envelope/exception/exception.go                      | 2 +-
 plugin/api/api.go                                             | 2 +-
 version/version.go                                            | 2 +-
 23 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d84df79a..4dd2d512 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+- No changes yet.
+
 ## [1.31.0] - 2023-06-09
 ### Changed
 - StreamReader ReadString() and WriteString() performance improvements.
@@ -438,6 +441,7 @@ this release.
 ### Added
 - Initial release.
 
+[Unreleased]: https://github.com/thriftrw/thriftrw-go/compare/v1.31.0...HEAD
 [1.31.0]: https://github.com/thriftrw/thriftrw-go/compare/v1.30.0...v1.31.0
 [1.30.0]: https://github.com/thriftrw/thriftrw-go/compare/v1.29.2...v1.30.0
 [1.29.2]: https://github.com/thriftrw/thriftrw-go/compare/v1.29.1...v1.29.2
diff --git a/gen/internal/tests/collision/collision.go b/gen/internal/tests/collision/collision.go
index cbe70535..0258eca3 100644
--- a/gen/internal/tests/collision/collision.go
+++ b/gen/internal/tests/collision/collision.go
@@ -1,4 +1,4 @@
-// Code generated by thriftrw v1.31.0. DO NOT EDIT.
+// Code generated by thriftrw v1.32.0. DO NOT EDIT.
 // @generated
 
 package collision
diff --git a/gen/internal/tests/constants/constants.go b/gen/internal/tests/constants/constants.go
index 7558c49b..b8ecffdc 100644
--- a/gen/internal/tests/constants/constants.go
+++ b/gen/internal/tests/constants/constants.go
@@ -1,4 +1,4 @@
-// Code generated by thriftrw v1.31.0. DO NOT EDIT.
+// Code generated by thriftrw v1.32.0. DO NOT EDIT.
 // @generated
 
 package constants
diff --git a/gen/internal/tests/containers/containers.go b/gen/internal/tests/containers/containers.go
index fc25faf2..5c377265 100644
--- a/gen/internal/tests/containers/containers.go
+++ b/gen/internal/tests/containers/containers.go
@@ -1,4 +1,4 @@
-// Code generated by thriftrw v1.31.0. DO NOT EDIT.
+// Code generated by thriftrw v1.32.0. DO NOT EDIT.
 // @generated
 
 package containers
diff --git a/gen/internal/tests/enum-text-marshal-strict/enum-text-marshal-strict.go b/gen/internal/tests/enum-text-marshal-strict/enum-text-marshal-strict.go
index c59af0e0..f1b8d4f8 100644
--- a/gen/internal/tests/enum-text-marshal-strict/enum-text-marshal-strict.go
+++ b/gen/internal/tests/enum-text-marshal-strict/enum-text-marshal-strict.go
@@ -1,4 +1,4 @@
-// Code generated by thriftrw v1.31.0. DO NOT EDIT.
+// Code generated by thriftrw v1.32.0. DO NOT EDIT.
 // @generated
 
 package enum_text_marshal_strict
diff --git a/gen/internal/tests/enum_conflict/enum_conflict.go b/gen/internal/tests/enum_conflict/enum_conflict.go
index eceade88..4331c0fb 100644
--- a/gen/internal/tests/enum_conflict/enum_conflict.go
+++ b/gen/internal/tests/enum_conflict/enum_conflict.go
@@ -1,4 +1,4 @@
-// Code generated by thriftrw v1.31.0. DO NOT EDIT.
+// Code generated by thriftrw v1.32.0. DO NOT EDIT.
 // @generated
 
 package enum_conflict
diff --git a/gen/internal/tests/enums/enums.go b/gen/internal/tests/enums/enums.go
index ee836d1d..4ebf2a40 100644
--- a/gen/internal/tests/enums/enums.go
+++ b/gen/internal/tests/enums/enums.go
@@ -1,4 +1,4 @@
-// Code generated by thriftrw v1.31.0. DO NOT EDIT.
+// Code generated by thriftrw v1.32.0. DO NOT EDIT.
 // @generated
 
 package enums
diff --git a/gen/internal/tests/exceptions/exceptions.go b/gen/internal/tests/exceptions/exceptions.go
index b6389625..89bd45bf 100644
--- a/gen/internal/tests/exceptions/exceptions.go
+++ b/gen/internal/tests/exceptions/exceptions.go
@@ -1,4 +1,4 @@
-// Code generated by thriftrw v1.31.0. DO NOT EDIT.
+// Code generated by thriftrw v1.32.0. DO NOT EDIT.
 // @generated
 
 package exceptions
diff --git a/gen/internal/tests/hyphenated-file/hyphenated-file.go b/gen/internal/tests/hyphenated-file/hyphenated-file.go
index 1a3daf77..d1ef92e8 100644
--- a/gen/internal/tests/hyphenated-file/hyphenated-file.go
+++ b/gen/internal/tests/hyphenated-file/hyphenated-file.go
@@ -1,4 +1,4 @@
-// Code generated by thriftrw v1.31.0. DO NOT EDIT.
+// Code generated by thriftrw v1.32.0. DO NOT EDIT.
 // @generated
 
 package hyphenated_file
diff --git a/gen/internal/tests/hyphenated_file/hyphenated_file.go b/gen/internal/tests/hyphenated_file/hyphenated_file.go
index 3f4f3a7a..1ff4852c 100644
--- a/gen/internal/tests/hyphenated_file/hyphenated_file.go
+++ b/gen/internal/tests/hyphenated_file/hyphenated_file.go
@@ -1,4 +1,4 @@
-// Code generated by thriftrw v1.31.0. DO NOT EDIT.
+// Code generated by thriftrw v1.32.0. DO NOT EDIT.
 // @generated
 
 package hyphenated_file
diff --git a/gen/internal/tests/non_hyphenated/non_hyphenated.go b/gen/internal/tests/non_hyphenated/non_hyphenated.go
index 31e605ef..223d34a4 100644
--- a/gen/internal/tests/non_hyphenated/non_hyphenated.go
+++ b/gen/internal/tests/non_hyphenated/non_hyphenated.go
@@ -1,4 +1,4 @@
-// Code generated by thriftrw v1.31.0. DO NOT EDIT.
+// Code generated by thriftrw v1.32.0. DO NOT EDIT.
 // @generated
 
 package non_hyphenated
diff --git a/gen/internal/tests/nozap/nozap.go b/gen/internal/tests/nozap/nozap.go
index 222157b7..632e6194 100644
--- a/gen/internal/tests/nozap/nozap.go
+++ b/gen/internal/tests/nozap/nozap.go
@@ -1,4 +1,4 @@
-// Code generated by thriftrw v1.31.0. DO NOT EDIT.
+// Code generated by thriftrw v1.32.0. DO NOT EDIT.
 // @generated
 
 package nozap
diff --git a/gen/internal/tests/other_constants/other_constants.go b/gen/internal/tests/other_constants/other_constants.go
index 0e920534..7baaa3a2 100644
--- a/gen/internal/tests/other_constants/other_constants.go
+++ b/gen/internal/tests/other_constants/other_constants.go
@@ -1,4 +1,4 @@
-// Code generated by thriftrw v1.31.0. DO NOT EDIT.
+// Code generated by thriftrw v1.32.0. DO NOT EDIT.
 // @generated
 
 package other_constants
diff --git a/gen/internal/tests/services/services.go b/gen/internal/tests/services/services.go
index 1ea5ba70..aa2fbdce 100644
--- a/gen/internal/tests/services/services.go
+++ b/gen/internal/tests/services/services.go
@@ -1,4 +1,4 @@
-// Code generated by thriftrw v1.31.0. DO NOT EDIT.
+// Code generated by thriftrw v1.32.0. DO NOT EDIT.
 // @generated
 
 package services
diff --git a/gen/internal/tests/set_to_slice/set_to_slice.go b/gen/internal/tests/set_to_slice/set_to_slice.go
index 221cdace..80d122fc 100644
--- a/gen/internal/tests/set_to_slice/set_to_slice.go
+++ b/gen/internal/tests/set_to_slice/set_to_slice.go
@@ -1,4 +1,4 @@
-// Code generated by thriftrw v1.31.0. DO NOT EDIT.
+// Code generated by thriftrw v1.32.0. DO NOT EDIT.
 // @generated
 
 package set_to_slice
diff --git a/gen/internal/tests/stringdef/stringdef.go b/gen/internal/tests/stringdef/stringdef.go
index d5a9f437..571f11cf 100644
--- a/gen/internal/tests/stringdef/stringdef.go
+++ b/gen/internal/tests/stringdef/stringdef.go
@@ -1,4 +1,4 @@
-// Code generated by thriftrw v1.31.0. DO NOT EDIT.
+// Code generated by thriftrw v1.32.0. DO NOT EDIT.
 // @generated
 
 package stringdef
diff --git a/gen/internal/tests/structs/structs.go b/gen/internal/tests/structs/structs.go
index 6c820c97..b1d8e938 100644
--- a/gen/internal/tests/structs/structs.go
+++ b/gen/internal/tests/structs/structs.go
@@ -1,4 +1,4 @@
-// Code generated by thriftrw v1.31.0. DO NOT EDIT.
+// Code generated by thriftrw v1.32.0. DO NOT EDIT.
 // @generated
 
 package structs
diff --git a/gen/internal/tests/typedefs/typedefs.go b/gen/internal/tests/typedefs/typedefs.go
index 79dc26ee..332664e8 100644
--- a/gen/internal/tests/typedefs/typedefs.go
+++ b/gen/internal/tests/typedefs/typedefs.go
@@ -1,4 +1,4 @@
-// Code generated by thriftrw v1.31.0. DO NOT EDIT.
+// Code generated by thriftrw v1.32.0. DO NOT EDIT.
 // @generated
 
 package typedefs
diff --git a/gen/internal/tests/unions/unions.go b/gen/internal/tests/unions/unions.go
index 706f3bfd..b5e59a97 100644
--- a/gen/internal/tests/unions/unions.go
+++ b/gen/internal/tests/unions/unions.go
@@ -1,4 +1,4 @@
-// Code generated by thriftrw v1.31.0. DO NOT EDIT.
+// Code generated by thriftrw v1.32.0. DO NOT EDIT.
 // @generated
 
 package unions
diff --git a/gen/internal/tests/uuid_conflict/uuid_conflict.go b/gen/internal/tests/uuid_conflict/uuid_conflict.go
index 21ea8c58..43cb35cd 100644
--- a/gen/internal/tests/uuid_conflict/uuid_conflict.go
+++ b/gen/internal/tests/uuid_conflict/uuid_conflict.go
@@ -1,4 +1,4 @@
-// Code generated by thriftrw v1.31.0. DO NOT EDIT.
+// Code generated by thriftrw v1.32.0. DO NOT EDIT.
 // @generated
 
 package uuid_conflict
diff --git a/internal/envelope/exception/exception.go b/internal/envelope/exception/exception.go
index a314621e..f0effb2e 100644
--- a/internal/envelope/exception/exception.go
+++ b/internal/envelope/exception/exception.go
@@ -1,4 +1,4 @@
-// Code generated by thriftrw v1.31.0. DO NOT EDIT.
+// Code generated by thriftrw v1.32.0. DO NOT EDIT.
 // @generated
 
 // Copyright (c) 2023 Uber Technologies, Inc.
diff --git a/plugin/api/api.go b/plugin/api/api.go
index fbe4e1d9..0062c0b3 100644
--- a/plugin/api/api.go
+++ b/plugin/api/api.go
@@ -1,4 +1,4 @@
-// Code generated by thriftrw v1.31.0. DO NOT EDIT.
+// Code generated by thriftrw v1.32.0. DO NOT EDIT.
 // @generated
 
 // Copyright (c) 2023 Uber Technologies, Inc.
diff --git a/version/version.go b/version/version.go
index 80bc489a..125efa34 100644
--- a/version/version.go
+++ b/version/version.go
@@ -21,4 +21,4 @@
 package version
 
 // Version is the current ThriftRW version.
-const Version = "1.31.0"
+const Version = "1.32.0"