Merge pull request #392 from thriftrw/release

Preparing release v1.13.1
thriftrw · Oct 4, 2018 · 7c449cc · 7c449cc
2 parents c8eb691 + 8a16ce1
commit 7c449cc
Show file tree

Hide file tree

Showing 54 changed files with 426 additions and 119 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,13 @@ 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.13.1] - 2018-10-04
+### Fixed
+- gen/plugin: Fixed a bug where typedefs of structs were mishandled; while they
+  should have been pointers, they were generated without `*` and failed to
+  compile.
+- gen/zap: Fixed a bug where logging nil structs would panic.
+
 ## [1.13.0] - 2018-09-10
 ### Added
 - gen: Added support for a `go.label` annotation that allows overriding the
@@ -239,6 +246,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Initial release.
 
+[1.13.1]: https://github.com/thriftrw/thriftrw-go/compare/v1.13.0...v.13.1
 [1.13.0]: https://github.com/thriftrw/thriftrw-go/compare/v1.12.0...v1.13.0
 [1.12.0]: https://github.com/thriftrw/thriftrw-go/compare/v1.11.0...v1.12.0
 [1.11.0]: https://github.com/thriftrw/thriftrw-go/compare/v1.10.0...v1.11.0

diff --git a/gen/field.go b/gen/field.go
@@ -489,6 +489,9 @@ func (f fieldGroupGenerator) Zap(g Generator) error {
 		// MarshalLogObject implements zapcore.ObjectMarshaler, enabling
 		// fast logging of <.Name>.
 		func (<$v> *<.Name>) MarshalLogObject(<$enc> <$zapcore>.ObjectEncoder) (err error) {
+			if <$v> == nil {
+				return nil
+			}
 			<range .Fields>
 				<- if not (zapOptOut .) ->
 					<- $fval := printf "%s.%s" $v (goName .) ->

diff --git a/gen/internal/tests/collision/constants.go b/gen/internal/tests/collision/constants.go
diff --git a/gen/internal/tests/collision/idl.go b/gen/internal/tests/collision/idl.go
diff --git a/gen/internal/tests/collision/types.go b/gen/internal/tests/collision/types.go
diff --git a/gen/internal/tests/constants/constants.go b/gen/internal/tests/constants/constants.go
diff --git a/gen/internal/tests/constants/idl.go b/gen/internal/tests/constants/idl.go
diff --git a/gen/internal/tests/containers/idl.go b/gen/internal/tests/containers/idl.go
diff --git a/gen/internal/tests/containers/types.go b/gen/internal/tests/containers/types.go
diff --git a/gen/internal/tests/enum_conflict/constants.go b/gen/internal/tests/enum_conflict/constants.go
diff --git a/gen/internal/tests/enum_conflict/idl.go b/gen/internal/tests/enum_conflict/idl.go
diff --git a/gen/internal/tests/enum_conflict/types.go b/gen/internal/tests/enum_conflict/types.go
diff --git a/gen/internal/tests/enums/idl.go b/gen/internal/tests/enums/idl.go
diff --git a/gen/internal/tests/enums/types.go b/gen/internal/tests/enums/types.go
diff --git a/gen/internal/tests/exceptions/idl.go b/gen/internal/tests/exceptions/idl.go
diff --git a/gen/internal/tests/exceptions/types.go b/gen/internal/tests/exceptions/types.go
diff --git a/gen/internal/tests/nozap/idl.go b/gen/internal/tests/nozap/idl.go
diff --git a/gen/internal/tests/nozap/types.go b/gen/internal/tests/nozap/types.go
diff --git a/gen/internal/tests/other_constants/constants.go b/gen/internal/tests/other_constants/constants.go
diff --git a/gen/internal/tests/other_constants/idl.go b/gen/internal/tests/other_constants/idl.go
diff --git a/gen/internal/tests/services/cache_clear.go b/gen/internal/tests/services/cache_clear.go
diff --git a/gen/internal/tests/services/cache_clearafter.go b/gen/internal/tests/services/cache_clearafter.go
diff --git a/gen/internal/tests/services/conflictingnames_setvalue.go b/gen/internal/tests/services/conflictingnames_setvalue.go
diff --git a/gen/internal/tests/services/idl.go b/gen/internal/tests/services/idl.go