From 27b4cd4961f5f7c8abba22e011a5778bc0d735d6 Mon Sep 17 00:00:00 2001 From: r-hang Date: Wed, 5 Apr 2023 16:24:25 -0700 Subject: [PATCH 01/14] 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 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 FrameGroup\n\ntypedef map PointMap\n\ntypedef set BinarySet\n\ntypedef map EdgeMap\n\ntypedef map 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 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 FrameGroup\n\ntypedef map PointMap\n\ntypedef set BinarySet\n\ntypedef map EdgeMap\n\ntypedef map 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> := ()(<$v>) - 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 9d739b59a3f87a18709dd087b76227f7e1b41968 Mon Sep 17 00:00:00 2001 From: Ryan Hang Date: Mon, 3 Apr 2023 22:11:06 -0700 Subject: [PATCH 02/14] 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 eaa71fee776424e75d2b34f74a23d04c89037add Mon Sep 17 00:00:00 2001 From: Ryan Hang Date: Thu, 6 Apr 2023 11:22:31 -0700 Subject: [PATCH 03/14] 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 de1ebc1fe0b29356978384c03e22efc6cc200ccb Mon Sep 17 00:00:00 2001 From: Ryan Hang Date: Thu, 6 Apr 2023 14:44:49 -0700 Subject: [PATCH 04/14] 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 a18d0f06..09700163 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.30.0] - 2023-04-06 ### Added - AddTemplate template option. @@ -434,6 +437,7 @@ this release. ### Added - Initial release. +[Unreleased]: https://github.com/thriftrw/thriftrw-go/compare/v1.30.0...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 diff --git a/gen/internal/tests/collision/collision.go b/gen/internal/tests/collision/collision.go index 33bac909..e6bec78c 100644 --- a/gen/internal/tests/collision/collision.go +++ b/gen/internal/tests/collision/collision.go @@ -1,4 +1,4 @@ -// Code generated by thriftrw v1.30.0. DO NOT EDIT. +// Code generated by thriftrw v1.31.0. DO NOT EDIT. // @generated package collision diff --git a/gen/internal/tests/constants/constants.go b/gen/internal/tests/constants/constants.go index 3cd80eae..7558c49b 100644 --- a/gen/internal/tests/constants/constants.go +++ b/gen/internal/tests/constants/constants.go @@ -1,4 +1,4 @@ -// Code generated by thriftrw v1.30.0. DO NOT EDIT. +// Code generated by thriftrw v1.31.0. DO NOT EDIT. // @generated package constants diff --git a/gen/internal/tests/containers/containers.go b/gen/internal/tests/containers/containers.go index c47e7b06..5d467800 100644 --- a/gen/internal/tests/containers/containers.go +++ b/gen/internal/tests/containers/containers.go @@ -1,4 +1,4 @@ -// Code generated by thriftrw v1.30.0. DO NOT EDIT. +// Code generated by thriftrw v1.31.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 dd74b4e8..aae081cc 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.30.0. DO NOT EDIT. +// Code generated by thriftrw v1.31.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 293af370..5a3bbf34 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.30.0. DO NOT EDIT. +// Code generated by thriftrw v1.31.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 3ee2cd56..a18a0992 100644 --- a/gen/internal/tests/enums/enums.go +++ b/gen/internal/tests/enums/enums.go @@ -1,4 +1,4 @@ -// Code generated by thriftrw v1.30.0. DO NOT EDIT. +// Code generated by thriftrw v1.31.0. DO NOT EDIT. // @generated package enums diff --git a/gen/internal/tests/exceptions/exceptions.go b/gen/internal/tests/exceptions/exceptions.go index d7c5eac3..8c7e2a47 100644 --- a/gen/internal/tests/exceptions/exceptions.go +++ b/gen/internal/tests/exceptions/exceptions.go @@ -1,4 +1,4 @@ -// Code generated by thriftrw v1.30.0. DO NOT EDIT. +// Code generated by thriftrw v1.31.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 ee5cc6a2..829537ab 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.30.0. DO NOT EDIT. +// Code generated by thriftrw v1.31.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 adf7a540..1db8c583 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.30.0. DO NOT EDIT. +// Code generated by thriftrw v1.31.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 dfee594e..8e711862 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.30.0. DO NOT EDIT. +// Code generated by thriftrw v1.31.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 7b31c012..db491356 100644 --- a/gen/internal/tests/nozap/nozap.go +++ b/gen/internal/tests/nozap/nozap.go @@ -1,4 +1,4 @@ -// Code generated by thriftrw v1.30.0. DO NOT EDIT. +// Code generated by thriftrw v1.31.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 5d682a65..0e920534 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.30.0. DO NOT EDIT. +// Code generated by thriftrw v1.31.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 60f0ce88..21bb31a6 100644 --- a/gen/internal/tests/services/services.go +++ b/gen/internal/tests/services/services.go @@ -1,4 +1,4 @@ -// Code generated by thriftrw v1.30.0. DO NOT EDIT. +// Code generated by thriftrw v1.31.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 0cd9b6af..f23c981b 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.30.0. DO NOT EDIT. +// Code generated by thriftrw v1.31.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 52979598..d5a9f437 100644 --- a/gen/internal/tests/stringdef/stringdef.go +++ b/gen/internal/tests/stringdef/stringdef.go @@ -1,4 +1,4 @@ -// Code generated by thriftrw v1.30.0. DO NOT EDIT. +// Code generated by thriftrw v1.31.0. DO NOT EDIT. // @generated package stringdef diff --git a/gen/internal/tests/structs/structs.go b/gen/internal/tests/structs/structs.go index 15b383d0..ace99480 100644 --- a/gen/internal/tests/structs/structs.go +++ b/gen/internal/tests/structs/structs.go @@ -1,4 +1,4 @@ -// Code generated by thriftrw v1.30.0. DO NOT EDIT. +// Code generated by thriftrw v1.31.0. DO NOT EDIT. // @generated package structs diff --git a/gen/internal/tests/typedefs/typedefs.go b/gen/internal/tests/typedefs/typedefs.go index ef2352d1..925b4de7 100644 --- a/gen/internal/tests/typedefs/typedefs.go +++ b/gen/internal/tests/typedefs/typedefs.go @@ -1,4 +1,4 @@ -// Code generated by thriftrw v1.30.0. DO NOT EDIT. +// Code generated by thriftrw v1.31.0. DO NOT EDIT. // @generated package typedefs diff --git a/gen/internal/tests/unions/unions.go b/gen/internal/tests/unions/unions.go index b6ce5bbd..ffa2792f 100644 --- a/gen/internal/tests/unions/unions.go +++ b/gen/internal/tests/unions/unions.go @@ -1,4 +1,4 @@ -// Code generated by thriftrw v1.30.0. DO NOT EDIT. +// Code generated by thriftrw v1.31.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 36e813bc..7f87adc0 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.30.0. DO NOT EDIT. +// Code generated by thriftrw v1.31.0. DO NOT EDIT. // @generated package uuid_conflict diff --git a/internal/envelope/exception/exception.go b/internal/envelope/exception/exception.go index 35f47143..61b462d0 100644 --- a/internal/envelope/exception/exception.go +++ b/internal/envelope/exception/exception.go @@ -1,4 +1,4 @@ -// Code generated by thriftrw v1.30.0. DO NOT EDIT. +// Code generated by thriftrw v1.31.0. DO NOT EDIT. // @generated // Copyright (c) 2023 Uber Technologies, Inc. diff --git a/plugin/api/api.go b/plugin/api/api.go index 4d2186fa..70c7343c 100644 --- a/plugin/api/api.go +++ b/plugin/api/api.go @@ -1,4 +1,4 @@ -// Code generated by thriftrw v1.30.0. DO NOT EDIT. +// Code generated by thriftrw v1.31.0. DO NOT EDIT. // @generated // Copyright (c) 2023 Uber Technologies, Inc. diff --git a/version/version.go b/version/version.go index 3d7a607e..80bc489a 100644 --- a/version/version.go +++ b/version/version.go @@ -21,4 +21,4 @@ package version // Version is the current ThriftRW version. -const Version = "1.30.0" +const Version = "1.31.0" From 2af8df09c89cc8a761817eed84afdea9a3e090f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 May 2023 07:55:05 -0700 Subject: [PATCH 05/14] build(deps): bump golang.org/x/crypto (#563) Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.0.0-20210921155107-089bfa567519 to 0.1.0. - [Release notes](https://github.com/golang/crypto/releases) - [Commits](https://github.com/golang/crypto/commits/v0.1.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 33829b73..a5e0eb44 100644 --- a/go.mod +++ b/go.mod @@ -35,7 +35,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/sergi/go-diff v1.1.0 // indirect github.com/xanzy/ssh-agent v0.3.0 // indirect - golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect + golang.org/x/crypto v0.1.0 // indirect golang.org/x/exp/typeparams v0.0.0-20220314205449-43aec2f8a4e7 // indirect golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect golang.org/x/net v0.7.0 // indirect diff --git a/go.sum b/go.sum index eb294f60..01b28b0e 100644 --- a/go.sum +++ b/go.sum @@ -88,8 +88,9 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU= +golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= golang.org/x/exp/typeparams v0.0.0-20220218215828-6cf2b201936e/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= golang.org/x/exp/typeparams v0.0.0-20220314205449-43aec2f8a4e7 h1:mzVEuUhnztMdHb426A1o6cjz5ha6YV3t6zFTBXqSon4= golang.org/x/exp/typeparams v0.0.0-20220314205449-43aec2f8a4e7/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= @@ -108,6 +109,7 @@ golang.org/x/net v0.0.0-20210326060303-6b1517762897/go.mod h1:uSPa2vr4CLtc/ILN5o golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -130,16 +132,19 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= From d63be397e307f138d88f24919c6fd0c27f5d119c Mon Sep 17 00:00:00 2001 From: Ryan Hang Date: Mon, 29 May 2023 07:57:52 -0700 Subject: [PATCH 06/14] ci: Fix make lint Running GO111MODULE=on make lint' fails for me on dev. I've restored dev branch's 'make lint' to a working lint state with the following changes. $ GO111MODULE=on go get honnef.co/go/tools@latest $ GO111MODULE=on go mod tidy Change: Deleted an unused variable in gen/zap_test.go $ cat lint.log | xargs gofmt -w --- ast/annotation.go | 2 +- ast/constant.go | 16 +- ast/definition.go | 67 ++- ast/doc.go | 18 +- ast/header.go | 8 +- ast/type.go | 16 +- compile/namespace.go | 4 +- gen/generator.go | 26 +- gen/list.go | 30 +- gen/map.go | 33 +- gen/set.go | 18 +- gen/zap.go | 13 +- gen/zap_test.go | 1 - go.mod | 11 +- go.sum | 38 +- idl/internal/docstring.go | 16 +- idl/internal/quote.go | 8 +- internal/envelope/exception/exception.go | 72 +-- internal/plugin/flag.go | 2 +- internal/semver/compat.go | 3 +- internal/semver/semver.go | 4 +- plugin/api/api.go | 626 +++++++++++------------ plugin/doc.go | 22 +- plugin/plugin.go | 6 +- protocol/binary.go | 66 +-- 25 files changed, 559 insertions(+), 567 deletions(-) diff --git a/ast/annotation.go b/ast/annotation.go index e98be197..eee03062 100644 --- a/ast/annotation.go +++ b/ast/annotation.go @@ -28,7 +28,7 @@ import ( // Annotation represents a type annotation. Type annotations are key-value // pairs in the form, // -// (foo = "bar", baz = "qux") +// (foo = "bar", baz = "qux") // // They may be used to customize the generated code. Annotations are optional // anywhere in the code where they're accepted and may be skipped completely. diff --git a/ast/constant.go b/ast/constant.go index 7dd74bf9..e8a6b83c 100644 --- a/ast/constant.go +++ b/ast/constant.go @@ -74,28 +74,28 @@ func (r ConstantReference) pos() Position { return Position{Line: r.Line, Column // ConstantBoolean is a boolean value specified in the Thrift file. // -// true -// false +// true +// false type ConstantBoolean bool // ConstantInteger is an integer value specified in the Thrift file. // -// 42 +// 42 type ConstantInteger int64 // ConstantString is a string literal specified in the Thrift file. // -// "hello world" +// "hello world" type ConstantString string // ConstantDouble is a floating point value specified in the Thrift file. // -// 1.234 +// 1.234 type ConstantDouble float64 // ConstantMap is a map literal from the Thrift file. // -// {"a": 1, "b": 2} +// {"a": 1, "b": 2} // // Note that map literals can also be used to build structs. type ConstantMap struct { @@ -115,7 +115,7 @@ func (ConstantMapItem) node() {} // ConstantList is a list literal from the Thrift file. // -// [1, 2, 3] +// [1, 2, 3] type ConstantList struct { Items []ConstantValue Line int @@ -125,7 +125,7 @@ type ConstantList struct { // ConstantReference is a reference to another constant value defined in the // Thrift file. // -// foo.bar +// foo.bar type ConstantReference struct { // Name of the referenced value. Name string diff --git a/ast/definition.go b/ast/definition.go index cac3ec82..2535fa83 100644 --- a/ast/definition.go +++ b/ast/definition.go @@ -39,7 +39,7 @@ type Definition interface { // Constant is a constant declared in the Thrift file using a const statement. // -// const i32 foo = 42 +// const i32 foo = 42 type Constant struct { Name string Type Type @@ -66,8 +66,8 @@ func (c *Constant) Info() DefinitionInfo { // Typedef is used to define an alias for another type. // -// typedef string UUID -// typedef i64 Timestamp (unit = "milliseconds") +// typedef string UUID +// typedef i64 Timestamp (unit = "milliseconds") type Typedef struct { Name string Type Type @@ -99,13 +99,13 @@ func (t *Typedef) Info() DefinitionInfo { // Enum is a set of named integer values. // -// enum Status { Enabled, Disabled } +// enum Status { Enabled, Disabled } // -// enum Role { -// User = 1, -// Moderator = 2 (py.name = "Mod"), -// Admin = 3 -// } (go.name = "UserRole") +// enum Role { +// User = 1, +// Moderator = 2 (py.name = "Mod"), +// Admin = 3 +// } (go.name = "UserRole") type Enum struct { Name string Items []*EnumItem @@ -175,22 +175,22 @@ const ( // // This type encompasses structs, unions, and exceptions. // -// struct User { -// 1: required string name (min_length = "3") -// 2: optional Status status = Enabled; -// } +// struct User { +// 1: required string name (min_length = "3") +// 2: optional Status status = Enabled; +// } // -// struct i128 { -// 1: required i64 high -// 2: required i64 low -// } (py.serializer = "foo.Int128Serializer") +// struct i128 { +// 1: required i64 high +// 2: required i64 low +// } (py.serializer = "foo.Int128Serializer") // -// union Contents { -// 1: string plainText -// 2: binary pdf -// } +// union Contents { +// 1: string plainText +// 2: binary pdf +// } // -// exception ServiceError { 1: required string message } +// exception ServiceError { 1: required string message } type Struct struct { Name string Type StructureType @@ -224,10 +224,10 @@ func (s *Struct) Info() DefinitionInfo { // Service is a collection of functions. // -// service KeyValue { -// void setValue(1: string key, 2: binary value) -// binary getValue(1: string key) -// } (router.serviceName = "key_value") +// service KeyValue { +// void setValue(1: string key, 2: binary value) +// binary getValue(1: string key) +// } (router.serviceName = "key_value") type Service struct { Name string Functions []*Function @@ -263,10 +263,10 @@ func (s *Service) Info() DefinitionInfo { // Function is a single function inside a service. // -// binary getValue(1: string key) -// throws (1: KeyNotFoundError notFound) ( -// ttl.milliseconds = "250" -// ) +// binary getValue(1: string key) +// throws (1: KeyNotFoundError notFound) ( +// ttl.milliseconds = "250" +// ) type Function struct { Name string Parameters []*Field @@ -312,10 +312,9 @@ const ( // Field is a single field inside a struct, union, exception, or a single item // in the parameter or exception list of a function. // -// 1: required i32 foo = 0 -// 2: optional binary (max_length = "4096") bar -// 3: i64 baz (go.name = "qux") -// +// 1: required i32 foo = 0 +// 2: optional binary (max_length = "4096") bar +// 3: i64 baz (go.name = "qux") type Field struct { ID int // IDUnset indicates that a field identifier wasn't provided. diff --git a/ast/doc.go b/ast/doc.go index 9c494255..5687ae39 100644 --- a/ast/doc.go +++ b/ast/doc.go @@ -21,21 +21,21 @@ // Package ast provides types and intefaces representing the abstract syntax // tree for a single .thrift file. // -// Docstrings +// # Docstrings // // Types which have a Doc field support parsing docstrings in the form, // "/** ... */". For example, given the following, // -// /** -// * Name of the user who composed this message. -// * -// * If unset, the comment was posted by an anonymous user. -// */ -// 1: optional string author +// /** +// * Name of the user who composed this message. +// * +// * If unset, the comment was posted by an anonymous user. +// */ +// 1: optional string author // // The Doc of the parsed Field will be, // -// Name of the user who composed this message. +// Name of the user who composed this message. // -// If unset, the comment was posted by an anonymous user. +// If unset, the comment was posted by an anonymous user. package ast diff --git a/ast/header.go b/ast/header.go index eb2642b6..896933dc 100644 --- a/ast/header.go +++ b/ast/header.go @@ -35,12 +35,12 @@ type Header interface { // Include is a request to include another Thrift file. // -// include "shared.thrift" +// include "shared.thrift" // // thriftrw's custom Include-As syntax may be used to change the name under // which the file is imported. // -// include t "shared.thrift" +// include t "shared.thrift" type Include struct { Path string Name string @@ -62,7 +62,7 @@ func (i *Include) Info() HeaderInfo { // CppInclude is a request to include a C++-specific header file. // -// cpp_include "" +// cpp_include "" type CppInclude struct { Path string Line int @@ -84,7 +84,7 @@ func (i *CppInclude) Info() HeaderInfo { // Namespace statements allow users to choose the package name used by the // generated code in certain languages. // -// namespace py foo.bar +// namespace py foo.bar type Namespace struct { Scope string Name string diff --git a/ast/type.go b/ast/type.go index 4aef5f77..b297ce9f 100644 --- a/ast/type.go +++ b/ast/type.go @@ -49,12 +49,12 @@ const ( // BaseType is a reference to a Thrift base type. // -// bool, byte, i16, i32, i64, double, string, binary +// bool, byte, i16, i32, i64, double, string, binary // // All references to base types in the document may be followed by type // annotations. // -// bool (go.type = "int") +// bool (go.type = "int") type BaseType struct { // ID of the base type. ID BaseTypeID @@ -107,11 +107,11 @@ func (bt BaseType) String() string { // MapType is a reference to a the Thrift map type. // -// map +// map // // All references to map types may be followed by type annotations. // -// map> (java.type = "MultiMap") +// map> (java.type = "MultiMap") type MapType struct { KeyType, ValueType Type Annotations []*Annotation @@ -143,11 +143,11 @@ func (mt MapType) String() string { // ListType is a reference to the Thrift list type. // -// list +// list // // All references to list types may be followed by type annotations. // -// list (cpp.type = "vector") +// list (cpp.type = "vector") type ListType struct { ValueType Type Annotations []*Annotation @@ -178,11 +178,11 @@ func (lt ListType) String() string { // SetType is a reference to the Thrift set type. // -// set +// set // // All references to set types may be followed by type annotations. // -// set (js.type = "list") +// set (js.type = "list") type SetType struct { ValueType Type Annotations []*Annotation diff --git a/compile/namespace.go b/compile/namespace.go index 3c31c6e8..7ff449af 100644 --- a/compile/namespace.go +++ b/compile/namespace.go @@ -43,8 +43,8 @@ type namespace struct { // newNamespace instantiates a new namespace. // -// ns := newNamespace(caseSensitive) -// ns.claim("foo") +// ns := newNamespace(caseSensitive) +// ns.claim("foo") func newNamespace(t namespaceType) namespace { return namespace{ transform: t, diff --git a/gen/generator.go b/gen/generator.go index 9334eaac..2925b01b 100644 --- a/gen/generator.go +++ b/gen/generator.go @@ -397,14 +397,14 @@ func (g *generator) declare(ignoreConflicts bool, s string, data interface{}, op // // For example, // -// g.DeclareFromTemplate( -// 'type <.Name> int32', -// struct{Name string}{Name: "myType"} -// ) +// g.DeclareFromTemplate( +// 'type <.Name> int32', +// struct{Name string}{Name: "myType"} +// ) // // Will generate, // -// type myType int32 +// type myType int32 // // The following functions are available to templates: // @@ -426,8 +426,8 @@ func (g *generator) declare(ignoreConflicts bool, s string, data interface{}, op // the template to refer to that imported module. This helps avoid naming // conflicts with imports. // -// <$fmt := import "fmt"> -// <$fmt>.Println("hello world") +// <$fmt := import "fmt"> +// <$fmt>.Println("hello world") // // isHashable(TypeSpec): Returns true if the given TypeSpec is for a type that // is hashable. @@ -440,7 +440,7 @@ func (g *generator) declare(ignoreConflicts bool, s string, data interface{}, op // newVar(s): Gets a new name that the template can use for a variable without // worrying about shadowing any globals. Prefers the given string. // -// <$x := newVar "x"> +// <$x := newVar "x"> // // toWire(TypeSpec, v): Returns an expression of type (Value, error) that // contains the wire representation of the item "v" of type TypeSpec. @@ -458,28 +458,28 @@ func (g *generator) declare(ignoreConflicts bool, s string, data interface{}, op // typeReference(TypeSpec): Takes any TypeSpec. Returns a string representing // a reference to that type. // -// +// // // typeReferencePtr(TypeSpec): Takes any TypeSpec. Returns a string // representing a reference to a pointer of that type, provided that the type // itself is not a reference type. // -// +// // // equals(TypeSpec, lhs, rhs): Returns an expression of type bool that // compares lhs and rhs of given TypeSpec for equality. // -// +// // // equalsPtr(TypeSpec, lhs, rhs): Returns an expression of type bool that // compares reference to a value of the given type for equality. // -// +// // // formatDoc(string): Formats a docblock. Generates a trailing newline so use // this NEXT to the thing being documented. // -// type Foo +// type Foo func (g *generator) DeclareFromTemplate(s string, data interface{}, opts ...TemplateOption) error { return g.declare(false, s, data, opts...) } diff --git a/gen/list.go b/gen/list.go index 449b4f84..d2ce0a35 100644 --- a/gen/list.go +++ b/gen/list.go @@ -34,11 +34,11 @@ type listGenerator struct{} // // The following is generated: // -// type $valueListName []$valueType +// type $valueListName []$valueType // -// func (v $valueListName) ForEach(f func(wire.Value) error) error { ... } +// func (v $valueListName) ForEach(f func(wire.Value) error) error { ... } // -// func (v $valueListName) Close() { ... } +// func (v $valueListName) Close() { ... } // // And $valueListName is returned. This may be used where a ValueList of the // given type is expected. @@ -97,9 +97,9 @@ func (l *listGenerator) ValueList(g Generator, spec *compile.ListSpec) (string, // Reader generates a function to read a list of the given type from a // wire.List. // -// func $name(l wire.List) ($listType, error) { -// ... -// } +// func $name(l wire.List) ($listType, error) { +// ... +// } // // And returns its name. func (l *listGenerator) Reader(g Generator, spec *compile.ListSpec) (string, error) { @@ -142,9 +142,9 @@ func (l *listGenerator) Reader(g Generator, spec *compile.ListSpec) (string, err // Encoder generates a function to encode a list given a stream.Writer // -// func $name(val []listType, sr *stream.Writer) error { -// ... -// } +// func $name(val []listType, sr *stream.Writer) error { +// ... +// } // // And returns its name. func (l *listGenerator) Encoder(g Generator, spec *compile.ListSpec) (string, error) { @@ -199,9 +199,9 @@ func (l *listGenerator) Encoder(g Generator, spec *compile.ListSpec) (string, er // Decoder generates a function to read a list of the given type from a // stream.Reader. // -// func $name(sr *stream.Reader) ($listType, error) { -// ... -// } +// func $name(sr *stream.Reader) ($listType, error) { +// ... +// } // // And returns its name. func (l *listGenerator) Decoder(g Generator, spec *compile.ListSpec) (string, error) { @@ -256,9 +256,9 @@ func (l *listGenerator) Decoder(g Generator, spec *compile.ListSpec) (string, er // Equals generates a function to compare lists of the given type // -// func $name(lhs, rhs $listType) bool { -// ... -// } +// func $name(lhs, rhs $listType) bool { +// ... +// } // // And returns its name. func (l *listGenerator) Equals(g Generator, spec *compile.ListSpec) (string, error) { diff --git a/gen/map.go b/gen/map.go index 5c8a58d0..dbac07d6 100644 --- a/gen/map.go +++ b/gen/map.go @@ -38,11 +38,11 @@ type mapGenerator struct{} // // The following is generated: // -// type $mapItemListName map[$keyType]$valueType +// type $mapItemListName map[$keyType]$valueType // -// func (v $mapItemListName) ForEach(f func(wire.MapItem) error) error { ... } +// func (v $mapItemListName) ForEach(f func(wire.MapItem) error) error { ... } // -// func (v $mapItemListName) Close() { ... } +// func (v $mapItemListName) Close() { ... } // // And $mapItemListName is returned. This may be used where a MapItemList of the // given type is expected. @@ -181,9 +181,9 @@ func (m *mapGenerator) Reader(g Generator, spec *compile.MapSpec) (string, error // Encoder generates a function to encode a map given a stream.Writer // -// func $name(val $mapType, sr *stream.Writer) error { -// ... -// } +// func $name(val $mapType, sr *stream.Writer) error { +// ... +// } // // And returns its name. func (m *mapGenerator) Encoder(g Generator, spec *compile.MapSpec) (string, error) { @@ -272,9 +272,9 @@ func (m *mapGenerator) Encoder(g Generator, spec *compile.MapSpec) (string, erro // Decoder generates a function to read a map of the given types from a // stream.Reader. // -// func $name(sr *stream.Reader) ($mapType, error) { -// ... -// } +// func $name(sr *stream.Reader) ($mapType, error) { +// ... +// } // // And returns its name. func (m *mapGenerator) Decoder(g Generator, spec *compile.MapSpec) (string, error) { @@ -351,9 +351,9 @@ func (m *mapGenerator) Decoder(g Generator, spec *compile.MapSpec) (string, erro // Equals generates a function to compare maps of the given type // -// func $name(lhs, rhs $mapType) bool { -// ... -// } +// func $name(lhs, rhs $mapType) bool { +// ... +// } // // And returns its name. func (m *mapGenerator) Equals(g Generator, spec *compile.MapSpec) (string, error) { @@ -456,12 +456,11 @@ func (m *mapGenerator) equalsUnhashable(g Generator, spec *compile.MapSpec) (str // string. If the key is not a string, maps are logged as arrays of // objects with a key and value. // -// map[string]int32{"foo": 1, "bar": 2} -// => {"foo": 1, "bar": 2} -// -// map[int32]string{1: "foo", 2: "bar"} -// => [{"key": 1, "value": "foo"}, {"key": 2, "value": "bar"}] +// map[string]int32{"foo": 1, "bar": 2} +// => {"foo": 1, "bar": 2} // +// map[int32]string{1: "foo", 2: "bar"} +// => [{"key": 1, "value": "foo"}, {"key": 2, "value": "bar"}] func (m *mapGenerator) zapMarshaler( g Generator, root *compile.MapSpec, diff --git a/gen/set.go b/gen/set.go index b3d82685..1f6db92a 100644 --- a/gen/set.go +++ b/gen/set.go @@ -34,11 +34,11 @@ type setGenerator struct{} // // The following is generated: // -// type $valueListName map[$valueType]struct{} +// type $valueListName map[$valueType]struct{} // -// func (v $valueListName) ForEach(f func(wire.Value) error) error { ... } +// func (v $valueListName) ForEach(f func(wire.Value) error) error { ... } // -// func (v $valueListName) Close() { ... } +// func (v $valueListName) Close() { ... } // // And $valueListName is returned. This may be used where a ValueList of the // given type is expected. @@ -196,9 +196,9 @@ func (s *setGenerator) Encoder(g Generator, spec *compile.SetSpec) (string, erro // Decoder generates a function to read a set of the given type from a // stream.Reader. // -// func $name(sr *stream.Reader) ($setType, error) { -// ... -// } +// func $name(sr *stream.Reader) ($setType, error) { +// ... +// } // // And returns its name. func (s *setGenerator) Decoder(g Generator, spec *compile.SetSpec) (string, error) { @@ -261,9 +261,9 @@ func (s *setGenerator) Decoder(g Generator, spec *compile.SetSpec) (string, erro // Equals generates a function to compare sets of the given type // -// func $name(lhs, rhs $setType) bool { -// ... -// } +// func $name(lhs, rhs $setType) bool { +// ... +// } // // And returns its name. func (s *setGenerator) Equals(g Generator, spec *compile.SetSpec) (string, error) { diff --git a/gen/zap.go b/gen/zap.go index 038956ff..91a43019 100644 --- a/gen/zap.go +++ b/gen/zap.go @@ -30,10 +30,10 @@ import ( // Fields of Thrift structs will use this annotation to opt-out of being logged // when that struct is logged. i.e. // -// struct ZapOptOutStruct { -// 1: required string name -// 2: required string optout (go.nolog) -// } +// struct ZapOptOutStruct { +// 1: required string name +// 2: required string optout (go.nolog) +// } // // The above struct will be logged without the optout string. const NoZapLabel = "go.nolog" @@ -114,9 +114,8 @@ func (z *zapGenerator) zapTypedefGenerateMarshaler(g Generator, spec *compile.Ty // // This should be used in conjunction with zapEncoder: // -// v := ... -// enc.Add("foo", ) -// +// v := ... +// enc.Add("foo", ) func (z *zapGenerator) zapMarshaler(g Generator, spec compile.TypeSpec, fieldValue string) (string, error) { // For typedefs, cast to the root type and rely on that functionality if the // typedef doesn't have generated Zap marshal methods. diff --git a/gen/zap_test.go b/gen/zap_test.go index 91be2f99..f5025b57 100644 --- a/gen/zap_test.go +++ b/gen/zap_test.go @@ -624,7 +624,6 @@ func TestTypedefsZapLogging(t *testing.T) { func TestEnumWithLabelZapLogging(t *testing.T) { // These types are created to ease building map[string]interface{} type o = map[string]interface{} - type a = []interface{} type i = int32 tests := []struct { diff --git a/go.mod b/go.mod index a5e0eb44..884a43fb 100644 --- a/go.mod +++ b/go.mod @@ -14,12 +14,12 @@ require ( go.uber.org/multierr v1.1.0 go.uber.org/zap v1.9.1 golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f - golang.org/x/tools v0.1.10 - honnef.co/go/tools v0.3.0-0.dev.0.20220306074811-23e1086441d2 + golang.org/x/tools v0.4.1-0.20221208213631-3f74d914ae6d + honnef.co/go/tools v0.4.3 ) require ( - github.com/BurntSushi/toml v1.0.0 // indirect + github.com/BurntSushi/toml v1.2.1 // indirect github.com/Microsoft/go-winio v0.4.16 // indirect github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 // indirect github.com/acomagu/bufpipe v1.0.3 // indirect @@ -36,11 +36,10 @@ require ( github.com/sergi/go-diff v1.1.0 // indirect github.com/xanzy/ssh-agent v0.3.0 // indirect golang.org/x/crypto v0.1.0 // indirect - golang.org/x/exp/typeparams v0.0.0-20220314205449-43aec2f8a4e7 // indirect - golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect + golang.org/x/exp/typeparams v0.0.0-20221208152030-732eee02a75a // indirect + golang.org/x/mod v0.7.0 // indirect golang.org/x/net v0.7.0 // indirect golang.org/x/sys v0.5.0 // indirect - golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 01b28b0e..88d5e696 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,5 @@ -github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= -github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU= -github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= +github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak= +github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= github.com/Microsoft/go-winio v0.4.16 h1:FtSW/jqD+l4ba5iPBj9CODVtgfYAD8w2wS923g/cFDk= github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0= @@ -75,7 +74,6 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/xanzy/ssh-agent v0.3.0 h1:wUMzuKtKilRgBAD1sUb8gOwwRr2FGoBVumcjoOACClI= github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.uber.org/atomic v1.3.2 h1:2Oa65PReHzfn29GpvgsYwloV9AVFHPDk8tYxt2c2tr4= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= @@ -91,30 +89,29 @@ golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU= golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= -golang.org/x/exp/typeparams v0.0.0-20220218215828-6cf2b201936e/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= -golang.org/x/exp/typeparams v0.0.0-20220314205449-43aec2f8a4e7 h1:mzVEuUhnztMdHb426A1o6cjz5ha6YV3t6zFTBXqSon4= -golang.org/x/exp/typeparams v0.0.0-20220314205449-43aec2f8a4e7/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= +golang.org/x/exp/typeparams v0.0.0-20221208152030-732eee02a75a h1:Jw5wfR+h9mnIYH+OtGT2im5wV1YGGDora5vTv/aa5bE= +golang.org/x/exp/typeparams v0.0.0-20221208152030-732eee02a75a/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f h1:J5lckAjkw6qYlOZNj90mLYNTEKDvWeuc1yieZ8qUzUE= golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= -golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 h1:kQgndtyPBW/JIYERgdxfwMYh3AVStj88WQTlNDi2a+o= -golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA= +golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210326060303-6b1517762897/go.mod h1:uSPa2vr4CLtc/ILN5odXGNXS6mhrKVzTaCXzk9m6W3k= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= +golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -125,40 +122,37 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210502180810-71e4cd670f79/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= -golang.org/x/tools v0.1.10 h1:QjFRCZxdOhBJ/UNgnBZLbNV13DlbnK0quyivTnXJM20= -golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= -golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.4.1-0.20221208213631-3f74d914ae6d h1:9ZNWAi4CYhNv60mXGgAncgq7SGc5qa7C8VZV8Tg7Ggs= +golang.org/x/tools v0.4.1-0.20221208213631-3f74d914ae6d/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -174,5 +168,5 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -honnef.co/go/tools v0.3.0-0.dev.0.20220306074811-23e1086441d2 h1:utiSabORbG/JeX7MlmKMdmsjwom2+v8zmdb6SoBe4UY= -honnef.co/go/tools v0.3.0-0.dev.0.20220306074811-23e1086441d2/go.mod h1:dZI0HmIvwDMW8owtLBJxTHoeX48yuF5p5pDy3y73jGU= +honnef.co/go/tools v0.4.3 h1:o/n5/K5gXqk8Gozvs2cnL0F2S1/g1vcGCAx2vETjITw= +honnef.co/go/tools v0.4.3/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA= diff --git a/idl/internal/docstring.go b/idl/internal/docstring.go index 3de845b0..45a66385 100644 --- a/idl/internal/docstring.go +++ b/idl/internal/docstring.go @@ -32,13 +32,13 @@ const ( // ParseDocstring takes a docstring in the form, // -// /** -// * foo bar -// */ +// /** +// * foo bar +// */ // // And returns, // -// foo bar +// foo bar func ParseDocstring(s string) string { lines := strings.Split(s, "\n") if len(lines) == 0 { @@ -104,13 +104,13 @@ func dropTrailingEmptyLines(lines []string) []string { // // So, // -// " foo" -// " bar" +// " foo" +// " bar" // // Becomes, // -// "foo" -// " bar" +// "foo" +// " bar" // // If the first line was not indentend, skipFirstIfUnindented controls whether // we strip the indentation of the second line from all lines instead. This diff --git a/idl/internal/quote.go b/idl/internal/quote.go index 161caf02..4f8bea0b 100644 --- a/idl/internal/quote.go +++ b/idl/internal/quote.go @@ -28,7 +28,7 @@ import ( // UnquoteSingleQuoted unquotes a slice of bytes representing a single quoted // string. // -// UnquoteSingleQuoted([]byte("'foo'")) == "foo" +// UnquoteSingleQuoted([]byte("'foo'")) == "foo" func UnquoteSingleQuoted(in []byte) (string, error) { out := string(swapQuotes(unescapeQuotes(in, '"'))) str, err := strconv.Unquote(out) @@ -44,15 +44,15 @@ func UnquoteSingleQuoted(in []byte) (string, error) { // UnquoteDoubleQuoted unquotes a slice of bytes representing a double quoted // string. // -// UnquoteDoubleQuoted([]byte("\"foo\"")) == "foo" +// UnquoteDoubleQuoted([]byte("\"foo\"")) == "foo" func UnquoteDoubleQuoted(in []byte) (string, error) { return strconv.Unquote(string(unescapeQuotes(in, '\''))) } // unescapeQuotes unescapes all occurences of a quote character in a string. // -// unescapeQuotes([]byte{'\\', '"'}, '"') == []byte{'"'} -// unescapeQuotes([]byte{'\\', '\''}, '\'') == []byte{'\''} +// unescapeQuotes([]byte{'\\', '"'}, '"') == []byte{'"'} +// unescapeQuotes([]byte{'\\', '\''}, '\'') == []byte{'\''} func unescapeQuotes(in []byte, quote byte) []byte { return bytes.ReplaceAll(in, []byte{'\\', quote}, []byte{quote}) } diff --git a/internal/envelope/exception/exception.go b/internal/envelope/exception/exception.go index 61b462d0..318dfb9a 100644 --- a/internal/envelope/exception/exception.go +++ b/internal/envelope/exception/exception.go @@ -73,8 +73,8 @@ func ExceptionType_Values() []ExceptionType { // UnmarshalText tries to decode ExceptionType from a byte slice // containing its name. // -// var v ExceptionType -// err := v.UnmarshalText([]byte("UNKNOWN")) +// var v ExceptionType +// err := v.UnmarshalText([]byte("UNKNOWN")) func (v *ExceptionType) UnmarshalText(value []byte) error { switch s := string(value); s { case "UNKNOWN": @@ -194,10 +194,10 @@ func (v ExceptionType) Ptr() *ExceptionType { // Encode encodes ExceptionType directly to bytes. // -// sWriter := BinaryStreamer.Writer(writer) +// sWriter := BinaryStreamer.Writer(writer) // -// var v ExceptionType -// return v.Encode(sWriter) +// var v ExceptionType +// return v.Encode(sWriter) func (v ExceptionType) Encode(sw stream.Writer) error { return sw.WriteInt32(int32(v)) } @@ -214,16 +214,16 @@ func (v ExceptionType) ToWire() (wire.Value, error) { // FromWire deserializes ExceptionType from its Thrift-level // representation. // -// x, err := binaryProtocol.Decode(reader, wire.TI32) -// if err != nil { -// return ExceptionType(0), err -// } +// x, err := binaryProtocol.Decode(reader, wire.TI32) +// if err != nil { +// return ExceptionType(0), err +// } // -// var v ExceptionType -// if err := v.FromWire(x); err != nil { -// return ExceptionType(0), err -// } -// return v, nil +// var v ExceptionType +// if err := v.FromWire(x); err != nil { +// return ExceptionType(0), err +// } +// return v, nil func (v *ExceptionType) FromWire(w wire.Value) error { *v = (ExceptionType)(w.GetI32()) return nil @@ -231,13 +231,13 @@ func (v *ExceptionType) FromWire(w wire.Value) error { // Decode reads off the encoded ExceptionType directly off of the wire. // -// sReader := BinaryStreamer.Reader(reader) +// sReader := BinaryStreamer.Reader(reader) // -// var v ExceptionType -// if err := v.Decode(sReader); err != nil { -// return ExceptionType(0), err -// } -// return v, nil +// var v ExceptionType +// if err := v.Decode(sReader); err != nil { +// return ExceptionType(0), err +// } +// return v, nil func (v *ExceptionType) Decode(sr stream.Reader) error { i, err := sr.ReadInt32() if err != nil { @@ -365,14 +365,14 @@ type TApplicationException struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *TApplicationException) ToWire() (wire.Value, error) { var ( fields [2]wire.Field @@ -414,16 +414,16 @@ func _ExceptionType_Read(w wire.Value) (ExceptionType, error) { // An error is returned if we were unable to build a TApplicationException struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v TApplicationException -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v TApplicationException +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *TApplicationException) FromWire(w wire.Value) error { var err error diff --git a/internal/plugin/flag.go b/internal/plugin/flag.go index b6b08935..e448ea12 100644 --- a/internal/plugin/flag.go +++ b/internal/plugin/flag.go @@ -43,7 +43,7 @@ const _pluginExecPrefix = "thriftrw-plugin-" // An executable with the name thriftrw-plugin-$name is expected on the $PATH. // Remaining arguments are passed to the program. For example, // -// -p "foo -a --bc" +// -p "foo -a --bc" // // Will pass the arguments "-a --bc" to the executable "thriftrw-plugin-foo". type Flag struct { diff --git a/internal/semver/compat.go b/internal/semver/compat.go index a477321c..87ea9dc5 100644 --- a/internal/semver/compat.go +++ b/internal/semver/compat.go @@ -26,7 +26,8 @@ package semver // Assuming current Version is 1.2.3-pre we get: // // begin >= 1.0.0 -// end < 1.3.0-pre +// +// end < 1.3.0-pre func CompatibleRange(v Version) (r Range) { r.Begin = v r.End = v diff --git a/internal/semver/semver.go b/internal/semver/semver.go index dbf05cfc..daacb1c9 100644 --- a/internal/semver/semver.go +++ b/internal/semver/semver.go @@ -86,7 +86,9 @@ func (v *Version) String() string { } // Compare returns: -// 0 if a == b +// +// 0 if a == b +// // -1 if a < b // +1 if a > b func (v *Version) Compare(b *Version) int { diff --git a/plugin/api/api.go b/plugin/api/api.go index 70c7343c..f63b4b13 100644 --- a/plugin/api/api.go +++ b/plugin/api/api.go @@ -120,14 +120,14 @@ func (_Map_String_String_MapItemList) Close() {} // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } -// -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } +// +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *Argument) ToWire() (wire.Value, error) { var ( fields [3]wire.Field @@ -204,16 +204,16 @@ func _Map_String_String_Read(m wire.MapItemList) (map[string]string, error) { // An error is returned if we were unable to build a Argument struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v Argument -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v Argument +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *Argument) FromWire(w wire.Value) error { var err error @@ -591,8 +591,8 @@ func Feature_Values() []Feature { // UnmarshalText tries to decode Feature from a byte slice // containing its name. // -// var v Feature -// err := v.UnmarshalText([]byte("SERVICE_GENERATOR")) +// var v Feature +// err := v.UnmarshalText([]byte("SERVICE_GENERATOR")) func (v *Feature) UnmarshalText(value []byte) error { switch s := string(value); s { case "SERVICE_GENERATOR": @@ -642,10 +642,10 @@ func (v Feature) Ptr() *Feature { // Encode encodes Feature directly to bytes. // -// sWriter := BinaryStreamer.Writer(writer) +// sWriter := BinaryStreamer.Writer(writer) // -// var v Feature -// return v.Encode(sWriter) +// var v Feature +// return v.Encode(sWriter) func (v Feature) Encode(sw stream.Writer) error { return sw.WriteInt32(int32(v)) } @@ -662,16 +662,16 @@ func (v Feature) ToWire() (wire.Value, error) { // FromWire deserializes Feature from its Thrift-level // representation. // -// x, err := binaryProtocol.Decode(reader, wire.TI32) -// if err != nil { -// return Feature(0), err -// } +// x, err := binaryProtocol.Decode(reader, wire.TI32) +// if err != nil { +// return Feature(0), err +// } // -// var v Feature -// if err := v.FromWire(x); err != nil { -// return Feature(0), err -// } -// return v, nil +// var v Feature +// if err := v.FromWire(x); err != nil { +// return Feature(0), err +// } +// return v, nil func (v *Feature) FromWire(w wire.Value) error { *v = (Feature)(w.GetI32()) return nil @@ -679,13 +679,13 @@ func (v *Feature) FromWire(w wire.Value) error { // Decode reads off the encoded Feature directly off of the wire. // -// sReader := BinaryStreamer.Reader(reader) +// sReader := BinaryStreamer.Reader(reader) // -// var v Feature -// if err := v.Decode(sReader); err != nil { -// return Feature(0), err -// } -// return v, nil +// var v Feature +// if err := v.Decode(sReader); err != nil { +// return Feature(0), err +// } +// return v, nil func (v *Feature) Decode(sr stream.Reader) error { i, err := sr.ReadInt32() if err != nil { @@ -832,14 +832,14 @@ func (_List_Argument_ValueList) Close() {} // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *Function) ToWire() (wire.Value, error) { var ( fields [7]wire.Field @@ -935,16 +935,16 @@ func _List_Argument_Read(l wire.ValueList) ([]*Argument, error) { // An error is returned if we were unable to build a Function struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v Function -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v Function +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *Function) FromWire(w wire.Value) error { var err error @@ -1670,14 +1670,14 @@ func (_List_ModuleID_ValueList) Close() {} // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *GenerateServiceRequest) ToWire() (wire.Value, error) { var ( fields [6]wire.Field @@ -1859,16 +1859,16 @@ func _List_ModuleID_Read(l wire.ValueList) ([]ModuleID, error) { // An error is returned if we were unable to build a GenerateServiceRequest struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v GenerateServiceRequest -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v GenerateServiceRequest +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *GenerateServiceRequest) FromWire(w wire.Value) error { var err error @@ -2730,14 +2730,14 @@ func (_Map_String_Binary_MapItemList) Close() {} // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *GenerateServiceResponse) ToWire() (wire.Value, error) { var ( fields [1]wire.Field @@ -2793,16 +2793,16 @@ func _Map_String_Binary_Read(m wire.MapItemList) (map[string][]byte, error) { // An error is returned if we were unable to build a GenerateServiceResponse struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v GenerateServiceResponse -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v GenerateServiceResponse +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *GenerateServiceResponse) FromWire(w wire.Value) error { var err error @@ -3059,14 +3059,14 @@ type HandshakeRequest struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *HandshakeRequest) ToWire() (wire.Value, error) { var ( fields [0]wire.Field @@ -3083,16 +3083,16 @@ func (v *HandshakeRequest) ToWire() (wire.Value, error) { // An error is returned if we were unable to build a HandshakeRequest struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v HandshakeRequest -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v HandshakeRequest +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *HandshakeRequest) FromWire(w wire.Value) error { for _, field := range w.GetStruct().Fields { @@ -3242,14 +3242,14 @@ func (_List_Feature_ValueList) Close() {} // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *HandshakeResponse) ToWire() (wire.Value, error) { var ( fields [4]wire.Field @@ -3321,16 +3321,16 @@ func _List_Feature_Read(l wire.ValueList) ([]Feature, error) { // An error is returned if we were unable to build a HandshakeResponse struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v HandshakeResponse -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v HandshakeResponse +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *HandshakeResponse) FromWire(w wire.Value) error { var err error @@ -3752,14 +3752,14 @@ type Module struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *Module) ToWire() (wire.Value, error) { var ( fields [3]wire.Field @@ -3799,16 +3799,16 @@ func (v *Module) ToWire() (wire.Value, error) { // An error is returned if we were unable to build a Module struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v Module -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v Module +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *Module) FromWire(w wire.Value) error { var err error @@ -4171,14 +4171,14 @@ func (_List_Function_ValueList) Close() {} // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *Service) ToWire() (wire.Value, error) { var ( fields [6]wire.Field @@ -4265,16 +4265,16 @@ func _List_Function_Read(l wire.ValueList) ([]*Function, error) { // An error is returned if we were unable to build a Service struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v Service -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v Service +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *Service) FromWire(w wire.Value) error { var err error @@ -4862,8 +4862,8 @@ func SimpleType_Values() []SimpleType { // UnmarshalText tries to decode SimpleType from a byte slice // containing its name. // -// var v SimpleType -// err := v.UnmarshalText([]byte("BOOL")) +// var v SimpleType +// err := v.UnmarshalText([]byte("BOOL")) func (v *SimpleType) UnmarshalText(value []byte) error { switch s := string(value); s { case "BOOL": @@ -4969,10 +4969,10 @@ func (v SimpleType) Ptr() *SimpleType { // Encode encodes SimpleType directly to bytes. // -// sWriter := BinaryStreamer.Writer(writer) +// sWriter := BinaryStreamer.Writer(writer) // -// var v SimpleType -// return v.Encode(sWriter) +// var v SimpleType +// return v.Encode(sWriter) func (v SimpleType) Encode(sw stream.Writer) error { return sw.WriteInt32(int32(v)) } @@ -4989,16 +4989,16 @@ func (v SimpleType) ToWire() (wire.Value, error) { // FromWire deserializes SimpleType from its Thrift-level // representation. // -// x, err := binaryProtocol.Decode(reader, wire.TI32) -// if err != nil { -// return SimpleType(0), err -// } +// x, err := binaryProtocol.Decode(reader, wire.TI32) +// if err != nil { +// return SimpleType(0), err +// } // -// var v SimpleType -// if err := v.FromWire(x); err != nil { -// return SimpleType(0), err -// } -// return v, nil +// var v SimpleType +// if err := v.FromWire(x); err != nil { +// return SimpleType(0), err +// } +// return v, nil func (v *SimpleType) FromWire(w wire.Value) error { *v = (SimpleType)(w.GetI32()) return nil @@ -5006,13 +5006,13 @@ func (v *SimpleType) FromWire(w wire.Value) error { // Decode reads off the encoded SimpleType directly off of the wire. // -// sReader := BinaryStreamer.Reader(reader) +// sReader := BinaryStreamer.Reader(reader) // -// var v SimpleType -// if err := v.Decode(sReader); err != nil { -// return SimpleType(0), err -// } -// return v, nil +// var v SimpleType +// if err := v.Decode(sReader); err != nil { +// return SimpleType(0), err +// } +// return v, nil func (v *SimpleType) Decode(sr stream.Reader) error { i, err := sr.ReadInt32() if err != nil { @@ -5148,14 +5148,14 @@ type Type struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *Type) ToWire() (wire.Value, error) { var ( fields [6]wire.Field @@ -5245,16 +5245,16 @@ func _TypeReference_Read(w wire.Value) (*TypeReference, error) { // An error is returned if we were unable to build a Type struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v Type -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v Type +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *Type) FromWire(w wire.Value) error { var err error @@ -5775,14 +5775,14 @@ type TypePair struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *TypePair) ToWire() (wire.Value, error) { var ( fields [2]wire.Field @@ -5820,16 +5820,16 @@ func (v *TypePair) ToWire() (wire.Value, error) { // An error is returned if we were unable to build a TypePair struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v TypePair -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v TypePair +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *TypePair) FromWire(w wire.Value) error { var err error @@ -6078,14 +6078,14 @@ type TypeReference struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *TypeReference) ToWire() (wire.Value, error) { var ( fields [3]wire.Field @@ -6126,16 +6126,16 @@ func (v *TypeReference) ToWire() (wire.Value, error) { // An error is returned if we were unable to build a TypeReference struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v TypeReference -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v TypeReference +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *TypeReference) FromWire(w wire.Value) error { var err error @@ -6410,14 +6410,14 @@ type Plugin_Goodbye_Args struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *Plugin_Goodbye_Args) ToWire() (wire.Value, error) { var ( fields [0]wire.Field @@ -6434,16 +6434,16 @@ func (v *Plugin_Goodbye_Args) ToWire() (wire.Value, error) { // An error is returned if we were unable to build a Plugin_Goodbye_Args struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v Plugin_Goodbye_Args -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v Plugin_Goodbye_Args +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *Plugin_Goodbye_Args) FromWire(w wire.Value) error { for _, field := range w.GetStruct().Fields { @@ -6639,14 +6639,14 @@ type Plugin_Goodbye_Result struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *Plugin_Goodbye_Result) ToWire() (wire.Value, error) { var ( fields [0]wire.Field @@ -6663,16 +6663,16 @@ func (v *Plugin_Goodbye_Result) ToWire() (wire.Value, error) { // An error is returned if we were unable to build a Plugin_Goodbye_Result struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v Plugin_Goodbye_Result -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v Plugin_Goodbye_Result +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *Plugin_Goodbye_Result) FromWire(w wire.Value) error { for _, field := range w.GetStruct().Fields { @@ -6800,14 +6800,14 @@ type Plugin_Handshake_Args struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *Plugin_Handshake_Args) ToWire() (wire.Value, error) { var ( fields [1]wire.Field @@ -6841,16 +6841,16 @@ func _HandshakeRequest_Read(w wire.Value) (*HandshakeRequest, error) { // An error is returned if we were unable to build a Plugin_Handshake_Args struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v Plugin_Handshake_Args -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v Plugin_Handshake_Args +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *Plugin_Handshake_Args) FromWire(w wire.Value) error { var err error @@ -7120,14 +7120,14 @@ type Plugin_Handshake_Result struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *Plugin_Handshake_Result) ToWire() (wire.Value, error) { var ( fields [1]wire.Field @@ -7165,16 +7165,16 @@ func _HandshakeResponse_Read(w wire.Value) (*HandshakeResponse, error) { // An error is returned if we were unable to build a Plugin_Handshake_Result struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v Plugin_Handshake_Result -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v Plugin_Handshake_Result +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *Plugin_Handshake_Result) FromWire(w wire.Value) error { var err error @@ -7385,14 +7385,14 @@ type ServiceGenerator_Generate_Args struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *ServiceGenerator_Generate_Args) ToWire() (wire.Value, error) { var ( fields [1]wire.Field @@ -7426,16 +7426,16 @@ func _GenerateServiceRequest_Read(w wire.Value) (*GenerateServiceRequest, error) // An error is returned if we were unable to build a ServiceGenerator_Generate_Args struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v ServiceGenerator_Generate_Args -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v ServiceGenerator_Generate_Args +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *ServiceGenerator_Generate_Args) FromWire(w wire.Value) error { var err error @@ -7705,14 +7705,14 @@ type ServiceGenerator_Generate_Result struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *ServiceGenerator_Generate_Result) ToWire() (wire.Value, error) { var ( fields [1]wire.Field @@ -7750,16 +7750,16 @@ func _GenerateServiceResponse_Read(w wire.Value) (*GenerateServiceResponse, erro // An error is returned if we were unable to build a ServiceGenerator_Generate_Result struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v ServiceGenerator_Generate_Result -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v ServiceGenerator_Generate_Result +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *ServiceGenerator_Generate_Result) FromWire(w wire.Value) error { var err error diff --git a/plugin/doc.go b/plugin/doc.go index 487e050c..d17b8672 100644 --- a/plugin/doc.go +++ b/plugin/doc.go @@ -23,17 +23,17 @@ // Plugins are standalone programs with names in the format // thriftrw-plugin-$name where $name is the name of the plugin. // -// // thriftrw-plugin-myfancyplugin/main.go -// package main +// // thriftrw-plugin-myfancyplugin/main.go +// package main // -// import "go.uber.org/thriftrw/plugin" +// import "go.uber.org/thriftrw/plugin" // -// func main() { -// plugin.Main(&plugin.Plugin{ -// Name: "myfancyplugin", -// // ... -// }) -// } +// func main() { +// plugin.Main(&plugin.Plugin{ +// Name: "myfancyplugin", +// // ... +// }) +// } // // Note that the name in the executable MUST match the name in the Plugin // struct. Plugins need to be installed and available on the $PATH before they @@ -44,13 +44,13 @@ // // To use a plugin, pass its name in with the -p/--plugin option. // -// thriftrw --plugin=myfancyplugin foo.thrift +// thriftrw --plugin=myfancyplugin foo.thrift // // Arguments may be sent to plugins by including them in the name. These are // passed through to the plugin process as command line arguments. For // example, // -// thriftrw --plugin='myfancyplugin --useContext' +// thriftrw --plugin='myfancyplugin --useContext' // // Will pass `--useContext` to `thriftrw-plugin-myfancyplugin`. package plugin diff --git a/plugin/plugin.go b/plugin/plugin.go index fd22e9fc..cf27821c 100644 --- a/plugin/plugin.go +++ b/plugin/plugin.go @@ -60,9 +60,9 @@ type Plugin struct { // Main serves the given plugin. It is the entry point to the plugin system. // User-defined plugins should call Main with their main function. // -// func main() { -// plugin.Main(myPlugin) -// } +// func main() { +// plugin.Main(myPlugin) +// } func Main(p *Plugin) { if p.Name == "" { panic("a plugin name must be provided") diff --git a/protocol/binary.go b/protocol/binary.go index cd98b4b2..779f4979 100644 --- a/protocol/binary.go +++ b/protocol/binary.go @@ -43,59 +43,59 @@ var BinaryStreamer stream.Protocol // to be able to distinguish enveloped, versioned enveloped, and not-enveloped // messages reliably: // -// 1. No message will use an envelope version greater than 0x7fff. This -// would flip the bit that makes versioned envelopes recognizable. The only -// envelope version we recognize today is version 1. +// 1. No message will use an envelope version greater than 0x7fff. This +// would flip the bit that makes versioned envelopes recognizable. The only +// envelope version we recognize today is version 1. // -// 2. No message with an unversioned envelope will have a message name -// (procedure name) longer than 0x00ffffffff (three bytes of length prefix). -// This would roll into the byte that distinguishes the type of the first -// field of an un-enveloped struct. This would require a 16MB procedure name. +// 2. No message with an unversioned envelope will have a message name +// (procedure name) longer than 0x00ffffffff (three bytes of length prefix). +// This would roll into the byte that distinguishes the type of the first +// field of an un-enveloped struct. This would require a 16MB procedure name. // // The overlapping grammars are: // -// 1. Enveloped (strict, with version) +// 1. Enveloped (strict, with version) // -// versionbits:4 methodname~4 seqid:4 struct +// versionbits:4 methodname~4 seqid:4 struct // -// versionbits := 0x80000000 | (version:2 << 16) | messagetype:2 +// versionbits := 0x80000000 | (version:2 << 16) | messagetype:2 // -// 2. Enveloped (non-strict, without version) +// 2. Enveloped (non-strict, without version) // -// methodname~4 messagetype:1 seqid:4 struct +// methodname~4 messagetype:1 seqid:4 struct // -// 3. Unenveloped +// 3. Unenveloped // -// struct := (typeid:1 fieldid:2 )* typeid:1=0x00 +// struct := (typeid:1 fieldid:2 )* typeid:1=0x00 // // A message can be, // -// 1. Enveloped (strict) +// 1. Enveloped (strict) // -// The message must begin with 0x80 -- the first byte of the version number. +// The message must begin with 0x80 -- the first byte of the version number. // -// 2. Enveloped (non-strict) +// 2. Enveloped (non-strict) // -// The message begins with the length of the method name. As long as the -// method name is not 16 MB long, the first byte of this message is 0x00. If -// the message contains at least 9 other bytes, it is enveloped using the -// non-strict format. +// The message begins with the length of the method name. As long as the +// method name is not 16 MB long, the first byte of this message is 0x00. If +// the message contains at least 9 other bytes, it is enveloped using the +// non-strict format. // -// 4 bytes method name length (minimum = 0) -// n bytes method name -// 1 byte message type -// 4 bytes sequence ID -// 1 byte empty struct (0x00) -// -------- -// >10 bytes +// 4 bytes method name length (minimum = 0) +// n bytes method name +// 1 byte message type +// 4 bytes sequence ID +// 1 byte empty struct (0x00) +// -------- +// >10 bytes // -// 3. Unenveloped +// 3. Unenveloped // -// If the message begins with 0x00 but does not contain any more bytes, it's -// a bare, un-enveloped empty struct. +// If the message begins with 0x00 but does not contain any more bytes, it's +// a bare, un-enveloped empty struct. // -// If the message begins with any other byte, it's an unenveloped message or -// an invalid request. +// If the message begins with any other byte, it's an unenveloped message or +// an invalid request. var EnvelopeAgnosticBinary EnvelopeAgnosticProtocol func init() { From de722f04e3b55295bb352ffd9aed87dac0beb917 Mon Sep 17 00:00:00 2001 From: Ryan Hang Date: Mon, 29 May 2023 07:44:40 -0700 Subject: [PATCH 07/14] ci: Test against latest versions of Go --- .github/workflows/go.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 07f485dc..24ffe53f 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -13,9 +13,9 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - go: ["1.17.x", "1.18.x"] + go: ["1.19.x", "1.20.x"] include: - - go: 1.18.x + - go: 1.20.x latest: true steps: From 6268dfe422e26f65b9b978a09a8308c3989e9df0 Mon Sep 17 00:00:00 2001 From: Sung Yoon Whang Date: Tue, 30 May 2023 15:58:51 -0700 Subject: [PATCH 08/14] Remove all usages of io/ioutil (#577) io/ioutil package was deprecated and is not supported since Go 1.19. This removes all ioutil pkg usages in thriftrw.. --- cmd/thriftrw-list-deps/main_test.go | 5 ++--- compile/options.go | 6 +++--- gen/embedidl_test.go | 4 ++-- gen/generate.go | 3 +-- gen/generate_test.go | 7 +++---- gen/golden_test.go | 3 +-- gen/service_test.go | 4 ++-- gen/struct_test.go | 4 ++-- internal/breaktest/repo.go | 3 +-- main_test.go | 5 ++--- protocol/binary/stream_reader.go | 3 +-- 11 files changed, 20 insertions(+), 27 deletions(-) diff --git a/cmd/thriftrw-list-deps/main_test.go b/cmd/thriftrw-list-deps/main_test.go index 329f1cd9..dc852461 100644 --- a/cmd/thriftrw-list-deps/main_test.go +++ b/cmd/thriftrw-list-deps/main_test.go @@ -1,7 +1,6 @@ package main import ( - "io/ioutil" "os" "path/filepath" "sort" @@ -12,7 +11,7 @@ import ( ) func TestThriftrwListDeps(t *testing.T) { - tmpDir, err := ioutil.TempDir("", "") + tmpDir, err := os.MkdirTemp("", "") require.NoError(t, err) defer os.RemoveAll(tmpDir) @@ -29,7 +28,7 @@ include "./c.thrift"`, path := filepath.Join(tmpDir, name) err = os.MkdirAll(filepath.Dir(path), 0755) require.NoError(t, err) - err = ioutil.WriteFile(path, []byte(content), 0644) + err = os.WriteFile(path, []byte(content), 0644) require.NoError(t, err) } diff --git a/compile/options.go b/compile/options.go index baca73ad..8442c9e5 100644 --- a/compile/options.go +++ b/compile/options.go @@ -21,7 +21,7 @@ package compile import ( - "io/ioutil" + "os" "path/filepath" ) @@ -31,7 +31,7 @@ type Option func(*compiler) // FS is used by the compiler to interact with the filesystem. type FS interface { // Read reads the file named by filename and returns the contents. - // See: https://golang.org/pkg/io/ioutil/#ReadFile + // See: https://golang.org/pkg/os/#ReadFile Read(filename string) ([]byte, error) // Abs returns an absolute representation of path. // See: https://golang.org/pkg/path/filepath/#Abs @@ -41,7 +41,7 @@ type FS interface { type realFS struct{} func (realFS) Read(filename string) ([]byte, error) { - return ioutil.ReadFile(filename) + return os.ReadFile(filename) } func (realFS) Abs(p string) (string, error) { diff --git a/gen/embedidl_test.go b/gen/embedidl_test.go index 95140696..eddacfa4 100644 --- a/gen/embedidl_test.go +++ b/gen/embedidl_test.go @@ -23,7 +23,7 @@ package gen import ( "crypto/sha1" "encoding/hex" - "io/ioutil" + "io" "os" "strings" "testing" @@ -39,7 +39,7 @@ func loadIDL(filename string) (string, string, error) { if err != nil { return "", "", err } - rawIDL, err := ioutil.ReadAll(f) + rawIDL, err := io.ReadAll(f) if err != nil { return "", "", err } diff --git a/gen/generate.go b/gen/generate.go index 5902f981..b3c0a8e6 100644 --- a/gen/generate.go +++ b/gen/generate.go @@ -23,7 +23,6 @@ package gen import ( "bytes" "fmt" - "io/ioutil" "os" "path/filepath" "strings" @@ -172,7 +171,7 @@ func Generate(m *compile.Module, o *Options) error { return fmt.Errorf("could not create directory %q: %v", directory, err) } - if err := ioutil.WriteFile(fullPath, contents, 0644); err != nil { + if err := os.WriteFile(fullPath, contents, 0644); err != nil { return fmt.Errorf("failed to write %q: %v", fullPath, err) } } diff --git a/gen/generate_test.go b/gen/generate_test.go index 5da6b286..17f701b3 100644 --- a/gen/generate_test.go +++ b/gen/generate_test.go @@ -24,7 +24,6 @@ import ( "bytes" "errors" "fmt" - "io/ioutil" "os" "path/filepath" "sort" @@ -51,7 +50,7 @@ func testdata(t *testing.T, paths ...string) string { } func TestGenerateWithRelativePaths(t *testing.T) { - outputDir, err := ioutil.TempDir("", "thriftrw-generate-test") + outputDir, err := os.MkdirTemp("", "thriftrw-generate-test") require.NoError(t, err) defer os.RemoveAll(outputDir) @@ -83,7 +82,7 @@ func TestGenerateWithRelativePaths(t *testing.T) { } func TestGenerateWithHyphenPaths(t *testing.T) { - outputDir, err := ioutil.TempDir("", "thriftrw-generate-test") + outputDir, err := os.MkdirTemp("", "thriftrw-generate-test") require.NoError(t, err) defer os.RemoveAll(outputDir) @@ -311,7 +310,7 @@ func TestGenerate(t *testing.T) { mockCtrl := gomock.NewController(t) defer mockCtrl.Finish() - outputDir, err := ioutil.TempDir(os.TempDir(), "test-generate-recurse") + outputDir, err := os.MkdirTemp(os.TempDir(), "test-generate-recurse") require.NoError(t, err) defer os.RemoveAll(outputDir) diff --git a/gen/golden_test.go b/gen/golden_test.go index 0d644d17..2de96d4f 100644 --- a/gen/golden_test.go +++ b/gen/golden_test.go @@ -22,7 +22,6 @@ package gen import ( "bufio" - "io/ioutil" "os" "path/filepath" "regexp" @@ -57,7 +56,7 @@ func TestCodeIsUpToDate(t *testing.T) { thriftFiles, err := filepath.Glob(thriftRoot + "/*.thrift") require.NoError(t, err) - outputDir, err := ioutil.TempDir("", "thriftrw-golden-test") + outputDir, err := os.MkdirTemp("", "thriftrw-golden-test") require.NoError(t, err) defer os.RemoveAll(outputDir) diff --git a/gen/service_test.go b/gen/service_test.go index 2bc34320..fe3cd891 100644 --- a/gen/service_test.go +++ b/gen/service_test.go @@ -24,7 +24,7 @@ import ( "bytes" "errors" "fmt" - "io/ioutil" + "io" "reflect" "testing" @@ -714,7 +714,7 @@ func TestArgsAndResultValidation(t *testing.T) { }) t.Run("StreamEncode", func(t *testing.T) { - sw := binary.Default.Writer(ioutil.Discard) + sw := binary.Default.Writer(io.Discard) defer sw.Close() err := tt.serialize.Encode(sw) diff --git a/gen/struct_test.go b/gen/struct_test.go index 9a082733..5bd5e180 100644 --- a/gen/struct_test.go +++ b/gen/struct_test.go @@ -23,7 +23,7 @@ package gen import ( "encoding/json" "fmt" - "io/ioutil" + "io" "reflect" "testing" @@ -1817,7 +1817,7 @@ func TestStructValidation(t *testing.T) { }) t.Run("StreamEncode", func(t *testing.T) { - sw := binary.Default.Writer(ioutil.Discard) + sw := binary.Default.Writer(io.Discard) defer sw.Close() err := tt.serialize.Encode(sw) diff --git a/internal/breaktest/repo.go b/internal/breaktest/repo.go index b688c210..20c0a0fe 100644 --- a/internal/breaktest/repo.go +++ b/internal/breaktest/repo.go @@ -21,7 +21,6 @@ package breaktest import ( - "io/ioutil" "os" "path/filepath" "testing" @@ -77,7 +76,7 @@ func (w *writeThrift) writeThrifts(extraMsg string) error { if err := os.MkdirAll(filepath.Dir(path), 0755); err != nil { return err } - if err := ioutil.WriteFile(path, []byte(content), 0600); err != nil { + if err := os.WriteFile(path, []byte(content), 0600); err != nil { return err } } diff --git a/main_test.go b/main_test.go index 259dd176..6894f75d 100644 --- a/main_test.go +++ b/main_test.go @@ -21,7 +21,6 @@ package main import ( - "io/ioutil" "os" "path/filepath" "testing" @@ -33,11 +32,11 @@ import ( ) func TestDeterminePackagePrefix(t *testing.T) { - gopath, err := ioutil.TempDir("", "thriftrw-main-test") + gopath, err := os.MkdirTemp("", "thriftrw-main-test") require.NoError(t, err) defer os.RemoveAll(gopath) - gopath2, err := ioutil.TempDir("", "thriftrw-main-test") + gopath2, err := os.MkdirTemp("", "thriftrw-main-test") require.NoError(t, err) defer os.RemoveAll(gopath2) diff --git a/protocol/binary/stream_reader.go b/protocol/binary/stream_reader.go index f61e650e..a0b2e1e2 100644 --- a/protocol/binary/stream_reader.go +++ b/protocol/binary/stream_reader.go @@ -23,7 +23,6 @@ package binary import ( "bytes" "io" - "io/ioutil" "math" "sync" @@ -128,7 +127,7 @@ func (sr *StreamReader) discardSeek(n int64) error { } func (sr *StreamReader) discardStream(n int64) error { - _, err := io.CopyN(ioutil.Discard, sr.reader, n) + _, err := io.CopyN(io.Discard, sr.reader, n) if err == io.EOF { // All EOFs are unexpected when streaming err = io.ErrUnexpectedEOF From 1e966485f6a454276eb0a0285a75d6b84b3577df Mon Sep 17 00:00:00 2001 From: r-hang Date: Tue, 30 May 2023 16:35:46 -0700 Subject: [PATCH 09/14] Fix remaining lint errors (#578) After rebasing #574 on top of #577 and running GO111MODULE=on make lint I still see some errors. cmd/thriftbreak/main_test.go:26:2: "io/ioutil" has been deprecated since Go 1.19: As of Go 1.16, the same functionality is now provided by package io or package os, and those implementations should be preferred in new code. See the specific function documentation for details. (SA1019) gen/string.go:66:15: strings.Title has been deprecated since Go 1.18 and an alternative has been available since Go 1.0: The rule Title uses for word boundaries does not handle Unicode punctuation properly. Use golang.org/x/text/cases instead. (SA1019) After this change: $ git log --oneline a054ce6 (HEAD -> optimise_read_string) Fix remaining lint errors 2c1d285 build tags 8a1aa7d address review comments f26170a inline 41dacbd remove bench reports 4ad4d9c optimise write string fb22d6e optimise readstring() 6268dfe (origin/dev, origin/HEAD) Remove all usages of io/ioutil (#577) $ GO111MODULE=on make lint Checking gofmt Checking govet Checking golint Checking staticcheck $ echo $? 0 I've cherry-picked the contents of the HEAD commit displayed above into a separate branch for this PR to dev. --- cmd/thriftbreak/main_test.go | 5 ++--- gen/string.go | 4 +++- go.mod | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cmd/thriftbreak/main_test.go b/cmd/thriftbreak/main_test.go index 528eb8bf..a65a921b 100644 --- a/cmd/thriftbreak/main_test.go +++ b/cmd/thriftbreak/main_test.go @@ -23,7 +23,6 @@ package main import ( "bytes" "io" - "io/ioutil" "os" "testing" @@ -90,7 +89,7 @@ func TestThriftBreakIntegration(t *testing.T) { tmpDir := t.TempDir() breaktest.CreateRepoAndCommit(t, tmpDir, from, to, remove) - f, err := ioutil.TempFile(tmpDir, "stdout") + f, err := os.CreateTemp(tmpDir, "stdout") require.NoError(t, err, "create temporary file") defer func(oldStdout *os.File) { assert.NoError(t, f.Close()) @@ -103,7 +102,7 @@ func TestThriftBreakIntegration(t *testing.T) { require.Error(t, err, "expected an error with Thrift backwards incompatible changes") assert.EqualError(t, err, "found 5 issues") - stderr, err := ioutil.ReadFile(f.Name()) + stderr, err := os.ReadFile(f.Name()) require.NoError(t, err) out := string(stderr) diff --git a/gen/string.go b/gen/string.go index 83e2b681..7fa5e568 100644 --- a/gen/string.go +++ b/gen/string.go @@ -27,6 +27,8 @@ import ( "unicode/utf8" "go.uber.org/thriftrw/compile" + "golang.org/x/text/cases" + "golang.org/x/text/language" ) // isAllCaps checks if a string contains all capital letters only. Non-letters @@ -63,7 +65,7 @@ func pascalCase(allowAllCaps bool, words ...string) string { if isAllCaps(chunk) && !allowAllCaps { // A single ALLCAPS word does not count as SCREAMING_SNAKE_CASE. // There must be at least one underscore. - words[i] = strings.Title(strings.ToLower(chunk)) + words[i] = cases.Title(language.English).String(strings.ToLower(chunk)) continue } diff --git a/go.mod b/go.mod index 884a43fb..fb94171e 100644 --- a/go.mod +++ b/go.mod @@ -14,6 +14,7 @@ require ( go.uber.org/multierr v1.1.0 go.uber.org/zap v1.9.1 golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f + golang.org/x/text v0.7.0 golang.org/x/tools v0.4.1-0.20221208213631-3f74d914ae6d honnef.co/go/tools v0.4.3 ) From e4f0c881e9fc3bde9830413a6bcf068999a6598b Mon Sep 17 00:00:00 2001 From: Saurabh Agrawal <47345411+saurabhagrawal-86@users.noreply.github.com> Date: Tue, 6 Jun 2023 16:31:13 +0530 Subject: [PATCH 10/14] Optimise ReadString() and WriteString() (#574) Optimise StreamReader's ReadString CPU by 35% and memory by 50% using the new String and SliceData functions introduced in the unsafe package in go 1.20. ref: https://github.com/thriftrw/thriftrw-go/pull/574#issue-1721404785 --- go.mod | 2 +- protocol/binary/stream_reader.go | 6 --- protocol/binary/stream_reader_test.go | 50 ++++++++++++++++++++++ protocol/binary/stream_writer.go | 10 ----- protocol/binary/stream_writer_test.go | 40 ++++++++++++++++++ protocol/binary/string_post_go120.go | 48 +++++++++++++++++++++ protocol/binary/string_pre_go120.go | 42 +++++++++++++++++++ protocol/binary_test.go | 60 +++++++++++++++++++++++++++ 8 files changed, 241 insertions(+), 17 deletions(-) create mode 100644 protocol/binary/stream_reader_test.go create mode 100644 protocol/binary/stream_writer_test.go create mode 100644 protocol/binary/string_post_go120.go create mode 100644 protocol/binary/string_pre_go120.go diff --git a/go.mod b/go.mod index fb94171e..97d6d15f 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module go.uber.org/thriftrw -go 1.17 +go 1.20 require ( github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 diff --git a/protocol/binary/stream_reader.go b/protocol/binary/stream_reader.go index a0b2e1e2..f151cd54 100644 --- a/protocol/binary/stream_reader.go +++ b/protocol/binary/stream_reader.go @@ -181,12 +181,6 @@ func (sr *StreamReader) ReadInt64() (int64, error) { return int64(bigEndian.Uint64(bs)), err } -// ReadString reads a Thrift encoded string. -func (sr *StreamReader) ReadString() (string, error) { - bs, err := sr.ReadBinary() - return string(bs), err -} - // ReadDouble reads a Thrift encoded double, returning a float64. func (sr *StreamReader) ReadDouble() (float64, error) { val, err := sr.ReadInt64() diff --git a/protocol/binary/stream_reader_test.go b/protocol/binary/stream_reader_test.go new file mode 100644 index 00000000..999c71ea --- /dev/null +++ b/protocol/binary/stream_reader_test.go @@ -0,0 +1,50 @@ +// Copyright (c) 2023 Uber Technologies, Inc. +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +package binary + +import ( + "bytes" + "io" + "testing" + + "github.com/stretchr/testify/require" +) + +func BenchmarkReadString(b *testing.B) { + var streamBuff bytes.Buffer + + // Encode with Streaming protocol + w := NewStreamWriter(&streamBuff) + require.NoError(b, w.WriteString("the quick brown fox jumps over the lazy dog")) + require.NoError(b, w.Close()) + + encoded := streamBuff.Bytes() + + enc := bytes.NewReader(encoded) + sr := NewStreamReader(enc) + defer sr.Close() + + b.ResetTimer() + for i := 0; i < b.N; i++ { + sr.ReadString() + enc.Seek(0, io.SeekStart) + } +} diff --git a/protocol/binary/stream_writer.go b/protocol/binary/stream_writer.go index 6f85149f..3bc34e43 100644 --- a/protocol/binary/stream_writer.go +++ b/protocol/binary/stream_writer.go @@ -104,16 +104,6 @@ func (sw *StreamWriter) WriteInt64(i int64) error { return sw.write(bs) } -// WriteString encodes a string -func (sw *StreamWriter) WriteString(s string) error { - if err := sw.WriteInt32(int32(len(s))); err != nil { - return err - } - - _, err := io.WriteString(sw.writer, s) - return err -} - // WriteDouble encodes a double func (sw *StreamWriter) WriteDouble(d float64) error { value := math.Float64bits(d) diff --git a/protocol/binary/stream_writer_test.go b/protocol/binary/stream_writer_test.go new file mode 100644 index 00000000..1e5ba9cd --- /dev/null +++ b/protocol/binary/stream_writer_test.go @@ -0,0 +1,40 @@ +// Copyright (c) 2023 Uber Technologies, Inc. +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +package binary + +import ( + "bytes" + "testing" +) + +func BenchmarkWriteString(b *testing.B) { + var streamBuff bytes.Buffer + sw := NewStreamWriter(&streamBuff) + defer sw.Close() + + b.ResetTimer() + + s := "the quick brown fox jumps over the lazy dog" + for i := 0; i < b.N; i++ { + sw.WriteString(s) + streamBuff.Reset() + } +} diff --git a/protocol/binary/string_post_go120.go b/protocol/binary/string_post_go120.go new file mode 100644 index 00000000..7b0bd866 --- /dev/null +++ b/protocol/binary/string_post_go120.go @@ -0,0 +1,48 @@ +// Copyright (c) 2023 Uber Technologies, Inc. +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +//go:build go1.20 +// +build go1.20 + +package binary + +import "unsafe" + +// ReadString reads a Thrift encoded string. +func (sr *StreamReader) ReadString() (string, error) { + bs, err := sr.ReadBinary() + // It is safe to use "unsafe" here because there are no + // mutable references to bs. + return unsafe.String(unsafe.SliceData(bs), len(bs)), err +} + +// WriteString encodes a string +func (sw *StreamWriter) WriteString(s string) error { + if err := sw.WriteInt32(int32(len(s))); err != nil { + return err + } + // It is safe to use "unsafe" here because there are no + // mutable references to the byte slice b. + // sw.write() delegates to the underlying io.Writer, + // and according to its documentation, "Write must + // not modify the slice data, even temporarily." + b := unsafe.Slice(unsafe.StringData(s), len(s)) + return sw.write(b) +} diff --git a/protocol/binary/string_pre_go120.go b/protocol/binary/string_pre_go120.go new file mode 100644 index 00000000..8130f4fc --- /dev/null +++ b/protocol/binary/string_pre_go120.go @@ -0,0 +1,42 @@ +// Copyright (c) 2023 Uber Technologies, Inc. +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +//go:build !go1.20 +// +build !go1.20 + +package binary + +import "io" + +// ReadString reads a Thrift encoded string. +func (sr *StreamReader) ReadString() (string, error) { + bs, err := sr.ReadBinary() + return string(bs), err +} + +// WriteString encodes a string +func (sw *StreamWriter) WriteString(s string) error { + if err := sw.WriteInt32(int32(len(s))); err != nil { + return err + } + + _, err := io.WriteString(sw.writer, s) + return err +} diff --git a/protocol/binary_test.go b/protocol/binary_test.go index f174491f..465d9167 100644 --- a/protocol/binary_test.go +++ b/protocol/binary_test.go @@ -23,6 +23,7 @@ package protocol import ( "bytes" "context" + "errors" "fmt" "io" "math" @@ -560,6 +561,65 @@ func TestBinaryEOFFailure(t *testing.T) { } } +type limitWriter struct { + b []byte +} + +var errWriteLimitReached = errors.New("write limit reached") + +func (lw *limitWriter) Write(p []byte) (int, error) { + n := copy(lw.b, p) + lw.b = lw.b[n:] + if n < len(p) { + return n, errWriteLimitReached + } + return n, nil +} + +func TestStringEncodeFailure(t *testing.T) { + // WriteString("hello") requires 9 bytes + // - four bytes for length as int32, and + // - five bytes for "hello" + + testCases := []struct { + msg string + in string + len int + wantErr error + }{ + { + msg: "int_write_failure", + in: "hello", + len: 3, + wantErr: errWriteLimitReached, + }, + { + msg: "bytes_write_failure", + in: "hello", + len: 8, + wantErr: errWriteLimitReached, + }, + { + msg: "no_failure", + in: "hello", + len: 9, + }, + } + for _, tt := range testCases { + t.Run(tt.msg, func(t *testing.T) { + bw := &limitWriter{b: make([]byte, tt.len)} + sw := binary.NewStreamWriter(bw) + err := sw.WriteString(tt.in) + if tt.wantErr != nil { + require.Error(t, err) + assert.Equal(t, tt.wantErr, err) + } else { + require.NoError(t, err) + } + }) + } +} + func TestStruct(t *testing.T) { tests := []encodeDecodeTest{ {"empty struct", vstruct(), []byte{0x00}}, From 91972310ac73db9bca157997e9ea86a9d803ded1 Mon Sep 17 00:00:00 2001 From: r-hang Date: Wed, 7 Jun 2023 10:02:49 -0700 Subject: [PATCH 11/14] Update changelog (#579) Update changelog in preparation for 1.31.0 release. --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 09700163..fb0bd19a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,8 @@ 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. +### Changed +- StreamReader ReadString() and WriteString() performance improvements. ## [1.30.0] - 2023-04-06 ### Added From 0977c0d13f74e3013599cbd73c3aad20a0e79dfe Mon Sep 17 00:00:00 2001 From: r-hang Date: Wed, 7 Jun 2023 15:51:55 -0700 Subject: [PATCH 12/14] Update generated doc strings and make generate (#580) These changes are the result of: - Re-tabbing the doc string generation logic of gen/enum.go and gen/field.go - running 'GO111MODULE=on make generate' on dev. These steps are performed to update generated code, make the generated code compliant with gofmt, and resolve release issues ahead of time. --- gen/enum.go | 40 +- gen/field.go | 32 +- gen/internal/tests/collision/collision.go | 338 ++++----- gen/internal/tests/containers/containers.go | 288 ++++---- .../enum-text-marshal-strict.go | 40 +- .../tests/enum_conflict/enum_conflict.go | 72 +- gen/internal/tests/enums/enums.go | 428 ++++++------ gen/internal/tests/exceptions/exceptions.go | 96 +-- .../tests/hyphenated-file/hyphenated-file.go | 32 +- .../tests/hyphenated_file/hyphenated_file.go | 32 +- .../tests/non_hyphenated/non_hyphenated.go | 64 +- gen/internal/tests/nozap/nozap.go | 72 +- gen/internal/tests/services/services.go | 642 +++++++++--------- .../tests/set_to_slice/set_to_slice.go | 64 +- gen/internal/tests/structs/structs.go | 610 ++++++++--------- gen/internal/tests/typedefs/typedefs.go | 160 ++--- gen/internal/tests/unions/unions.go | 96 +-- .../tests/uuid_conflict/uuid_conflict.go | 32 +- internal/envelope/exception/exception.go | 14 +- plugin/api/api.go | 148 ++-- 20 files changed, 1650 insertions(+), 1650 deletions(-) diff --git a/gen/enum.go b/gen/enum.go index 95559232..9f6b17b2 100644 --- a/gen/enum.go +++ b/gen/enum.go @@ -119,8 +119,8 @@ func enum(g Generator, spec *compile.EnumSpec) error { // containing its name. <- if .Spec.Items> // - // var <$v> <$enumName> - // err := <$v>.UnmarshalText([]byte("<(index .Spec.Items 0).Name>")) + // var <$v> <$enumName> + // err := <$v>.UnmarshalText([]byte("<(index .Spec.Items 0).Name>")) <- end> func (<$v> *<$enumName>) UnmarshalText(<$value> []byte) error { <- $s := newVar "s" -> @@ -196,10 +196,10 @@ func enum(g Generator, spec *compile.EnumSpec) error { <$sw := newVar "sw"> // Encode encodes <$enumName> directly to bytes. // - // sWriter := BinaryStreamer.Writer(writer) + // sWriter := BinaryStreamer.Writer(writer) // - // var <$v> <$enumName> - // return <$v>.Encode(sWriter) + // var <$v> <$enumName> + // return <$v>.Encode(sWriter) func (<$v> <$enumName>) Encode(<$sw> <$stream>.Writer) error { return <$sw>.WriteInt32(int32(<$v>)) } @@ -217,16 +217,16 @@ func enum(g Generator, spec *compile.EnumSpec) error { // FromWire deserializes <$enumName> from its Thrift-level // representation. // - // x, err := binaryProtocol.Decode(reader, wire.TI32) - // if err != nil { - // return <$enumName>(0), err - // } + // x, err := binaryProtocol.Decode(reader, wire.TI32) + // if err != nil { + // return <$enumName>(0), err + // } // - // var <$v> <$enumName> - // if err := <$v>.FromWire(x); err != nil { - // return <$enumName>(0), err - // } - // return <$v>, nil + // var <$v> <$enumName> + // if err := <$v>.FromWire(x); err != nil { + // return <$enumName>(0), err + // } + // return <$v>, nil func (<$v> *<$enumName>) FromWire(<$w> <$wire>.Value) error { *<$v> = (<$enumName>)(<$w>.GetI32()); return nil @@ -235,13 +235,13 @@ func enum(g Generator, spec *compile.EnumSpec) error { <$sr := newVar "sr"> // Decode reads off the encoded <$enumName> directly off of the wire. // - // sReader := BinaryStreamer.Reader(reader) + // sReader := BinaryStreamer.Reader(reader) // - // var <$v> <$enumName> - // if err := <$v>.Decode(sReader); err != nil { - // return <$enumName>(0), err - // } - // return <$v>, nil + // var <$v> <$enumName> + // if err := <$v>.Decode(sReader); err != nil { + // return <$enumName>(0), err + // } + // return <$v>, nil func (<$v> *<$enumName>) Decode(<$sr> <$stream>.Reader) error { <- $i := newVar "i" -> <$i>, err := <$sr>.ReadInt32() diff --git a/gen/field.go b/gen/field.go index 6844e55e..93bfb40e 100644 --- a/gen/field.go +++ b/gen/field.go @@ -300,14 +300,14 @@ func (f fieldGroupGenerator) ToWire(g Generator) error { // An error is returned if the struct or any of its fields failed to // validate. // - // x, err := <$v>.ToWire() - // if err != nil { - // return err - // } + // x, err := <$v>.ToWire() + // if err != nil { + // return err + // } // - // if err := binaryProtocol.Encode(x, writer); err != nil { - // return err - // } + // if err := binaryProtocol.Encode(x, writer); err != nil { + // return err + // } func (<$v> *<.Name>) ToWire() (<$wire>.Value, error) { <$fields := newVar "fields" -> <- $i := newVar "i" -> @@ -392,16 +392,16 @@ func (f fieldGroupGenerator) FromWire(g Generator) error { // An error is returned if we were unable to build a <.Name> struct // from the provided intermediate representation. // - // x, err := binaryProtocol.Decode(reader, wire.TStruct) - // if err != nil { - // return nil, err - // } + // x, err := binaryProtocol.Decode(reader, wire.TStruct) + // if err != nil { + // return nil, err + // } // - // var <$v> <.Name> - // if err := <$v>.FromWire(x); err != nil { - // return nil, err - // } - // return &<$v>, nil + // var <$v> <.Name> + // if err := <$v>.FromWire(x); err != nil { + // return nil, err + // } + // return &<$v>, nil func (<$v> *<.Name>) FromWire(<$w> <$wire>.Value) error { var err error <$f := newVar "field"> diff --git a/gen/internal/tests/collision/collision.go b/gen/internal/tests/collision/collision.go index e6bec78c..cbe70535 100644 --- a/gen/internal/tests/collision/collision.go +++ b/gen/internal/tests/collision/collision.go @@ -36,14 +36,14 @@ type AccessorConflict struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } -// -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } +// +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *AccessorConflict) ToWire() (wire.Value, error) { var ( fields [3]wire.Field @@ -87,16 +87,16 @@ func (v *AccessorConflict) ToWire() (wire.Value, error) { // An error is returned if we were unable to build a AccessorConflict struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v AccessorConflict -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v AccessorConflict +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *AccessorConflict) FromWire(w wire.Value) error { var err error @@ -393,14 +393,14 @@ type AccessorNoConflict struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *AccessorNoConflict) ToWire() (wire.Value, error) { var ( fields [2]wire.Field @@ -436,16 +436,16 @@ func (v *AccessorNoConflict) ToWire() (wire.Value, error) { // An error is returned if we were unable to build a AccessorNoConflict struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v AccessorNoConflict -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v AccessorNoConflict +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *AccessorNoConflict) FromWire(w wire.Value) error { var err error @@ -728,8 +728,8 @@ func MyEnum_Values() []MyEnum { // UnmarshalText tries to decode MyEnum from a byte slice // containing its name. // -// var v MyEnum -// err := v.UnmarshalText([]byte("X")) +// var v MyEnum +// err := v.UnmarshalText([]byte("X")) func (v *MyEnum) UnmarshalText(value []byte) error { switch s := string(value); s { case "X": @@ -807,10 +807,10 @@ func (v MyEnum) Ptr() *MyEnum { // Encode encodes MyEnum directly to bytes. // -// sWriter := BinaryStreamer.Writer(writer) +// sWriter := BinaryStreamer.Writer(writer) // -// var v MyEnum -// return v.Encode(sWriter) +// var v MyEnum +// return v.Encode(sWriter) func (v MyEnum) Encode(sw stream.Writer) error { return sw.WriteInt32(int32(v)) } @@ -827,16 +827,16 @@ func (v MyEnum) ToWire() (wire.Value, error) { // FromWire deserializes MyEnum from its Thrift-level // representation. // -// x, err := binaryProtocol.Decode(reader, wire.TI32) -// if err != nil { -// return MyEnum(0), err -// } +// x, err := binaryProtocol.Decode(reader, wire.TI32) +// if err != nil { +// return MyEnum(0), err +// } // -// var v MyEnum -// if err := v.FromWire(x); err != nil { -// return MyEnum(0), err -// } -// return v, nil +// var v MyEnum +// if err := v.FromWire(x); err != nil { +// return MyEnum(0), err +// } +// return v, nil func (v *MyEnum) FromWire(w wire.Value) error { *v = (MyEnum)(w.GetI32()) return nil @@ -844,13 +844,13 @@ func (v *MyEnum) FromWire(w wire.Value) error { // Decode reads off the encoded MyEnum directly off of the wire. // -// sReader := BinaryStreamer.Reader(reader) +// sReader := BinaryStreamer.Reader(reader) // -// var v MyEnum -// if err := v.Decode(sReader); err != nil { -// return MyEnum(0), err -// } -// return v, nil +// var v MyEnum +// if err := v.Decode(sReader); err != nil { +// return MyEnum(0), err +// } +// return v, nil func (v *MyEnum) Decode(sr stream.Reader) error { i, err := sr.ReadInt32() if err != nil { @@ -1042,14 +1042,14 @@ func (_Map_String_String_MapItemList) Close() {} // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *PrimitiveContainers) ToWire() (wire.Value, error) { var ( fields [3]wire.Field @@ -1158,16 +1158,16 @@ func _Map_String_String_Read(m wire.MapItemList) (map[string]string, error) { // An error is returned if we were unable to build a PrimitiveContainers struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v PrimitiveContainers -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v PrimitiveContainers +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *PrimitiveContainers) FromWire(w wire.Value) error { var err error @@ -1673,14 +1673,14 @@ type StructCollision struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *StructCollision) ToWire() (wire.Value, error) { var ( fields [2]wire.Field @@ -1713,16 +1713,16 @@ func (v *StructCollision) ToWire() (wire.Value, error) { // An error is returned if we were unable to build a StructCollision struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v StructCollision -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v StructCollision +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *StructCollision) FromWire(w wire.Value) error { var err error @@ -1934,14 +1934,14 @@ type UnionCollision struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *UnionCollision) ToWire() (wire.Value, error) { var ( fields [2]wire.Field @@ -1981,16 +1981,16 @@ func (v *UnionCollision) ToWire() (wire.Value, error) { // An error is returned if we were unable to build a UnionCollision struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v UnionCollision -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v UnionCollision +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *UnionCollision) FromWire(w wire.Value) error { var err error @@ -2256,14 +2256,14 @@ func Default_WithDefault() *WithDefault { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *WithDefault) ToWire() (wire.Value, error) { var ( fields [1]wire.Field @@ -2304,16 +2304,16 @@ func _StructCollision_Read(w wire.Value) (*StructCollision2, error) { // An error is returned if we were unable to build a WithDefault struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v WithDefault -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v WithDefault +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *WithDefault) FromWire(w wire.Value) error { var err error @@ -2563,8 +2563,8 @@ func MyEnum2_Values() []MyEnum2 { // UnmarshalText tries to decode MyEnum2 from a byte slice // containing its name. // -// var v MyEnum2 -// err := v.UnmarshalText([]byte("X")) +// var v MyEnum2 +// err := v.UnmarshalText([]byte("X")) func (v *MyEnum2) UnmarshalText(value []byte) error { switch s := string(value); s { case "X": @@ -2628,10 +2628,10 @@ func (v MyEnum2) Ptr() *MyEnum2 { // Encode encodes MyEnum2 directly to bytes. // -// sWriter := BinaryStreamer.Writer(writer) +// sWriter := BinaryStreamer.Writer(writer) // -// var v MyEnum2 -// return v.Encode(sWriter) +// var v MyEnum2 +// return v.Encode(sWriter) func (v MyEnum2) Encode(sw stream.Writer) error { return sw.WriteInt32(int32(v)) } @@ -2648,16 +2648,16 @@ func (v MyEnum2) ToWire() (wire.Value, error) { // FromWire deserializes MyEnum2 from its Thrift-level // representation. // -// x, err := binaryProtocol.Decode(reader, wire.TI32) -// if err != nil { -// return MyEnum2(0), err -// } +// x, err := binaryProtocol.Decode(reader, wire.TI32) +// if err != nil { +// return MyEnum2(0), err +// } // -// var v MyEnum2 -// if err := v.FromWire(x); err != nil { -// return MyEnum2(0), err -// } -// return v, nil +// var v MyEnum2 +// if err := v.FromWire(x); err != nil { +// return MyEnum2(0), err +// } +// return v, nil func (v *MyEnum2) FromWire(w wire.Value) error { *v = (MyEnum2)(w.GetI32()) return nil @@ -2665,13 +2665,13 @@ func (v *MyEnum2) FromWire(w wire.Value) error { // Decode reads off the encoded MyEnum2 directly off of the wire. // -// sReader := BinaryStreamer.Reader(reader) +// sReader := BinaryStreamer.Reader(reader) // -// var v MyEnum2 -// if err := v.Decode(sReader); err != nil { -// return MyEnum2(0), err -// } -// return v, nil +// var v MyEnum2 +// if err := v.Decode(sReader); err != nil { +// return MyEnum2(0), err +// } +// return v, nil func (v *MyEnum2) Decode(sr stream.Reader) error { i, err := sr.ReadInt32() if err != nil { @@ -2767,14 +2767,14 @@ type StructCollision2 struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *StructCollision2) ToWire() (wire.Value, error) { var ( fields [2]wire.Field @@ -2807,16 +2807,16 @@ func (v *StructCollision2) ToWire() (wire.Value, error) { // An error is returned if we were unable to build a StructCollision2 struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v StructCollision2 -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v StructCollision2 +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *StructCollision2) FromWire(w wire.Value) error { var err error @@ -3028,14 +3028,14 @@ type UnionCollision2 struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *UnionCollision2) ToWire() (wire.Value, error) { var ( fields [2]wire.Field @@ -3075,16 +3075,16 @@ func (v *UnionCollision2) ToWire() (wire.Value, error) { // An error is returned if we were unable to build a UnionCollision2 struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v UnionCollision2 -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v UnionCollision2 +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *UnionCollision2) FromWire(w wire.Value) error { var err error diff --git a/gen/internal/tests/containers/containers.go b/gen/internal/tests/containers/containers.go index 5d467800..fc25faf2 100644 --- a/gen/internal/tests/containers/containers.go +++ b/gen/internal/tests/containers/containers.go @@ -618,14 +618,14 @@ func (_Map_Set_I32_mapType_List_Double_MapItemList) Close() {} // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *ContainersOfContainers) ToWire() (wire.Value, error) { var ( fields [9]wire.Field @@ -1134,16 +1134,16 @@ func _Map_Set_I32_mapType_List_Double_Read(m wire.MapItemList) ([]struct { // An error is returned if we were unable to build a ContainersOfContainers struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v ContainersOfContainers -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v ContainersOfContainers +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *ContainersOfContainers) FromWire(w wire.Value) error { var err error @@ -3471,14 +3471,14 @@ func (_Map_EnumWithDuplicateValues_I32_MapItemList) Close() {} // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *EnumContainers) ToWire() (wire.Value, error) { var ( fields [3]wire.Field @@ -3605,16 +3605,16 @@ func _Map_EnumWithDuplicateValues_I32_Read(m wire.MapItemList) (map[enums.EnumWi // An error is returned if we were unable to build a EnumContainers struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v EnumContainers -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v EnumContainers +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *EnumContainers) FromWire(w wire.Value) error { var err error @@ -4203,14 +4203,14 @@ func (_List_RecordType_1_ValueList) Close() {} // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *ListOfConflictingEnums) ToWire() (wire.Value, error) { var ( fields [2]wire.Field @@ -4291,16 +4291,16 @@ func _List_RecordType_1_Read(l wire.ValueList) ([]enums.RecordType, error) { // An error is returned if we were unable to build a ListOfConflictingEnums struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v ListOfConflictingEnums -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v ListOfConflictingEnums +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *ListOfConflictingEnums) FromWire(w wire.Value) error { var err error @@ -4737,14 +4737,14 @@ func (_List_UUID_1_ValueList) Close() {} // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *ListOfConflictingUUIDs) ToWire() (wire.Value, error) { var ( fields [2]wire.Field @@ -4825,16 +4825,16 @@ func _List_UUID_1_Read(l wire.ValueList) ([]uuid_conflict.UUID, error) { // An error is returned if we were unable to build a ListOfConflictingUUIDs struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v ListOfConflictingUUIDs -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v ListOfConflictingUUIDs +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *ListOfConflictingUUIDs) FromWire(w wire.Value) error { var err error @@ -5218,14 +5218,14 @@ type ListOfOptionalPrimitives struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *ListOfOptionalPrimitives) ToWire() (wire.Value, error) { var ( fields [1]wire.Field @@ -5253,16 +5253,16 @@ func (v *ListOfOptionalPrimitives) ToWire() (wire.Value, error) { // An error is returned if we were unable to build a ListOfOptionalPrimitives struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v ListOfOptionalPrimitives -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v ListOfOptionalPrimitives +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *ListOfOptionalPrimitives) FromWire(w wire.Value) error { var err error @@ -5424,14 +5424,14 @@ type ListOfRequiredPrimitives struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *ListOfRequiredPrimitives) ToWire() (wire.Value, error) { var ( fields [1]wire.Field @@ -5457,16 +5457,16 @@ func (v *ListOfRequiredPrimitives) ToWire() (wire.Value, error) { // An error is returned if we were unable to build a ListOfRequiredPrimitives struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v ListOfRequiredPrimitives -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v ListOfRequiredPrimitives +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *ListOfRequiredPrimitives) FromWire(w wire.Value) error { var err error @@ -5718,14 +5718,14 @@ func (_Map_String_Binary_MapItemList) Close() {} // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *MapOfBinaryAndString) ToWire() (wire.Value, error) { var ( fields [2]wire.Field @@ -5826,16 +5826,16 @@ func _Map_String_Binary_Read(m wire.MapItemList) (map[string][]byte, error) { // An error is returned if we were unable to build a MapOfBinaryAndString struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v MapOfBinaryAndString -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v MapOfBinaryAndString +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *MapOfBinaryAndString) FromWire(w wire.Value) error { var err error @@ -6444,14 +6444,14 @@ func (_Map_String_Bool_MapItemList) Close() {} // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *PrimitiveContainers) ToWire() (wire.Value, error) { var ( fields [6]wire.Field @@ -6630,16 +6630,16 @@ func _Map_String_Bool_Read(m wire.MapItemList) (map[string]bool, error) { // An error is returned if we were unable to build a PrimitiveContainers struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v PrimitiveContainers -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v PrimitiveContainers +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *PrimitiveContainers) FromWire(w wire.Value) error { var err error @@ -7515,14 +7515,14 @@ func (_Map_I64_Double_MapItemList) Close() {} // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *PrimitiveContainersRequired) ToWire() (wire.Value, error) { var ( fields [3]wire.Field @@ -7594,16 +7594,16 @@ func _Map_I64_Double_Read(m wire.MapItemList) (map[int64]float64, error) { // An error is returned if we were unable to build a PrimitiveContainersRequired struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v PrimitiveContainersRequired -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v PrimitiveContainersRequired +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *PrimitiveContainersRequired) FromWire(w wire.Value) error { var err error 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 aae081cc..c59af0e0 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 @@ -37,8 +37,8 @@ func EnumMarshalStrict_Values() []EnumMarshalStrict { // UnmarshalText tries to decode EnumMarshalStrict from a byte slice // containing its name. // -// var v EnumMarshalStrict -// err := v.UnmarshalText([]byte("Foo")) +// var v EnumMarshalStrict +// err := v.UnmarshalText([]byte("Foo")) func (v *EnumMarshalStrict) UnmarshalText(value []byte) error { switch s := string(value); s { case "Foo": @@ -109,10 +109,10 @@ func (v EnumMarshalStrict) Ptr() *EnumMarshalStrict { // Encode encodes EnumMarshalStrict directly to bytes. // -// sWriter := BinaryStreamer.Writer(writer) +// sWriter := BinaryStreamer.Writer(writer) // -// var v EnumMarshalStrict -// return v.Encode(sWriter) +// var v EnumMarshalStrict +// return v.Encode(sWriter) func (v EnumMarshalStrict) Encode(sw stream.Writer) error { return sw.WriteInt32(int32(v)) } @@ -129,16 +129,16 @@ func (v EnumMarshalStrict) ToWire() (wire.Value, error) { // FromWire deserializes EnumMarshalStrict from its Thrift-level // representation. // -// x, err := binaryProtocol.Decode(reader, wire.TI32) -// if err != nil { -// return EnumMarshalStrict(0), err -// } +// x, err := binaryProtocol.Decode(reader, wire.TI32) +// if err != nil { +// return EnumMarshalStrict(0), err +// } // -// var v EnumMarshalStrict -// if err := v.FromWire(x); err != nil { -// return EnumMarshalStrict(0), err -// } -// return v, nil +// var v EnumMarshalStrict +// if err := v.FromWire(x); err != nil { +// return EnumMarshalStrict(0), err +// } +// return v, nil func (v *EnumMarshalStrict) FromWire(w wire.Value) error { *v = (EnumMarshalStrict)(w.GetI32()) return nil @@ -146,13 +146,13 @@ func (v *EnumMarshalStrict) FromWire(w wire.Value) error { // Decode reads off the encoded EnumMarshalStrict directly off of the wire. // -// sReader := BinaryStreamer.Reader(reader) +// sReader := BinaryStreamer.Reader(reader) // -// var v EnumMarshalStrict -// if err := v.Decode(sReader); err != nil { -// return EnumMarshalStrict(0), err -// } -// return v, nil +// var v EnumMarshalStrict +// if err := v.Decode(sReader); err != nil { +// return EnumMarshalStrict(0), err +// } +// return v, nil func (v *EnumMarshalStrict) Decode(sr stream.Reader) error { i, err := sr.ReadInt32() if err != nil { diff --git a/gen/internal/tests/enum_conflict/enum_conflict.go b/gen/internal/tests/enum_conflict/enum_conflict.go index 5a3bbf34..eceade88 100644 --- a/gen/internal/tests/enum_conflict/enum_conflict.go +++ b/gen/internal/tests/enum_conflict/enum_conflict.go @@ -40,8 +40,8 @@ func RecordType_Values() []RecordType { // UnmarshalText tries to decode RecordType from a byte slice // containing its name. // -// var v RecordType -// err := v.UnmarshalText([]byte("Name")) +// var v RecordType +// err := v.UnmarshalText([]byte("Name")) func (v *RecordType) UnmarshalText(value []byte) error { switch s := string(value); s { case "Name": @@ -98,10 +98,10 @@ func (v RecordType) Ptr() *RecordType { // Encode encodes RecordType directly to bytes. // -// sWriter := BinaryStreamer.Writer(writer) +// sWriter := BinaryStreamer.Writer(writer) // -// var v RecordType -// return v.Encode(sWriter) +// var v RecordType +// return v.Encode(sWriter) func (v RecordType) Encode(sw stream.Writer) error { return sw.WriteInt32(int32(v)) } @@ -118,16 +118,16 @@ func (v RecordType) ToWire() (wire.Value, error) { // FromWire deserializes RecordType from its Thrift-level // representation. // -// x, err := binaryProtocol.Decode(reader, wire.TI32) -// if err != nil { -// return RecordType(0), err -// } +// x, err := binaryProtocol.Decode(reader, wire.TI32) +// if err != nil { +// return RecordType(0), err +// } // -// var v RecordType -// if err := v.FromWire(x); err != nil { -// return RecordType(0), err -// } -// return v, nil +// var v RecordType +// if err := v.FromWire(x); err != nil { +// return RecordType(0), err +// } +// return v, nil func (v *RecordType) FromWire(w wire.Value) error { *v = (RecordType)(w.GetI32()) return nil @@ -135,13 +135,13 @@ func (v *RecordType) FromWire(w wire.Value) error { // Decode reads off the encoded RecordType directly off of the wire. // -// sReader := BinaryStreamer.Reader(reader) +// sReader := BinaryStreamer.Reader(reader) // -// var v RecordType -// if err := v.Decode(sReader); err != nil { -// return RecordType(0), err -// } -// return v, nil +// var v RecordType +// if err := v.Decode(sReader); err != nil { +// return RecordType(0), err +// } +// return v, nil func (v *RecordType) Decode(sr stream.Reader) error { i, err := sr.ReadInt32() if err != nil { @@ -250,14 +250,14 @@ func Default_Records() *Records { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *Records) ToWire() (wire.Value, error) { var ( fields [2]wire.Field @@ -313,16 +313,16 @@ func _RecordType_1_Read(w wire.Value) (enums.RecordType, error) { // An error is returned if we were unable to build a Records struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v Records -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v Records +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *Records) FromWire(w wire.Value) error { var err error diff --git a/gen/internal/tests/enums/enums.go b/gen/internal/tests/enums/enums.go index a18a0992..ee836d1d 100644 --- a/gen/internal/tests/enums/enums.go +++ b/gen/internal/tests/enums/enums.go @@ -64,10 +64,10 @@ func (v EmptyEnum) Ptr() *EmptyEnum { // Encode encodes EmptyEnum directly to bytes. // -// sWriter := BinaryStreamer.Writer(writer) +// sWriter := BinaryStreamer.Writer(writer) // -// var v EmptyEnum -// return v.Encode(sWriter) +// var v EmptyEnum +// return v.Encode(sWriter) func (v EmptyEnum) Encode(sw stream.Writer) error { return sw.WriteInt32(int32(v)) } @@ -84,16 +84,16 @@ func (v EmptyEnum) ToWire() (wire.Value, error) { // FromWire deserializes EmptyEnum from its Thrift-level // representation. // -// x, err := binaryProtocol.Decode(reader, wire.TI32) -// if err != nil { -// return EmptyEnum(0), err -// } +// x, err := binaryProtocol.Decode(reader, wire.TI32) +// if err != nil { +// return EmptyEnum(0), err +// } // -// var v EmptyEnum -// if err := v.FromWire(x); err != nil { -// return EmptyEnum(0), err -// } -// return v, nil +// var v EmptyEnum +// if err := v.FromWire(x); err != nil { +// return EmptyEnum(0), err +// } +// return v, nil func (v *EmptyEnum) FromWire(w wire.Value) error { *v = (EmptyEnum)(w.GetI32()) return nil @@ -101,13 +101,13 @@ func (v *EmptyEnum) FromWire(w wire.Value) error { // Decode reads off the encoded EmptyEnum directly off of the wire. // -// sReader := BinaryStreamer.Reader(reader) +// sReader := BinaryStreamer.Reader(reader) // -// var v EmptyEnum -// if err := v.Decode(sReader); err != nil { -// return EmptyEnum(0), err -// } -// return v, nil +// var v EmptyEnum +// if err := v.Decode(sReader); err != nil { +// return EmptyEnum(0), err +// } +// return v, nil func (v *EmptyEnum) Decode(sr stream.Reader) error { i, err := sr.ReadInt32() if err != nil { @@ -195,8 +195,8 @@ func EnumDefault_Values() []EnumDefault { // UnmarshalText tries to decode EnumDefault from a byte slice // containing its name. // -// var v EnumDefault -// err := v.UnmarshalText([]byte("Foo")) +// var v EnumDefault +// err := v.UnmarshalText([]byte("Foo")) func (v *EnumDefault) UnmarshalText(value []byte) error { switch s := string(value); s { case "Foo": @@ -260,10 +260,10 @@ func (v EnumDefault) Ptr() *EnumDefault { // Encode encodes EnumDefault directly to bytes. // -// sWriter := BinaryStreamer.Writer(writer) +// sWriter := BinaryStreamer.Writer(writer) // -// var v EnumDefault -// return v.Encode(sWriter) +// var v EnumDefault +// return v.Encode(sWriter) func (v EnumDefault) Encode(sw stream.Writer) error { return sw.WriteInt32(int32(v)) } @@ -280,16 +280,16 @@ func (v EnumDefault) ToWire() (wire.Value, error) { // FromWire deserializes EnumDefault from its Thrift-level // representation. // -// x, err := binaryProtocol.Decode(reader, wire.TI32) -// if err != nil { -// return EnumDefault(0), err -// } +// x, err := binaryProtocol.Decode(reader, wire.TI32) +// if err != nil { +// return EnumDefault(0), err +// } // -// var v EnumDefault -// if err := v.FromWire(x); err != nil { -// return EnumDefault(0), err -// } -// return v, nil +// var v EnumDefault +// if err := v.FromWire(x); err != nil { +// return EnumDefault(0), err +// } +// return v, nil func (v *EnumDefault) FromWire(w wire.Value) error { *v = (EnumDefault)(w.GetI32()) return nil @@ -297,13 +297,13 @@ func (v *EnumDefault) FromWire(w wire.Value) error { // Decode reads off the encoded EnumDefault directly off of the wire. // -// sReader := BinaryStreamer.Reader(reader) +// sReader := BinaryStreamer.Reader(reader) // -// var v EnumDefault -// if err := v.Decode(sReader); err != nil { -// return EnumDefault(0), err -// } -// return v, nil +// var v EnumDefault +// if err := v.Decode(sReader); err != nil { +// return EnumDefault(0), err +// } +// return v, nil func (v *EnumDefault) Decode(sr stream.Reader) error { i, err := sr.ReadInt32() if err != nil { @@ -419,8 +419,8 @@ func EnumWithDuplicateName_Values() []EnumWithDuplicateName { // UnmarshalText tries to decode EnumWithDuplicateName from a byte slice // containing its name. // -// var v EnumWithDuplicateName -// err := v.UnmarshalText([]byte("A")) +// var v EnumWithDuplicateName +// err := v.UnmarshalText([]byte("A")) func (v *EnumWithDuplicateName) UnmarshalText(value []byte) error { switch s := string(value); s { case "A": @@ -526,10 +526,10 @@ func (v EnumWithDuplicateName) Ptr() *EnumWithDuplicateName { // Encode encodes EnumWithDuplicateName directly to bytes. // -// sWriter := BinaryStreamer.Writer(writer) +// sWriter := BinaryStreamer.Writer(writer) // -// var v EnumWithDuplicateName -// return v.Encode(sWriter) +// var v EnumWithDuplicateName +// return v.Encode(sWriter) func (v EnumWithDuplicateName) Encode(sw stream.Writer) error { return sw.WriteInt32(int32(v)) } @@ -546,16 +546,16 @@ func (v EnumWithDuplicateName) ToWire() (wire.Value, error) { // FromWire deserializes EnumWithDuplicateName from its Thrift-level // representation. // -// x, err := binaryProtocol.Decode(reader, wire.TI32) -// if err != nil { -// return EnumWithDuplicateName(0), err -// } +// x, err := binaryProtocol.Decode(reader, wire.TI32) +// if err != nil { +// return EnumWithDuplicateName(0), err +// } // -// var v EnumWithDuplicateName -// if err := v.FromWire(x); err != nil { -// return EnumWithDuplicateName(0), err -// } -// return v, nil +// var v EnumWithDuplicateName +// if err := v.FromWire(x); err != nil { +// return EnumWithDuplicateName(0), err +// } +// return v, nil func (v *EnumWithDuplicateName) FromWire(w wire.Value) error { *v = (EnumWithDuplicateName)(w.GetI32()) return nil @@ -563,13 +563,13 @@ func (v *EnumWithDuplicateName) FromWire(w wire.Value) error { // Decode reads off the encoded EnumWithDuplicateName directly off of the wire. // -// sReader := BinaryStreamer.Reader(reader) +// sReader := BinaryStreamer.Reader(reader) // -// var v EnumWithDuplicateName -// if err := v.Decode(sReader); err != nil { -// return EnumWithDuplicateName(0), err -// } -// return v, nil +// var v EnumWithDuplicateName +// if err := v.Decode(sReader); err != nil { +// return EnumWithDuplicateName(0), err +// } +// return v, nil func (v *EnumWithDuplicateName) Decode(sr stream.Reader) error { i, err := sr.ReadInt32() if err != nil { @@ -697,8 +697,8 @@ func EnumWithDuplicateValues_Values() []EnumWithDuplicateValues { // UnmarshalText tries to decode EnumWithDuplicateValues from a byte slice // containing its name. // -// var v EnumWithDuplicateValues -// err := v.UnmarshalText([]byte("P")) +// var v EnumWithDuplicateValues +// err := v.UnmarshalText([]byte("P")) func (v *EnumWithDuplicateValues) UnmarshalText(value []byte) error { switch s := string(value); s { case "P": @@ -758,10 +758,10 @@ func (v EnumWithDuplicateValues) Ptr() *EnumWithDuplicateValues { // Encode encodes EnumWithDuplicateValues directly to bytes. // -// sWriter := BinaryStreamer.Writer(writer) +// sWriter := BinaryStreamer.Writer(writer) // -// var v EnumWithDuplicateValues -// return v.Encode(sWriter) +// var v EnumWithDuplicateValues +// return v.Encode(sWriter) func (v EnumWithDuplicateValues) Encode(sw stream.Writer) error { return sw.WriteInt32(int32(v)) } @@ -778,16 +778,16 @@ func (v EnumWithDuplicateValues) ToWire() (wire.Value, error) { // FromWire deserializes EnumWithDuplicateValues from its Thrift-level // representation. // -// x, err := binaryProtocol.Decode(reader, wire.TI32) -// if err != nil { -// return EnumWithDuplicateValues(0), err -// } +// x, err := binaryProtocol.Decode(reader, wire.TI32) +// if err != nil { +// return EnumWithDuplicateValues(0), err +// } // -// var v EnumWithDuplicateValues -// if err := v.FromWire(x); err != nil { -// return EnumWithDuplicateValues(0), err -// } -// return v, nil +// var v EnumWithDuplicateValues +// if err := v.FromWire(x); err != nil { +// return EnumWithDuplicateValues(0), err +// } +// return v, nil func (v *EnumWithDuplicateValues) FromWire(w wire.Value) error { *v = (EnumWithDuplicateValues)(w.GetI32()) return nil @@ -795,13 +795,13 @@ func (v *EnumWithDuplicateValues) FromWire(w wire.Value) error { // Decode reads off the encoded EnumWithDuplicateValues directly off of the wire. // -// sReader := BinaryStreamer.Reader(reader) +// sReader := BinaryStreamer.Reader(reader) // -// var v EnumWithDuplicateValues -// if err := v.Decode(sReader); err != nil { -// return EnumWithDuplicateValues(0), err -// } -// return v, nil +// var v EnumWithDuplicateValues +// if err := v.Decode(sReader); err != nil { +// return EnumWithDuplicateValues(0), err +// } +// return v, nil func (v *EnumWithDuplicateValues) Decode(sr stream.Reader) error { i, err := sr.ReadInt32() if err != nil { @@ -901,8 +901,8 @@ func EnumWithHexValues_Values() []EnumWithHexValues { // UnmarshalText tries to decode EnumWithHexValues from a byte slice // containing its name. // -// var v EnumWithHexValues -// err := v.UnmarshalText([]byte("X")) +// var v EnumWithHexValues +// err := v.UnmarshalText([]byte("X")) func (v *EnumWithHexValues) UnmarshalText(value []byte) error { switch s := string(value); s { case "X": @@ -966,10 +966,10 @@ func (v EnumWithHexValues) Ptr() *EnumWithHexValues { // Encode encodes EnumWithHexValues directly to bytes. // -// sWriter := BinaryStreamer.Writer(writer) +// sWriter := BinaryStreamer.Writer(writer) // -// var v EnumWithHexValues -// return v.Encode(sWriter) +// var v EnumWithHexValues +// return v.Encode(sWriter) func (v EnumWithHexValues) Encode(sw stream.Writer) error { return sw.WriteInt32(int32(v)) } @@ -986,16 +986,16 @@ func (v EnumWithHexValues) ToWire() (wire.Value, error) { // FromWire deserializes EnumWithHexValues from its Thrift-level // representation. // -// x, err := binaryProtocol.Decode(reader, wire.TI32) -// if err != nil { -// return EnumWithHexValues(0), err -// } +// x, err := binaryProtocol.Decode(reader, wire.TI32) +// if err != nil { +// return EnumWithHexValues(0), err +// } // -// var v EnumWithHexValues -// if err := v.FromWire(x); err != nil { -// return EnumWithHexValues(0), err -// } -// return v, nil +// var v EnumWithHexValues +// if err := v.FromWire(x); err != nil { +// return EnumWithHexValues(0), err +// } +// return v, nil func (v *EnumWithHexValues) FromWire(w wire.Value) error { *v = (EnumWithHexValues)(w.GetI32()) return nil @@ -1003,13 +1003,13 @@ func (v *EnumWithHexValues) FromWire(w wire.Value) error { // Decode reads off the encoded EnumWithHexValues directly off of the wire. // -// sReader := BinaryStreamer.Reader(reader) +// sReader := BinaryStreamer.Reader(reader) // -// var v EnumWithHexValues -// if err := v.Decode(sReader); err != nil { -// return EnumWithHexValues(0), err -// } -// return v, nil +// var v EnumWithHexValues +// if err := v.Decode(sReader); err != nil { +// return EnumWithHexValues(0), err +// } +// return v, nil func (v *EnumWithHexValues) Decode(sr stream.Reader) error { i, err := sr.ReadInt32() if err != nil { @@ -1119,8 +1119,8 @@ func EnumWithLabel_Values() []EnumWithLabel { // UnmarshalText tries to decode EnumWithLabel from a byte slice // containing its name. // -// var v EnumWithLabel -// err := v.UnmarshalText([]byte("USERNAME")) +// var v EnumWithLabel +// err := v.UnmarshalText([]byte("USERNAME")) func (v *EnumWithLabel) UnmarshalText(value []byte) error { switch s := string(value); s { case "surname": @@ -1205,10 +1205,10 @@ func (v EnumWithLabel) Ptr() *EnumWithLabel { // Encode encodes EnumWithLabel directly to bytes. // -// sWriter := BinaryStreamer.Writer(writer) +// sWriter := BinaryStreamer.Writer(writer) // -// var v EnumWithLabel -// return v.Encode(sWriter) +// var v EnumWithLabel +// return v.Encode(sWriter) func (v EnumWithLabel) Encode(sw stream.Writer) error { return sw.WriteInt32(int32(v)) } @@ -1225,16 +1225,16 @@ func (v EnumWithLabel) ToWire() (wire.Value, error) { // FromWire deserializes EnumWithLabel from its Thrift-level // representation. // -// x, err := binaryProtocol.Decode(reader, wire.TI32) -// if err != nil { -// return EnumWithLabel(0), err -// } +// x, err := binaryProtocol.Decode(reader, wire.TI32) +// if err != nil { +// return EnumWithLabel(0), err +// } // -// var v EnumWithLabel -// if err := v.FromWire(x); err != nil { -// return EnumWithLabel(0), err -// } -// return v, nil +// var v EnumWithLabel +// if err := v.FromWire(x); err != nil { +// return EnumWithLabel(0), err +// } +// return v, nil func (v *EnumWithLabel) FromWire(w wire.Value) error { *v = (EnumWithLabel)(w.GetI32()) return nil @@ -1242,13 +1242,13 @@ func (v *EnumWithLabel) FromWire(w wire.Value) error { // Decode reads off the encoded EnumWithLabel directly off of the wire. // -// sReader := BinaryStreamer.Reader(reader) +// sReader := BinaryStreamer.Reader(reader) // -// var v EnumWithLabel -// if err := v.Decode(sReader); err != nil { -// return EnumWithLabel(0), err -// } -// return v, nil +// var v EnumWithLabel +// if err := v.Decode(sReader); err != nil { +// return EnumWithLabel(0), err +// } +// return v, nil func (v *EnumWithLabel) Decode(sr stream.Reader) error { i, err := sr.ReadInt32() if err != nil { @@ -1364,8 +1364,8 @@ func EnumWithValues_Values() []EnumWithValues { // UnmarshalText tries to decode EnumWithValues from a byte slice // containing its name. // -// var v EnumWithValues -// err := v.UnmarshalText([]byte("X")) +// var v EnumWithValues +// err := v.UnmarshalText([]byte("X")) func (v *EnumWithValues) UnmarshalText(value []byte) error { switch s := string(value); s { case "X": @@ -1429,10 +1429,10 @@ func (v EnumWithValues) Ptr() *EnumWithValues { // Encode encodes EnumWithValues directly to bytes. // -// sWriter := BinaryStreamer.Writer(writer) +// sWriter := BinaryStreamer.Writer(writer) // -// var v EnumWithValues -// return v.Encode(sWriter) +// var v EnumWithValues +// return v.Encode(sWriter) func (v EnumWithValues) Encode(sw stream.Writer) error { return sw.WriteInt32(int32(v)) } @@ -1449,16 +1449,16 @@ func (v EnumWithValues) ToWire() (wire.Value, error) { // FromWire deserializes EnumWithValues from its Thrift-level // representation. // -// x, err := binaryProtocol.Decode(reader, wire.TI32) -// if err != nil { -// return EnumWithValues(0), err -// } +// x, err := binaryProtocol.Decode(reader, wire.TI32) +// if err != nil { +// return EnumWithValues(0), err +// } // -// var v EnumWithValues -// if err := v.FromWire(x); err != nil { -// return EnumWithValues(0), err -// } -// return v, nil +// var v EnumWithValues +// if err := v.FromWire(x); err != nil { +// return EnumWithValues(0), err +// } +// return v, nil func (v *EnumWithValues) FromWire(w wire.Value) error { *v = (EnumWithValues)(w.GetI32()) return nil @@ -1466,13 +1466,13 @@ func (v *EnumWithValues) FromWire(w wire.Value) error { // Decode reads off the encoded EnumWithValues directly off of the wire. // -// sReader := BinaryStreamer.Reader(reader) +// sReader := BinaryStreamer.Reader(reader) // -// var v EnumWithValues -// if err := v.Decode(sReader); err != nil { -// return EnumWithValues(0), err -// } -// return v, nil +// var v EnumWithValues +// if err := v.Decode(sReader); err != nil { +// return EnumWithValues(0), err +// } +// return v, nil func (v *EnumWithValues) Decode(sr stream.Reader) error { i, err := sr.ReadInt32() if err != nil { @@ -1584,8 +1584,8 @@ func RecordType_Values() []RecordType { // UnmarshalText tries to decode RecordType from a byte slice // containing its name. // -// var v RecordType -// err := v.UnmarshalText([]byte("NAME")) +// var v RecordType +// err := v.UnmarshalText([]byte("NAME")) func (v *RecordType) UnmarshalText(value []byte) error { switch s := string(value); s { case "NAME": @@ -1649,10 +1649,10 @@ func (v RecordType) Ptr() *RecordType { // Encode encodes RecordType directly to bytes. // -// sWriter := BinaryStreamer.Writer(writer) +// sWriter := BinaryStreamer.Writer(writer) // -// var v RecordType -// return v.Encode(sWriter) +// var v RecordType +// return v.Encode(sWriter) func (v RecordType) Encode(sw stream.Writer) error { return sw.WriteInt32(int32(v)) } @@ -1669,16 +1669,16 @@ func (v RecordType) ToWire() (wire.Value, error) { // FromWire deserializes RecordType from its Thrift-level // representation. // -// x, err := binaryProtocol.Decode(reader, wire.TI32) -// if err != nil { -// return RecordType(0), err -// } +// x, err := binaryProtocol.Decode(reader, wire.TI32) +// if err != nil { +// return RecordType(0), err +// } // -// var v RecordType -// if err := v.FromWire(x); err != nil { -// return RecordType(0), err -// } -// return v, nil +// var v RecordType +// if err := v.FromWire(x); err != nil { +// return RecordType(0), err +// } +// return v, nil func (v *RecordType) FromWire(w wire.Value) error { *v = (RecordType)(w.GetI32()) return nil @@ -1686,13 +1686,13 @@ func (v *RecordType) FromWire(w wire.Value) error { // Decode reads off the encoded RecordType directly off of the wire. // -// sReader := BinaryStreamer.Reader(reader) +// sReader := BinaryStreamer.Reader(reader) // -// var v RecordType -// if err := v.Decode(sReader); err != nil { -// return RecordType(0), err -// } -// return v, nil +// var v RecordType +// if err := v.Decode(sReader); err != nil { +// return RecordType(0), err +// } +// return v, nil func (v *RecordType) Decode(sr stream.Reader) error { i, err := sr.ReadInt32() if err != nil { @@ -1794,8 +1794,8 @@ func RecordTypeValues_Values() []RecordTypeValues { // UnmarshalText tries to decode RecordTypeValues from a byte slice // containing its name. // -// var v RecordTypeValues -// err := v.UnmarshalText([]byte("FOO")) +// var v RecordTypeValues +// err := v.UnmarshalText([]byte("FOO")) func (v *RecordTypeValues) UnmarshalText(value []byte) error { switch s := string(value); s { case "FOO": @@ -1852,10 +1852,10 @@ func (v RecordTypeValues) Ptr() *RecordTypeValues { // Encode encodes RecordTypeValues directly to bytes. // -// sWriter := BinaryStreamer.Writer(writer) +// sWriter := BinaryStreamer.Writer(writer) // -// var v RecordTypeValues -// return v.Encode(sWriter) +// var v RecordTypeValues +// return v.Encode(sWriter) func (v RecordTypeValues) Encode(sw stream.Writer) error { return sw.WriteInt32(int32(v)) } @@ -1872,16 +1872,16 @@ func (v RecordTypeValues) ToWire() (wire.Value, error) { // FromWire deserializes RecordTypeValues from its Thrift-level // representation. // -// x, err := binaryProtocol.Decode(reader, wire.TI32) -// if err != nil { -// return RecordTypeValues(0), err -// } +// x, err := binaryProtocol.Decode(reader, wire.TI32) +// if err != nil { +// return RecordTypeValues(0), err +// } // -// var v RecordTypeValues -// if err := v.FromWire(x); err != nil { -// return RecordTypeValues(0), err -// } -// return v, nil +// var v RecordTypeValues +// if err := v.FromWire(x); err != nil { +// return RecordTypeValues(0), err +// } +// return v, nil func (v *RecordTypeValues) FromWire(w wire.Value) error { *v = (RecordTypeValues)(w.GetI32()) return nil @@ -1889,13 +1889,13 @@ func (v *RecordTypeValues) FromWire(w wire.Value) error { // Decode reads off the encoded RecordTypeValues directly off of the wire. // -// sReader := BinaryStreamer.Reader(reader) +// sReader := BinaryStreamer.Reader(reader) // -// var v RecordTypeValues -// if err := v.Decode(sReader); err != nil { -// return RecordTypeValues(0), err -// } -// return v, nil +// var v RecordTypeValues +// if err := v.Decode(sReader); err != nil { +// return RecordTypeValues(0), err +// } +// return v, nil func (v *RecordTypeValues) Decode(sr stream.Reader) error { i, err := sr.ReadInt32() if err != nil { @@ -1986,14 +1986,14 @@ type StructWithOptionalEnum struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *StructWithOptionalEnum) ToWire() (wire.Value, error) { var ( fields [1]wire.Field @@ -2027,16 +2027,16 @@ func _EnumDefault_Read(w wire.Value) (EnumDefault, error) { // An error is returned if we were unable to build a StructWithOptionalEnum struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v StructWithOptionalEnum -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v StructWithOptionalEnum +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *StructWithOptionalEnum) FromWire(w wire.Value) error { var err error @@ -2227,8 +2227,8 @@ func LowerCaseEnum_Values() []LowerCaseEnum { // UnmarshalText tries to decode LowerCaseEnum from a byte slice // containing its name. // -// var v LowerCaseEnum -// err := v.UnmarshalText([]byte("containing")) +// var v LowerCaseEnum +// err := v.UnmarshalText([]byte("containing")) func (v *LowerCaseEnum) UnmarshalText(value []byte) error { switch s := string(value); s { case "containing": @@ -2292,10 +2292,10 @@ func (v LowerCaseEnum) Ptr() *LowerCaseEnum { // Encode encodes LowerCaseEnum directly to bytes. // -// sWriter := BinaryStreamer.Writer(writer) +// sWriter := BinaryStreamer.Writer(writer) // -// var v LowerCaseEnum -// return v.Encode(sWriter) +// var v LowerCaseEnum +// return v.Encode(sWriter) func (v LowerCaseEnum) Encode(sw stream.Writer) error { return sw.WriteInt32(int32(v)) } @@ -2312,16 +2312,16 @@ func (v LowerCaseEnum) ToWire() (wire.Value, error) { // FromWire deserializes LowerCaseEnum from its Thrift-level // representation. // -// x, err := binaryProtocol.Decode(reader, wire.TI32) -// if err != nil { -// return LowerCaseEnum(0), err -// } +// x, err := binaryProtocol.Decode(reader, wire.TI32) +// if err != nil { +// return LowerCaseEnum(0), err +// } // -// var v LowerCaseEnum -// if err := v.FromWire(x); err != nil { -// return LowerCaseEnum(0), err -// } -// return v, nil +// var v LowerCaseEnum +// if err := v.FromWire(x); err != nil { +// return LowerCaseEnum(0), err +// } +// return v, nil func (v *LowerCaseEnum) FromWire(w wire.Value) error { *v = (LowerCaseEnum)(w.GetI32()) return nil @@ -2329,13 +2329,13 @@ func (v *LowerCaseEnum) FromWire(w wire.Value) error { // Decode reads off the encoded LowerCaseEnum directly off of the wire. // -// sReader := BinaryStreamer.Reader(reader) +// sReader := BinaryStreamer.Reader(reader) // -// var v LowerCaseEnum -// if err := v.Decode(sReader); err != nil { -// return LowerCaseEnum(0), err -// } -// return v, nil +// var v LowerCaseEnum +// if err := v.Decode(sReader); err != nil { +// return LowerCaseEnum(0), err +// } +// return v, nil func (v *LowerCaseEnum) Decode(sr stream.Reader) error { i, err := sr.ReadInt32() if err != nil { diff --git a/gen/internal/tests/exceptions/exceptions.go b/gen/internal/tests/exceptions/exceptions.go index 8c7e2a47..b6389625 100644 --- a/gen/internal/tests/exceptions/exceptions.go +++ b/gen/internal/tests/exceptions/exceptions.go @@ -27,14 +27,14 @@ type DoesNotExistException struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *DoesNotExistException) ToWire() (wire.Value, error) { var ( fields [2]wire.Field @@ -68,16 +68,16 @@ func (v *DoesNotExistException) ToWire() (wire.Value, error) { // An error is returned if we were unable to build a DoesNotExistException struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v DoesNotExistException -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v DoesNotExistException +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *DoesNotExistException) FromWire(w wire.Value) error { var err error @@ -316,14 +316,14 @@ type DoesNotExistException2 struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *DoesNotExistException2) ToWire() (wire.Value, error) { var ( fields [2]wire.Field @@ -357,16 +357,16 @@ func (v *DoesNotExistException2) ToWire() (wire.Value, error) { // An error is returned if we were unable to build a DoesNotExistException2 struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v DoesNotExistException2 -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v DoesNotExistException2 +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *DoesNotExistException2) FromWire(w wire.Value) error { var err error @@ -592,14 +592,14 @@ type EmptyException struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *EmptyException) ToWire() (wire.Value, error) { var ( fields [0]wire.Field @@ -616,16 +616,16 @@ func (v *EmptyException) ToWire() (wire.Value, error) { // An error is returned if we were unable to build a EmptyException struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v EmptyException -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v EmptyException +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *EmptyException) FromWire(w wire.Value) error { for _, field := range w.GetStruct().Fields { diff --git a/gen/internal/tests/hyphenated-file/hyphenated-file.go b/gen/internal/tests/hyphenated-file/hyphenated-file.go index 829537ab..1a3daf77 100644 --- a/gen/internal/tests/hyphenated-file/hyphenated-file.go +++ b/gen/internal/tests/hyphenated-file/hyphenated-file.go @@ -26,14 +26,14 @@ type DocumentStruct struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *DocumentStruct) ToWire() (wire.Value, error) { var ( fields [1]wire.Field @@ -68,16 +68,16 @@ func _Second_Read(w wire.Value) (*non_hyphenated.Second, error) { // An error is returned if we were unable to build a DocumentStruct struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v DocumentStruct -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v DocumentStruct +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *DocumentStruct) FromWire(w wire.Value) error { var err error diff --git a/gen/internal/tests/hyphenated_file/hyphenated_file.go b/gen/internal/tests/hyphenated_file/hyphenated_file.go index 1db8c583..3f4f3a7a 100644 --- a/gen/internal/tests/hyphenated_file/hyphenated_file.go +++ b/gen/internal/tests/hyphenated_file/hyphenated_file.go @@ -26,14 +26,14 @@ type DocumentStructure struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *DocumentStructure) ToWire() (wire.Value, error) { var ( fields [1]wire.Field @@ -68,16 +68,16 @@ func _Second_Read(w wire.Value) (*non_hyphenated.Second, error) { // An error is returned if we were unable to build a DocumentStructure struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v DocumentStructure -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v DocumentStructure +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *DocumentStructure) FromWire(w wire.Value) error { var err error diff --git a/gen/internal/tests/non_hyphenated/non_hyphenated.go b/gen/internal/tests/non_hyphenated/non_hyphenated.go index 8e711862..31e605ef 100644 --- a/gen/internal/tests/non_hyphenated/non_hyphenated.go +++ b/gen/internal/tests/non_hyphenated/non_hyphenated.go @@ -22,14 +22,14 @@ type First struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *First) ToWire() (wire.Value, error) { var ( fields [0]wire.Field @@ -46,16 +46,16 @@ func (v *First) ToWire() (wire.Value, error) { // An error is returned if we were unable to build a First struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v First -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v First +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *First) FromWire(w wire.Value) error { for _, field := range w.GetStruct().Fields { @@ -164,14 +164,14 @@ type Second struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *Second) ToWire() (wire.Value, error) { var ( fields [0]wire.Field @@ -188,16 +188,16 @@ func (v *Second) ToWire() (wire.Value, error) { // An error is returned if we were unable to build a Second struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v Second -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v Second +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *Second) FromWire(w wire.Value) error { for _, field := range w.GetStruct().Fields { diff --git a/gen/internal/tests/nozap/nozap.go b/gen/internal/tests/nozap/nozap.go index db491356..222157b7 100644 --- a/gen/internal/tests/nozap/nozap.go +++ b/gen/internal/tests/nozap/nozap.go @@ -36,8 +36,8 @@ func EnumDefault_Values() []EnumDefault { // UnmarshalText tries to decode EnumDefault from a byte slice // containing its name. // -// var v EnumDefault -// err := v.UnmarshalText([]byte("Foo")) +// var v EnumDefault +// err := v.UnmarshalText([]byte("Foo")) func (v *EnumDefault) UnmarshalText(value []byte) error { switch s := string(value); s { case "Foo": @@ -84,10 +84,10 @@ func (v EnumDefault) Ptr() *EnumDefault { // Encode encodes EnumDefault directly to bytes. // -// sWriter := BinaryStreamer.Writer(writer) +// sWriter := BinaryStreamer.Writer(writer) // -// var v EnumDefault -// return v.Encode(sWriter) +// var v EnumDefault +// return v.Encode(sWriter) func (v EnumDefault) Encode(sw stream.Writer) error { return sw.WriteInt32(int32(v)) } @@ -104,16 +104,16 @@ func (v EnumDefault) ToWire() (wire.Value, error) { // FromWire deserializes EnumDefault from its Thrift-level // representation. // -// x, err := binaryProtocol.Decode(reader, wire.TI32) -// if err != nil { -// return EnumDefault(0), err -// } +// x, err := binaryProtocol.Decode(reader, wire.TI32) +// if err != nil { +// return EnumDefault(0), err +// } // -// var v EnumDefault -// if err := v.FromWire(x); err != nil { -// return EnumDefault(0), err -// } -// return v, nil +// var v EnumDefault +// if err := v.FromWire(x); err != nil { +// return EnumDefault(0), err +// } +// return v, nil func (v *EnumDefault) FromWire(w wire.Value) error { *v = (EnumDefault)(w.GetI32()) return nil @@ -121,13 +121,13 @@ func (v *EnumDefault) FromWire(w wire.Value) error { // Decode reads off the encoded EnumDefault directly off of the wire. // -// sReader := BinaryStreamer.Reader(reader) +// sReader := BinaryStreamer.Reader(reader) // -// var v EnumDefault -// if err := v.Decode(sReader); err != nil { -// return EnumDefault(0), err -// } -// return v, nil +// var v EnumDefault +// if err := v.Decode(sReader); err != nil { +// return EnumDefault(0), err +// } +// return v, nil func (v *EnumDefault) Decode(sr stream.Reader) error { i, err := sr.ReadInt32() if err != nil { @@ -319,14 +319,14 @@ func (_Map_I64_Double_MapItemList) Close() {} // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *PrimitiveRequiredStruct) ToWire() (wire.Value, error) { var ( fields [11]wire.Field @@ -493,16 +493,16 @@ func _Map_I64_Double_Read(m wire.MapItemList) (map[int64]float64, error) { // An error is returned if we were unable to build a PrimitiveRequiredStruct struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v PrimitiveRequiredStruct -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v PrimitiveRequiredStruct +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *PrimitiveRequiredStruct) FromWire(w wire.Value) error { var err error diff --git a/gen/internal/tests/services/services.go b/gen/internal/tests/services/services.go index 21bb31a6..1ea5ba70 100644 --- a/gen/internal/tests/services/services.go +++ b/gen/internal/tests/services/services.go @@ -30,14 +30,14 @@ type ConflictingNamesSetValueArgs struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } -// -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } +// +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *ConflictingNamesSetValueArgs) ToWire() (wire.Value, error) { var ( fields [2]wire.Field @@ -72,16 +72,16 @@ func (v *ConflictingNamesSetValueArgs) ToWire() (wire.Value, error) { // An error is returned if we were unable to build a ConflictingNamesSetValueArgs struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v ConflictingNamesSetValueArgs -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v ConflictingNamesSetValueArgs +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *ConflictingNamesSetValueArgs) FromWire(w wire.Value) error { var err error @@ -300,14 +300,14 @@ type InternalError struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *InternalError) ToWire() (wire.Value, error) { var ( fields [1]wire.Field @@ -335,16 +335,16 @@ func (v *InternalError) ToWire() (wire.Value, error) { // An error is returned if we were unable to build a InternalError struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v InternalError -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v InternalError +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *InternalError) FromWire(w wire.Value) error { var err error @@ -595,14 +595,14 @@ type Cache_Clear_Args struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *Cache_Clear_Args) ToWire() (wire.Value, error) { var ( fields [0]wire.Field @@ -619,16 +619,16 @@ func (v *Cache_Clear_Args) ToWire() (wire.Value, error) { // An error is returned if we were unable to build a Cache_Clear_Args struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v Cache_Clear_Args -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v Cache_Clear_Args +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *Cache_Clear_Args) FromWire(w wire.Value) error { for _, field := range w.GetStruct().Fields { @@ -772,14 +772,14 @@ type Cache_ClearAfter_Args struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *Cache_ClearAfter_Args) ToWire() (wire.Value, error) { var ( fields [1]wire.Field @@ -807,16 +807,16 @@ func (v *Cache_ClearAfter_Args) ToWire() (wire.Value, error) { // An error is returned if we were unable to build a Cache_ClearAfter_Args struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v Cache_ClearAfter_Args -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v Cache_ClearAfter_Args +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *Cache_ClearAfter_Args) FromWire(w wire.Value) error { var err error @@ -1032,14 +1032,14 @@ type ConflictingNames_SetValue_Args struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *ConflictingNames_SetValue_Args) ToWire() (wire.Value, error) { var ( fields [1]wire.Field @@ -1073,16 +1073,16 @@ func _ConflictingNamesSetValueArgs_Read(w wire.Value) (*ConflictingNamesSetValue // An error is returned if we were unable to build a ConflictingNames_SetValue_Args struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v ConflictingNames_SetValue_Args -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v ConflictingNames_SetValue_Args +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *ConflictingNames_SetValue_Args) FromWire(w wire.Value) error { var err error @@ -1342,14 +1342,14 @@ type ConflictingNames_SetValue_Result struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *ConflictingNames_SetValue_Result) ToWire() (wire.Value, error) { var ( fields [0]wire.Field @@ -1366,16 +1366,16 @@ func (v *ConflictingNames_SetValue_Result) ToWire() (wire.Value, error) { // An error is returned if we were unable to build a ConflictingNames_SetValue_Result struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v ConflictingNames_SetValue_Result -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v ConflictingNames_SetValue_Result +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *ConflictingNames_SetValue_Result) FromWire(w wire.Value) error { for _, field := range w.GetStruct().Fields { @@ -1503,14 +1503,14 @@ type KeyValue_DeleteValue_Args struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *KeyValue_DeleteValue_Args) ToWire() (wire.Value, error) { var ( fields [1]wire.Field @@ -1544,16 +1544,16 @@ func _Key_Read(w wire.Value) (Key, error) { // An error is returned if we were unable to build a KeyValue_DeleteValue_Args struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v KeyValue_DeleteValue_Args -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v KeyValue_DeleteValue_Args +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *KeyValue_DeleteValue_Args) FromWire(w wire.Value) error { var err error @@ -1855,14 +1855,14 @@ type KeyValue_DeleteValue_Result struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *KeyValue_DeleteValue_Result) ToWire() (wire.Value, error) { var ( fields [2]wire.Field @@ -1914,16 +1914,16 @@ func _InternalError_Read(w wire.Value) (*InternalError, error) { // An error is returned if we were unable to build a KeyValue_DeleteValue_Result struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v KeyValue_DeleteValue_Result -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v KeyValue_DeleteValue_Result +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *KeyValue_DeleteValue_Result) FromWire(w wire.Value) error { var err error @@ -2226,14 +2226,14 @@ func (_List_Key_ValueList) Close() {} // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *KeyValue_GetManyValues_Args) ToWire() (wire.Value, error) { var ( fields [1]wire.Field @@ -2279,16 +2279,16 @@ func _List_Key_Read(l wire.ValueList) ([]Key, error) { // An error is returned if we were unable to build a KeyValue_GetManyValues_Args struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v KeyValue_GetManyValues_Args -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v KeyValue_GetManyValues_Args +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *KeyValue_GetManyValues_Args) FromWire(w wire.Value) error { var err error @@ -2670,14 +2670,14 @@ func (_List_ArbitraryValue_ValueList) Close() {} // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *KeyValue_GetManyValues_Result) ToWire() (wire.Value, error) { var ( fields [2]wire.Field @@ -2741,16 +2741,16 @@ func _List_ArbitraryValue_Read(l wire.ValueList) ([]*unions.ArbitraryValue, erro // An error is returned if we were unable to build a KeyValue_GetManyValues_Result struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v KeyValue_GetManyValues_Result -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v KeyValue_GetManyValues_Result +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *KeyValue_GetManyValues_Result) FromWire(w wire.Value) error { var err error @@ -3098,14 +3098,14 @@ type KeyValue_GetValue_Args struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *KeyValue_GetValue_Args) ToWire() (wire.Value, error) { var ( fields [1]wire.Field @@ -3133,16 +3133,16 @@ func (v *KeyValue_GetValue_Args) ToWire() (wire.Value, error) { // An error is returned if we were unable to build a KeyValue_GetValue_Args struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v KeyValue_GetValue_Args -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v KeyValue_GetValue_Args +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *KeyValue_GetValue_Args) FromWire(w wire.Value) error { var err error @@ -3425,14 +3425,14 @@ type KeyValue_GetValue_Result struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *KeyValue_GetValue_Result) ToWire() (wire.Value, error) { var ( fields [2]wire.Field @@ -3472,16 +3472,16 @@ func (v *KeyValue_GetValue_Result) ToWire() (wire.Value, error) { // An error is returned if we were unable to build a KeyValue_GetValue_Result struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v KeyValue_GetValue_Result -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v KeyValue_GetValue_Result +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *KeyValue_GetValue_Result) FromWire(w wire.Value) error { var err error @@ -3747,14 +3747,14 @@ type KeyValue_SetValue_Args struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *KeyValue_SetValue_Args) ToWire() (wire.Value, error) { var ( fields [2]wire.Field @@ -3790,16 +3790,16 @@ func (v *KeyValue_SetValue_Args) ToWire() (wire.Value, error) { // An error is returned if we were unable to build a KeyValue_SetValue_Args struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v KeyValue_SetValue_Args -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v KeyValue_SetValue_Args +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *KeyValue_SetValue_Args) FromWire(w wire.Value) error { var err error @@ -4111,14 +4111,14 @@ type KeyValue_SetValue_Result struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *KeyValue_SetValue_Result) ToWire() (wire.Value, error) { var ( fields [0]wire.Field @@ -4135,16 +4135,16 @@ func (v *KeyValue_SetValue_Result) ToWire() (wire.Value, error) { // An error is returned if we were unable to build a KeyValue_SetValue_Result struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v KeyValue_SetValue_Result -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v KeyValue_SetValue_Result +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *KeyValue_SetValue_Result) FromWire(w wire.Value) error { for _, field := range w.GetStruct().Fields { @@ -4277,14 +4277,14 @@ type KeyValue_SetValueV2_Args struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *KeyValue_SetValueV2_Args) ToWire() (wire.Value, error) { var ( fields [2]wire.Field @@ -4319,16 +4319,16 @@ func (v *KeyValue_SetValueV2_Args) ToWire() (wire.Value, error) { // An error is returned if we were unable to build a KeyValue_SetValueV2_Args struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v KeyValue_SetValueV2_Args -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v KeyValue_SetValueV2_Args +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *KeyValue_SetValueV2_Args) FromWire(w wire.Value) error { var err error @@ -4642,14 +4642,14 @@ type KeyValue_SetValueV2_Result struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *KeyValue_SetValueV2_Result) ToWire() (wire.Value, error) { var ( fields [0]wire.Field @@ -4666,16 +4666,16 @@ func (v *KeyValue_SetValueV2_Result) ToWire() (wire.Value, error) { // An error is returned if we were unable to build a KeyValue_SetValueV2_Result struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v KeyValue_SetValueV2_Result -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v KeyValue_SetValueV2_Result +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *KeyValue_SetValueV2_Result) FromWire(w wire.Value) error { for _, field := range w.GetStruct().Fields { @@ -4802,14 +4802,14 @@ type KeyValue_Size_Args struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *KeyValue_Size_Args) ToWire() (wire.Value, error) { var ( fields [0]wire.Field @@ -4826,16 +4826,16 @@ func (v *KeyValue_Size_Args) ToWire() (wire.Value, error) { // An error is returned if we were unable to build a KeyValue_Size_Args struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v KeyValue_Size_Args -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v KeyValue_Size_Args +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *KeyValue_Size_Args) FromWire(w wire.Value) error { for _, field := range w.GetStruct().Fields { @@ -5041,14 +5041,14 @@ type KeyValue_Size_Result struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *KeyValue_Size_Result) ToWire() (wire.Value, error) { var ( fields [1]wire.Field @@ -5080,16 +5080,16 @@ func (v *KeyValue_Size_Result) ToWire() (wire.Value, error) { // An error is returned if we were unable to build a KeyValue_Size_Result struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v KeyValue_Size_Result -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v KeyValue_Size_Result +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *KeyValue_Size_Result) FromWire(w wire.Value) error { var err error @@ -5297,14 +5297,14 @@ type NonStandardServiceName_NonStandardFunctionName_Args struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *NonStandardServiceName_NonStandardFunctionName_Args) ToWire() (wire.Value, error) { var ( fields [0]wire.Field @@ -5321,16 +5321,16 @@ func (v *NonStandardServiceName_NonStandardFunctionName_Args) ToWire() (wire.Val // An error is returned if we were unable to build a NonStandardServiceName_NonStandardFunctionName_Args struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v NonStandardServiceName_NonStandardFunctionName_Args -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v NonStandardServiceName_NonStandardFunctionName_Args +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *NonStandardServiceName_NonStandardFunctionName_Args) FromWire(w wire.Value) error { for _, field := range w.GetStruct().Fields { @@ -5526,14 +5526,14 @@ type NonStandardServiceName_NonStandardFunctionName_Result struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *NonStandardServiceName_NonStandardFunctionName_Result) ToWire() (wire.Value, error) { var ( fields [0]wire.Field @@ -5550,16 +5550,16 @@ func (v *NonStandardServiceName_NonStandardFunctionName_Result) ToWire() (wire.V // An error is returned if we were unable to build a NonStandardServiceName_NonStandardFunctionName_Result struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v NonStandardServiceName_NonStandardFunctionName_Result -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v NonStandardServiceName_NonStandardFunctionName_Result +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *NonStandardServiceName_NonStandardFunctionName_Result) FromWire(w wire.Value) error { for _, field := range w.GetStruct().Fields { 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 f23c981b..221cdace 100644 --- a/gen/internal/tests/set_to_slice/set_to_slice.go +++ b/gen/internal/tests/set_to_slice/set_to_slice.go @@ -228,14 +228,14 @@ func (_Set_Set_String_sliceType_sliceType_ValueList) Close() {} // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *Bar) ToWire() (wire.Value, error) { var ( fields [10]wire.Field @@ -441,16 +441,16 @@ func _StringListList_Read(w wire.Value) (StringListList, error) { // An error is returned if we were unable to build a Bar struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v Bar -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v Bar +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *Bar) FromWire(w wire.Value) error { var err error @@ -1468,14 +1468,14 @@ type Foo struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *Foo) ToWire() (wire.Value, error) { var ( fields [1]wire.Field @@ -1501,16 +1501,16 @@ func (v *Foo) ToWire() (wire.Value, error) { // An error is returned if we were unable to build a Foo struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v Foo -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v Foo +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *Foo) FromWire(w wire.Value) error { var err error diff --git a/gen/internal/tests/structs/structs.go b/gen/internal/tests/structs/structs.go index ace99480..6c820c97 100644 --- a/gen/internal/tests/structs/structs.go +++ b/gen/internal/tests/structs/structs.go @@ -29,14 +29,14 @@ type ContactInfo struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } -// -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } +// +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *ContactInfo) ToWire() (wire.Value, error) { var ( fields [1]wire.Field @@ -62,16 +62,16 @@ func (v *ContactInfo) ToWire() (wire.Value, error) { // An error is returned if we were unable to build a ContactInfo struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v ContactInfo -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v ContactInfo +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *ContactInfo) FromWire(w wire.Value) error { var err error @@ -344,14 +344,14 @@ func (_List_Double_ValueList) Close() {} // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *DefaultsStruct) ToWire() (wire.Value, error) { var ( fields [12]wire.Field @@ -594,16 +594,16 @@ func _Edge_Read(w wire.Value) (*Edge, error) { // An error is returned if we were unable to build a DefaultsStruct struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v DefaultsStruct -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v DefaultsStruct +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *DefaultsStruct) FromWire(w wire.Value) error { var err error @@ -1799,14 +1799,14 @@ type Edge struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *Edge) ToWire() (wire.Value, error) { var ( fields [2]wire.Field @@ -1850,16 +1850,16 @@ func _Point_Read(w wire.Value) (*Point, error) { // An error is returned if we were unable to build a Edge struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v Edge -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v Edge +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *Edge) FromWire(w wire.Value) error { var err error @@ -2091,14 +2091,14 @@ type EmptyStruct struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *EmptyStruct) ToWire() (wire.Value, error) { var ( fields [0]wire.Field @@ -2115,16 +2115,16 @@ func (v *EmptyStruct) ToWire() (wire.Value, error) { // An error is returned if we were unable to build a EmptyStruct struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v EmptyStruct -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v EmptyStruct +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *EmptyStruct) FromWire(w wire.Value) error { for _, field := range w.GetStruct().Fields { @@ -2235,14 +2235,14 @@ type Frame struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *Frame) ToWire() (wire.Value, error) { var ( fields [2]wire.Field @@ -2286,16 +2286,16 @@ func _Size_Read(w wire.Value) (*Size, error) { // An error is returned if we were unable to build a Frame struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v Frame -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v Frame +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *Frame) FromWire(w wire.Value) error { var err error @@ -2533,14 +2533,14 @@ type GoTags struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *GoTags) ToWire() (wire.Value, error) { var ( fields [6]wire.Field @@ -2603,16 +2603,16 @@ func (v *GoTags) ToWire() (wire.Value, error) { // An error is returned if we were unable to build a GoTags struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v GoTags -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v GoTags +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *GoTags) FromWire(w wire.Value) error { var err error @@ -3078,14 +3078,14 @@ func (_List_Edge_ValueList) Close() {} // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *Graph) ToWire() (wire.Value, error) { var ( fields [1]wire.Field @@ -3129,16 +3129,16 @@ func _List_Edge_Read(l wire.ValueList) ([]*Edge, error) { // An error is returned if we were unable to build a Graph struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v Graph -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v Graph +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *Graph) FromWire(w wire.Value) error { var err error @@ -3429,14 +3429,14 @@ type Node struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *Node) ToWire() (wire.Value, error) { var ( fields [2]wire.Field @@ -3476,16 +3476,16 @@ func _List_Read(w wire.Value) (*List, error) { // An error is returned if we were unable to build a Node struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v Node -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v Node +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *Node) FromWire(w wire.Value) error { var err error @@ -3746,14 +3746,14 @@ func (_Map_String_String_MapItemList) Close() {} // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *NotOmitEmpty) ToWire() (wire.Value, error) { var ( fields [8]wire.Field @@ -3865,16 +3865,16 @@ func _Map_String_String_Read(m wire.MapItemList) (map[string]string, error) { // An error is returned if we were unable to build a NotOmitEmpty struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v NotOmitEmpty -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v NotOmitEmpty +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *NotOmitEmpty) FromWire(w wire.Value) error { var err error @@ -4501,14 +4501,14 @@ type Omit struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *Omit) ToWire() (wire.Value, error) { var ( fields [2]wire.Field @@ -4541,16 +4541,16 @@ func (v *Omit) ToWire() (wire.Value, error) { // An error is returned if we were unable to build a Omit struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v Omit -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v Omit +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *Omit) FromWire(w wire.Value) error { var err error @@ -4761,14 +4761,14 @@ type PersonalInfo struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *PersonalInfo) ToWire() (wire.Value, error) { var ( fields [1]wire.Field @@ -4796,16 +4796,16 @@ func (v *PersonalInfo) ToWire() (wire.Value, error) { // An error is returned if we were unable to build a PersonalInfo struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v PersonalInfo -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v PersonalInfo +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *PersonalInfo) FromWire(w wire.Value) error { var err error @@ -4973,14 +4973,14 @@ type Point struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *Point) ToWire() (wire.Value, error) { var ( fields [2]wire.Field @@ -5013,16 +5013,16 @@ func (v *Point) ToWire() (wire.Value, error) { // An error is returned if we were unable to build a Point struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v Point -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v Point +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *Point) FromWire(w wire.Value) error { var err error @@ -5243,14 +5243,14 @@ type PrimitiveOptionalStruct struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *PrimitiveOptionalStruct) ToWire() (wire.Value, error) { var ( fields [8]wire.Field @@ -5334,16 +5334,16 @@ func (v *PrimitiveOptionalStruct) ToWire() (wire.Value, error) { // An error is returned if we were unable to build a PrimitiveOptionalStruct struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v PrimitiveOptionalStruct -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v PrimitiveOptionalStruct +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *PrimitiveOptionalStruct) FromWire(w wire.Value) error { var err error @@ -5940,14 +5940,14 @@ type PrimitiveRequiredStruct struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *PrimitiveRequiredStruct) ToWire() (wire.Value, error) { var ( fields [8]wire.Field @@ -6024,16 +6024,16 @@ func (v *PrimitiveRequiredStruct) ToWire() (wire.Value, error) { // An error is returned if we were unable to build a PrimitiveRequiredStruct struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v PrimitiveRequiredStruct -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v PrimitiveRequiredStruct +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *PrimitiveRequiredStruct) FromWire(w wire.Value) error { var err error @@ -6547,14 +6547,14 @@ type Rename struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *Rename) ToWire() (wire.Value, error) { var ( fields [2]wire.Field @@ -6587,16 +6587,16 @@ func (v *Rename) ToWire() (wire.Value, error) { // An error is returned if we were unable to build a Rename struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v Rename -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v Rename +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *Rename) FromWire(w wire.Value) error { var err error @@ -6811,14 +6811,14 @@ type Size struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *Size) ToWire() (wire.Value, error) { var ( fields [2]wire.Field @@ -6851,16 +6851,16 @@ func (v *Size) ToWire() (wire.Value, error) { // An error is returned if we were unable to build a Size struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v Size -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v Size +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *Size) FromWire(w wire.Value) error { var err error @@ -7074,14 +7074,14 @@ type StructLabels struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *StructLabels) ToWire() (wire.Value, error) { var ( fields [4]wire.Field @@ -7133,16 +7133,16 @@ func (v *StructLabels) ToWire() (wire.Value, error) { // An error is returned if we were unable to build a StructLabels struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v StructLabels -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v StructLabels +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *StructLabels) FromWire(w wire.Value) error { var err error @@ -7475,14 +7475,14 @@ type User struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *User) ToWire() (wire.Value, error) { var ( fields [3]wire.Field @@ -7536,16 +7536,16 @@ func _PersonalInfo_Read(w wire.Value) (*PersonalInfo, error) { // An error is returned if we were unable to build a User struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v User -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v User +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *User) FromWire(w wire.Value) error { var err error @@ -8042,14 +8042,14 @@ type ZapOptOutStruct struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *ZapOptOutStruct) ToWire() (wire.Value, error) { var ( fields [2]wire.Field @@ -8082,16 +8082,16 @@ func (v *ZapOptOutStruct) ToWire() (wire.Value, error) { // An error is returned if we were unable to build a ZapOptOutStruct struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v ZapOptOutStruct -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v ZapOptOutStruct +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *ZapOptOutStruct) FromWire(w wire.Value) error { var err error diff --git a/gen/internal/tests/typedefs/typedefs.go b/gen/internal/tests/typedefs/typedefs.go index 925b4de7..79dc26ee 100644 --- a/gen/internal/tests/typedefs/typedefs.go +++ b/gen/internal/tests/typedefs/typedefs.go @@ -224,14 +224,14 @@ func Default_DefaultPrimitiveTypedef() *DefaultPrimitiveTypedef { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *DefaultPrimitiveTypedef) ToWire() (wire.Value, error) { var ( fields [1]wire.Field @@ -269,16 +269,16 @@ func _State_Read(w wire.Value) (State, error) { // An error is returned if we were unable to build a DefaultPrimitiveTypedef struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v DefaultPrimitiveTypedef -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v DefaultPrimitiveTypedef +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *DefaultPrimitiveTypedef) FromWire(w wire.Value) error { var err error @@ -783,14 +783,14 @@ type Event struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *Event) ToWire() (wire.Value, error) { var ( fields [2]wire.Field @@ -839,16 +839,16 @@ func _Timestamp_Read(w wire.Value) (Timestamp, error) { // An error is returned if we were unable to build a Event struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v Event -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v Event +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *Event) FromWire(w wire.Value) error { var err error @@ -2300,14 +2300,14 @@ type Transition struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *Transition) ToWire() (wire.Value, error) { var ( fields [3]wire.Field @@ -2354,16 +2354,16 @@ func _EventGroup_Read(w wire.Value) (EventGroup, error) { // An error is returned if we were unable to build a Transition struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v Transition -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v Transition +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *Transition) FromWire(w wire.Value) error { var err error @@ -2631,14 +2631,14 @@ type TransitiveTypedefField struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *TransitiveTypedefField) ToWire() (wire.Value, error) { var ( fields [1]wire.Field @@ -2673,16 +2673,16 @@ func _MyUUID_Read(w wire.Value) (*MyUUID, error) { // An error is returned if we were unable to build a TransitiveTypedefField struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v TransitiveTypedefField -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v TransitiveTypedefField +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *TransitiveTypedefField) FromWire(w wire.Value) error { var err error @@ -2903,14 +2903,14 @@ type I128 struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *I128) ToWire() (wire.Value, error) { var ( fields [2]wire.Field @@ -2943,16 +2943,16 @@ func (v *I128) ToWire() (wire.Value, error) { // An error is returned if we were unable to build a I128 struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v I128 -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v I128 +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *I128) FromWire(w wire.Value) error { var err error diff --git a/gen/internal/tests/unions/unions.go b/gen/internal/tests/unions/unions.go index ffa2792f..706f3bfd 100644 --- a/gen/internal/tests/unions/unions.go +++ b/gen/internal/tests/unions/unions.go @@ -106,14 +106,14 @@ func (_Map_String_ArbitraryValue_MapItemList) Close() {} // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *ArbitraryValue) ToWire() (wire.Value, error) { var ( fields [5]wire.Field @@ -229,16 +229,16 @@ func _Map_String_ArbitraryValue_Read(m wire.MapItemList) (map[string]*ArbitraryV // An error is returned if we were unable to build a ArbitraryValue struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v ArbitraryValue -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v ArbitraryValue +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *ArbitraryValue) FromWire(w wire.Value) error { var err error @@ -885,14 +885,14 @@ type Document struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *Document) ToWire() (wire.Value, error) { var ( fields [2]wire.Field @@ -938,16 +938,16 @@ func _PDF_Read(w wire.Value) (typedefs.PDF, error) { // An error is returned if we were unable to build a Document struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v Document -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v Document +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *Document) FromWire(w wire.Value) error { var err error @@ -1203,14 +1203,14 @@ type EmptyUnion struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *EmptyUnion) ToWire() (wire.Value, error) { var ( fields [0]wire.Field @@ -1227,16 +1227,16 @@ func (v *EmptyUnion) ToWire() (wire.Value, error) { // An error is returned if we were unable to build a EmptyUnion struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v EmptyUnion -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v EmptyUnion +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *EmptyUnion) FromWire(w wire.Value) error { for _, field := range w.GetStruct().Fields { diff --git a/gen/internal/tests/uuid_conflict/uuid_conflict.go b/gen/internal/tests/uuid_conflict/uuid_conflict.go index 7f87adc0..21ea8c58 100644 --- a/gen/internal/tests/uuid_conflict/uuid_conflict.go +++ b/gen/internal/tests/uuid_conflict/uuid_conflict.go @@ -75,14 +75,14 @@ type UUIDConflict struct { // An error is returned if the struct or any of its fields failed to // validate. // -// x, err := v.ToWire() -// if err != nil { -// return err -// } +// x, err := v.ToWire() +// if err != nil { +// return err +// } // -// if err := binaryProtocol.Encode(x, writer); err != nil { -// return err -// } +// if err := binaryProtocol.Encode(x, writer); err != nil { +// return err +// } func (v *UUIDConflict) ToWire() (wire.Value, error) { var ( fields [2]wire.Field @@ -129,16 +129,16 @@ func _UUID_1_Read(w wire.Value) (*typedefs.UUID, error) { // An error is returned if we were unable to build a UUIDConflict struct // from the provided intermediate representation. // -// x, err := binaryProtocol.Decode(reader, wire.TStruct) -// if err != nil { -// return nil, err -// } +// x, err := binaryProtocol.Decode(reader, wire.TStruct) +// if err != nil { +// return nil, err +// } // -// var v UUIDConflict -// if err := v.FromWire(x); err != nil { -// return nil, err -// } -// return &v, nil +// var v UUIDConflict +// if err := v.FromWire(x); err != nil { +// return nil, err +// } +// return &v, nil func (v *UUIDConflict) FromWire(w wire.Value) error { var err error diff --git a/internal/envelope/exception/exception.go b/internal/envelope/exception/exception.go index 318dfb9a..a314621e 100644 --- a/internal/envelope/exception/exception.go +++ b/internal/envelope/exception/exception.go @@ -216,12 +216,12 @@ func (v ExceptionType) ToWire() (wire.Value, error) { // // x, err := binaryProtocol.Decode(reader, wire.TI32) // if err != nil { -// return ExceptionType(0), err +// return ExceptionType(0), err // } // // var v ExceptionType // if err := v.FromWire(x); err != nil { -// return ExceptionType(0), err +// return ExceptionType(0), err // } // return v, nil func (v *ExceptionType) FromWire(w wire.Value) error { @@ -235,7 +235,7 @@ func (v *ExceptionType) FromWire(w wire.Value) error { // // var v ExceptionType // if err := v.Decode(sReader); err != nil { -// return ExceptionType(0), err +// return ExceptionType(0), err // } // return v, nil func (v *ExceptionType) Decode(sr stream.Reader) error { @@ -367,11 +367,11 @@ type TApplicationException struct { // // x, err := v.ToWire() // if err != nil { -// return err +// return err // } // // if err := binaryProtocol.Encode(x, writer); err != nil { -// return err +// return err // } func (v *TApplicationException) ToWire() (wire.Value, error) { var ( @@ -416,12 +416,12 @@ func _ExceptionType_Read(w wire.Value) (ExceptionType, error) { // // x, err := binaryProtocol.Decode(reader, wire.TStruct) // if err != nil { -// return nil, err +// return nil, err // } // // var v TApplicationException // if err := v.FromWire(x); err != nil { -// return nil, err +// return nil, err // } // return &v, nil func (v *TApplicationException) FromWire(w wire.Value) error { diff --git a/plugin/api/api.go b/plugin/api/api.go index f63b4b13..fbe4e1d9 100644 --- a/plugin/api/api.go +++ b/plugin/api/api.go @@ -122,11 +122,11 @@ func (_Map_String_String_MapItemList) Close() {} // // x, err := v.ToWire() // if err != nil { -// return err +// return err // } // // if err := binaryProtocol.Encode(x, writer); err != nil { -// return err +// return err // } func (v *Argument) ToWire() (wire.Value, error) { var ( @@ -206,12 +206,12 @@ func _Map_String_String_Read(m wire.MapItemList) (map[string]string, error) { // // x, err := binaryProtocol.Decode(reader, wire.TStruct) // if err != nil { -// return nil, err +// return nil, err // } // // var v Argument // if err := v.FromWire(x); err != nil { -// return nil, err +// return nil, err // } // return &v, nil func (v *Argument) FromWire(w wire.Value) error { @@ -664,12 +664,12 @@ func (v Feature) ToWire() (wire.Value, error) { // // x, err := binaryProtocol.Decode(reader, wire.TI32) // if err != nil { -// return Feature(0), err +// return Feature(0), err // } // // var v Feature // if err := v.FromWire(x); err != nil { -// return Feature(0), err +// return Feature(0), err // } // return v, nil func (v *Feature) FromWire(w wire.Value) error { @@ -683,7 +683,7 @@ func (v *Feature) FromWire(w wire.Value) error { // // var v Feature // if err := v.Decode(sReader); err != nil { -// return Feature(0), err +// return Feature(0), err // } // return v, nil func (v *Feature) Decode(sr stream.Reader) error { @@ -834,11 +834,11 @@ func (_List_Argument_ValueList) Close() {} // // x, err := v.ToWire() // if err != nil { -// return err +// return err // } // // if err := binaryProtocol.Encode(x, writer); err != nil { -// return err +// return err // } func (v *Function) ToWire() (wire.Value, error) { var ( @@ -937,12 +937,12 @@ func _List_Argument_Read(l wire.ValueList) ([]*Argument, error) { // // x, err := binaryProtocol.Decode(reader, wire.TStruct) // if err != nil { -// return nil, err +// return nil, err // } // // var v Function // if err := v.FromWire(x); err != nil { -// return nil, err +// return nil, err // } // return &v, nil func (v *Function) FromWire(w wire.Value) error { @@ -1672,11 +1672,11 @@ func (_List_ModuleID_ValueList) Close() {} // // x, err := v.ToWire() // if err != nil { -// return err +// return err // } // // if err := binaryProtocol.Encode(x, writer); err != nil { -// return err +// return err // } func (v *GenerateServiceRequest) ToWire() (wire.Value, error) { var ( @@ -1861,12 +1861,12 @@ func _List_ModuleID_Read(l wire.ValueList) ([]ModuleID, error) { // // x, err := binaryProtocol.Decode(reader, wire.TStruct) // if err != nil { -// return nil, err +// return nil, err // } // // var v GenerateServiceRequest // if err := v.FromWire(x); err != nil { -// return nil, err +// return nil, err // } // return &v, nil func (v *GenerateServiceRequest) FromWire(w wire.Value) error { @@ -2732,11 +2732,11 @@ func (_Map_String_Binary_MapItemList) Close() {} // // x, err := v.ToWire() // if err != nil { -// return err +// return err // } // // if err := binaryProtocol.Encode(x, writer); err != nil { -// return err +// return err // } func (v *GenerateServiceResponse) ToWire() (wire.Value, error) { var ( @@ -2795,12 +2795,12 @@ func _Map_String_Binary_Read(m wire.MapItemList) (map[string][]byte, error) { // // x, err := binaryProtocol.Decode(reader, wire.TStruct) // if err != nil { -// return nil, err +// return nil, err // } // // var v GenerateServiceResponse // if err := v.FromWire(x); err != nil { -// return nil, err +// return nil, err // } // return &v, nil func (v *GenerateServiceResponse) FromWire(w wire.Value) error { @@ -3061,11 +3061,11 @@ type HandshakeRequest struct { // // x, err := v.ToWire() // if err != nil { -// return err +// return err // } // // if err := binaryProtocol.Encode(x, writer); err != nil { -// return err +// return err // } func (v *HandshakeRequest) ToWire() (wire.Value, error) { var ( @@ -3085,12 +3085,12 @@ func (v *HandshakeRequest) ToWire() (wire.Value, error) { // // x, err := binaryProtocol.Decode(reader, wire.TStruct) // if err != nil { -// return nil, err +// return nil, err // } // // var v HandshakeRequest // if err := v.FromWire(x); err != nil { -// return nil, err +// return nil, err // } // return &v, nil func (v *HandshakeRequest) FromWire(w wire.Value) error { @@ -3244,11 +3244,11 @@ func (_List_Feature_ValueList) Close() {} // // x, err := v.ToWire() // if err != nil { -// return err +// return err // } // // if err := binaryProtocol.Encode(x, writer); err != nil { -// return err +// return err // } func (v *HandshakeResponse) ToWire() (wire.Value, error) { var ( @@ -3323,12 +3323,12 @@ func _List_Feature_Read(l wire.ValueList) ([]Feature, error) { // // x, err := binaryProtocol.Decode(reader, wire.TStruct) // if err != nil { -// return nil, err +// return nil, err // } // // var v HandshakeResponse // if err := v.FromWire(x); err != nil { -// return nil, err +// return nil, err // } // return &v, nil func (v *HandshakeResponse) FromWire(w wire.Value) error { @@ -3754,11 +3754,11 @@ type Module struct { // // x, err := v.ToWire() // if err != nil { -// return err +// return err // } // // if err := binaryProtocol.Encode(x, writer); err != nil { -// return err +// return err // } func (v *Module) ToWire() (wire.Value, error) { var ( @@ -3801,12 +3801,12 @@ func (v *Module) ToWire() (wire.Value, error) { // // x, err := binaryProtocol.Decode(reader, wire.TStruct) // if err != nil { -// return nil, err +// return nil, err // } // // var v Module // if err := v.FromWire(x); err != nil { -// return nil, err +// return nil, err // } // return &v, nil func (v *Module) FromWire(w wire.Value) error { @@ -4173,11 +4173,11 @@ func (_List_Function_ValueList) Close() {} // // x, err := v.ToWire() // if err != nil { -// return err +// return err // } // // if err := binaryProtocol.Encode(x, writer); err != nil { -// return err +// return err // } func (v *Service) ToWire() (wire.Value, error) { var ( @@ -4267,12 +4267,12 @@ func _List_Function_Read(l wire.ValueList) ([]*Function, error) { // // x, err := binaryProtocol.Decode(reader, wire.TStruct) // if err != nil { -// return nil, err +// return nil, err // } // // var v Service // if err := v.FromWire(x); err != nil { -// return nil, err +// return nil, err // } // return &v, nil func (v *Service) FromWire(w wire.Value) error { @@ -4991,12 +4991,12 @@ func (v SimpleType) ToWire() (wire.Value, error) { // // x, err := binaryProtocol.Decode(reader, wire.TI32) // if err != nil { -// return SimpleType(0), err +// return SimpleType(0), err // } // // var v SimpleType // if err := v.FromWire(x); err != nil { -// return SimpleType(0), err +// return SimpleType(0), err // } // return v, nil func (v *SimpleType) FromWire(w wire.Value) error { @@ -5010,7 +5010,7 @@ func (v *SimpleType) FromWire(w wire.Value) error { // // var v SimpleType // if err := v.Decode(sReader); err != nil { -// return SimpleType(0), err +// return SimpleType(0), err // } // return v, nil func (v *SimpleType) Decode(sr stream.Reader) error { @@ -5150,11 +5150,11 @@ type Type struct { // // x, err := v.ToWire() // if err != nil { -// return err +// return err // } // // if err := binaryProtocol.Encode(x, writer); err != nil { -// return err +// return err // } func (v *Type) ToWire() (wire.Value, error) { var ( @@ -5247,12 +5247,12 @@ func _TypeReference_Read(w wire.Value) (*TypeReference, error) { // // x, err := binaryProtocol.Decode(reader, wire.TStruct) // if err != nil { -// return nil, err +// return nil, err // } // // var v Type // if err := v.FromWire(x); err != nil { -// return nil, err +// return nil, err // } // return &v, nil func (v *Type) FromWire(w wire.Value) error { @@ -5777,11 +5777,11 @@ type TypePair struct { // // x, err := v.ToWire() // if err != nil { -// return err +// return err // } // // if err := binaryProtocol.Encode(x, writer); err != nil { -// return err +// return err // } func (v *TypePair) ToWire() (wire.Value, error) { var ( @@ -5822,12 +5822,12 @@ func (v *TypePair) ToWire() (wire.Value, error) { // // x, err := binaryProtocol.Decode(reader, wire.TStruct) // if err != nil { -// return nil, err +// return nil, err // } // // var v TypePair // if err := v.FromWire(x); err != nil { -// return nil, err +// return nil, err // } // return &v, nil func (v *TypePair) FromWire(w wire.Value) error { @@ -6080,11 +6080,11 @@ type TypeReference struct { // // x, err := v.ToWire() // if err != nil { -// return err +// return err // } // // if err := binaryProtocol.Encode(x, writer); err != nil { -// return err +// return err // } func (v *TypeReference) ToWire() (wire.Value, error) { var ( @@ -6128,12 +6128,12 @@ func (v *TypeReference) ToWire() (wire.Value, error) { // // x, err := binaryProtocol.Decode(reader, wire.TStruct) // if err != nil { -// return nil, err +// return nil, err // } // // var v TypeReference // if err := v.FromWire(x); err != nil { -// return nil, err +// return nil, err // } // return &v, nil func (v *TypeReference) FromWire(w wire.Value) error { @@ -6412,11 +6412,11 @@ type Plugin_Goodbye_Args struct { // // x, err := v.ToWire() // if err != nil { -// return err +// return err // } // // if err := binaryProtocol.Encode(x, writer); err != nil { -// return err +// return err // } func (v *Plugin_Goodbye_Args) ToWire() (wire.Value, error) { var ( @@ -6436,12 +6436,12 @@ func (v *Plugin_Goodbye_Args) ToWire() (wire.Value, error) { // // x, err := binaryProtocol.Decode(reader, wire.TStruct) // if err != nil { -// return nil, err +// return nil, err // } // // var v Plugin_Goodbye_Args // if err := v.FromWire(x); err != nil { -// return nil, err +// return nil, err // } // return &v, nil func (v *Plugin_Goodbye_Args) FromWire(w wire.Value) error { @@ -6641,11 +6641,11 @@ type Plugin_Goodbye_Result struct { // // x, err := v.ToWire() // if err != nil { -// return err +// return err // } // // if err := binaryProtocol.Encode(x, writer); err != nil { -// return err +// return err // } func (v *Plugin_Goodbye_Result) ToWire() (wire.Value, error) { var ( @@ -6665,12 +6665,12 @@ func (v *Plugin_Goodbye_Result) ToWire() (wire.Value, error) { // // x, err := binaryProtocol.Decode(reader, wire.TStruct) // if err != nil { -// return nil, err +// return nil, err // } // // var v Plugin_Goodbye_Result // if err := v.FromWire(x); err != nil { -// return nil, err +// return nil, err // } // return &v, nil func (v *Plugin_Goodbye_Result) FromWire(w wire.Value) error { @@ -6802,11 +6802,11 @@ type Plugin_Handshake_Args struct { // // x, err := v.ToWire() // if err != nil { -// return err +// return err // } // // if err := binaryProtocol.Encode(x, writer); err != nil { -// return err +// return err // } func (v *Plugin_Handshake_Args) ToWire() (wire.Value, error) { var ( @@ -6843,12 +6843,12 @@ func _HandshakeRequest_Read(w wire.Value) (*HandshakeRequest, error) { // // x, err := binaryProtocol.Decode(reader, wire.TStruct) // if err != nil { -// return nil, err +// return nil, err // } // // var v Plugin_Handshake_Args // if err := v.FromWire(x); err != nil { -// return nil, err +// return nil, err // } // return &v, nil func (v *Plugin_Handshake_Args) FromWire(w wire.Value) error { @@ -7122,11 +7122,11 @@ type Plugin_Handshake_Result struct { // // x, err := v.ToWire() // if err != nil { -// return err +// return err // } // // if err := binaryProtocol.Encode(x, writer); err != nil { -// return err +// return err // } func (v *Plugin_Handshake_Result) ToWire() (wire.Value, error) { var ( @@ -7167,12 +7167,12 @@ func _HandshakeResponse_Read(w wire.Value) (*HandshakeResponse, error) { // // x, err := binaryProtocol.Decode(reader, wire.TStruct) // if err != nil { -// return nil, err +// return nil, err // } // // var v Plugin_Handshake_Result // if err := v.FromWire(x); err != nil { -// return nil, err +// return nil, err // } // return &v, nil func (v *Plugin_Handshake_Result) FromWire(w wire.Value) error { @@ -7387,11 +7387,11 @@ type ServiceGenerator_Generate_Args struct { // // x, err := v.ToWire() // if err != nil { -// return err +// return err // } // // if err := binaryProtocol.Encode(x, writer); err != nil { -// return err +// return err // } func (v *ServiceGenerator_Generate_Args) ToWire() (wire.Value, error) { var ( @@ -7428,12 +7428,12 @@ func _GenerateServiceRequest_Read(w wire.Value) (*GenerateServiceRequest, error) // // x, err := binaryProtocol.Decode(reader, wire.TStruct) // if err != nil { -// return nil, err +// return nil, err // } // // var v ServiceGenerator_Generate_Args // if err := v.FromWire(x); err != nil { -// return nil, err +// return nil, err // } // return &v, nil func (v *ServiceGenerator_Generate_Args) FromWire(w wire.Value) error { @@ -7707,11 +7707,11 @@ type ServiceGenerator_Generate_Result struct { // // x, err := v.ToWire() // if err != nil { -// return err +// return err // } // // if err := binaryProtocol.Encode(x, writer); err != nil { -// return err +// return err // } func (v *ServiceGenerator_Generate_Result) ToWire() (wire.Value, error) { var ( @@ -7752,12 +7752,12 @@ func _GenerateServiceResponse_Read(w wire.Value) (*GenerateServiceResponse, erro // // x, err := binaryProtocol.Decode(reader, wire.TStruct) // if err != nil { -// return nil, err +// return nil, err // } // // var v ServiceGenerator_Generate_Result // if err := v.FromWire(x); err != nil { -// return nil, err +// return nil, err // } // return &v, nil func (v *ServiceGenerator_Generate_Result) FromWire(w wire.Value) error { From c8201b962716754a759a16ca5857f0cc50c2b6a7 Mon Sep 17 00:00:00 2001 From: r-hang Date: Thu, 8 Jun 2023 18:17:46 -0700 Subject: [PATCH 13/14] Revert to strings.Title again for pascalCase (#582) PR #578 replaced strings.Title with golang.org/x/text/cases due to staticcheck SA1019. There is at least one behavioral difference between these two Title casing approaches uncovered during pre-release testing. A test case to flag this change and an exemption for staticcheck in the relevant file are also added. Example: ``` chunk := "10x" fmt.Println(strings.Title(strings.ToLower(chunk))) # 10x fmt.Println(cases.Title(language.English).String(strings.ToLower(chunk))) # 10X ``` --- Makefile | 1 + gen/string.go | 4 +--- gen/string_test.go | 7 +++++++ go.mod | 1 - go.sum | 22 ---------------------- 5 files changed, 9 insertions(+), 26 deletions(-) diff --git a/Makefile b/Makefile index 2340b660..5c21c0f3 100644 --- a/Makefile +++ b/Makefile @@ -10,6 +10,7 @@ STATICCHECK = $(GOBIN)/staticcheck LINT_EXCLUDES = \ gen/internal/tests/ \ + gen/string.go \ idl/internal/lex.go \ idl/internal/y.go \ plugin/api/plugin.go \ diff --git a/gen/string.go b/gen/string.go index 7fa5e568..83e2b681 100644 --- a/gen/string.go +++ b/gen/string.go @@ -27,8 +27,6 @@ import ( "unicode/utf8" "go.uber.org/thriftrw/compile" - "golang.org/x/text/cases" - "golang.org/x/text/language" ) // isAllCaps checks if a string contains all capital letters only. Non-letters @@ -65,7 +63,7 @@ func pascalCase(allowAllCaps bool, words ...string) string { if isAllCaps(chunk) && !allowAllCaps { // A single ALLCAPS word does not count as SCREAMING_SNAKE_CASE. // There must be at least one underscore. - words[i] = cases.Title(language.English).String(strings.ToLower(chunk)) + words[i] = strings.Title(strings.ToLower(chunk)) continue } diff --git a/gen/string_test.go b/gen/string_test.go index 4a1695b3..1dcba1b9 100644 --- a/gen/string_test.go +++ b/gen/string_test.go @@ -109,6 +109,13 @@ func TestConstantName(t *testing.T) { give: "API_VERSION", want: "APIVersion", }, + { + // ensure code generation compatibility. strings.Title and + // golang.org/x/text/cases return different results in this + // case. + give: "10xDeveloper", + want: "10xDeveloper", + }, } for _, tt := range tests { diff --git a/go.mod b/go.mod index 97d6d15f..61e8a59f 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,6 @@ require ( go.uber.org/multierr v1.1.0 go.uber.org/zap v1.9.1 golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f - golang.org/x/text v0.7.0 golang.org/x/tools v0.4.1-0.20221208213631-3f74d914ae6d honnef.co/go/tools v0.4.3 ) diff --git a/go.sum b/go.sum index 88d5e696..efd98f09 100644 --- a/go.sum +++ b/go.sum @@ -74,7 +74,6 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/xanzy/ssh-agent v0.3.0 h1:wUMzuKtKilRgBAD1sUb8gOwwRr2FGoBVumcjoOACClI= github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.uber.org/atomic v1.3.2 h1:2Oa65PReHzfn29GpvgsYwloV9AVFHPDk8tYxt2c2tr4= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/multierr v1.1.0 h1:HoEmRHQPVSqub6w2z2d2EOVs2fjyFRGyofhKuyDq0QI= @@ -86,7 +85,6 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU= golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= golang.org/x/exp/typeparams v0.0.0-20221208152030-732eee02a75a h1:Jw5wfR+h9mnIYH+OtGT2im5wV1YGGDora5vTv/aa5bE= @@ -94,7 +92,6 @@ golang.org/x/exp/typeparams v0.0.0-20221208152030-732eee02a75a/go.mod h1:AbB0pIl golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f h1:J5lckAjkw6qYlOZNj90mLYNTEKDvWeuc1yieZ8qUzUE= golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA= golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -102,16 +99,11 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210326060303-6b1517762897/go.mod h1:uSPa2vr4CLtc/ILN5odXGNXS6mhrKVzTaCXzk9m6W3k= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= -golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= -golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -124,31 +116,17 @@ golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210502180810-71e4cd670f79/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY= -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.4.1-0.20221208213631-3f74d914ae6d h1:9ZNWAi4CYhNv60mXGgAncgq7SGc5qa7C8VZV8Tg7Ggs= golang.org/x/tools v0.4.1-0.20221208213631-3f74d914ae6d/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= From 93c59ebf3785dfb2294e8a29ac0a8b15b74ee008 Mon Sep 17 00:00:00 2001 From: Ryan Hang Date: Thu, 8 Jun 2023 19:11:53 -0700 Subject: [PATCH 14/14] 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