Merge pull request #467 from thriftrw/robbert/release

Preparing release v1.26.0
thriftrw · Feb 18, 2021 · dc51c30 · dc51c30
2 parents 4c503ee + e086751
commit dc51c30
Show file tree

Hide file tree

Showing 28 changed files with 282 additions and 62 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,20 +4,27 @@ 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.26.0] - 2021-02-18
+### Changed
+- Codegeneration for typedefs now uses use generated `MarshalLog...` functions
+  where appropriate to avoid casting to a root go type from go packages of
+  transitive thrift dependencies.
+- Rewrote internal wire's unsafeStringToBytes to adhere to 1.16 vet check.
+
 ## [1.25.1] - 2021-01-04
 ### Fixed
-- Boolean fields with default value `false` now are sent over the wire. 
+- Boolean fields with default value `false` now are sent over the wire.
 
 ## [1.25.0] - 2020-09-09
 ### Added
 - Add RootModules field to api.GenerateServiceRequest.
 
 ## [1.24.0] - 2020-06-18
 ### Added
-- Generate `Default_*` methods that construct Thrift structs with defined 
-  default values pre-populated.  
+- Generate `Default_*` methods that construct Thrift structs with defined
+  default values pre-populated.
 
-### Changed  
+### Changed
 - gen: Redefine Options.Plugin as a struct usable outside go.uber.org/thriftrw.
 
 ### Fixed
@@ -350,7 +357,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Initial release.
 
-[Unreleased]: https://github.com/thriftrw/thriftrw-go/compare/v1.25.0...HEAD
+[1.26.0]: https://github.com/thriftrw/thriftrw-go/compare/v1.25.1...v1.26.0
 [1.25.1]: https://github.com/thriftrw/thriftrw-go/compare/v1.25.0...v1.25.1
 [1.25.0]: https://github.com/thriftrw/thriftrw-go/compare/v1.24.0...v1.25.0
 [1.24.0]: https://github.com/thriftrw/thriftrw-go/compare/v1.23.0...v1.24.0

diff --git a/RELEASE.md b/RELEASE.md
@@ -91,6 +91,7 @@ To release new versions of ThriftRW Go, follow these instructions.
 
         git checkout $BRANCH
         git merge master
+        git checkout -b back-to-dev
 
 14. Add a placeholder for the next version to CHANGELOG.md and a new link at
     the bottom.
@@ -122,7 +123,7 @@ To release new versions of ThriftRW Go, follow these instructions.
 
         make generate
 
-18. Commit and push your changes.
+18. Open a PR with your changes against `dev` to back to development.
 
-        git commit -a -m 'Back to development'
-        git push origin $BRANCH
+        git commit -am "Back to development"
+        hub pull-request -b dev --push
diff --git a/gen/generator.go b/gen/generator.go
@@ -245,6 +245,8 @@ func (g *generator) TextTemplate(s string, data interface{}, opts ...TemplateOpt
 		"isNotNil": func(val interface{}) bool {
 			return val != nil
 		},
+		"zapTypedefGenerateMarshaler":     curryGenerator(g.z.zapTypedefGenerateMarshaler, g),
+		"zapTypedefHasGeneratedMarshaler": curryGenerator(g.z.zapTypedefHasGeneratedMarshaler, g),
 	}
 
 	tmpl := template.New("thriftrw").Delims("<", ">").Funcs(templateFuncs)

diff --git a/gen/internal/tests/collision/collision.go b/gen/internal/tests/collision/collision.go
diff --git a/gen/internal/tests/constants/constants.go b/gen/internal/tests/constants/constants.go
diff --git a/gen/internal/tests/containers/containers.go b/gen/internal/tests/containers/containers.go
diff --git a/gen/internal/tests/enum_conflict/enum_conflict.go b/gen/internal/tests/enum_conflict/enum_conflict.go
diff --git a/gen/internal/tests/enums/enums.go b/gen/internal/tests/enums/enums.go
diff --git a/gen/internal/tests/exceptions/exceptions.go b/gen/internal/tests/exceptions/exceptions.go
diff --git a/gen/internal/tests/hyphenated-file/hyphenated-file.go b/gen/internal/tests/hyphenated-file/hyphenated-file.go
diff --git a/gen/internal/tests/hyphenated_file/hyphenated_file.go b/gen/internal/tests/hyphenated_file/hyphenated_file.go
diff --git a/gen/internal/tests/non_hyphenated/non_hyphenated.go b/gen/internal/tests/non_hyphenated/non_hyphenated.go
diff --git a/gen/internal/tests/nozap/nozap.go b/gen/internal/tests/nozap/nozap.go
diff --git a/gen/internal/tests/other_constants/other_constants.go b/gen/internal/tests/other_constants/other_constants.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/structs/structs.go b/gen/internal/tests/structs/structs.go
diff --git a/gen/internal/tests/thrift/typedefs.thrift b/gen/internal/tests/thrift/typedefs.thrift
@@ -11,6 +11,8 @@ typedef string State
 
 typedef i128 UUID  // alias of struct
 
+typedef UUID MyUUID // alias of alias
+
 typedef list<Event> EventGroup  // alias fo collection
 
 struct i128 {
@@ -23,6 +25,10 @@ struct Event {
     2: optional Timestamp time  // optional typedef
 }
 
+struct TransitiveTypedefField {
+    1: required MyUUID defUUID  // required typedef of alias
+}
+
 struct DefaultPrimitiveTypedef {
     1: optional State state = "hello"
 }