From 4549dd00f4bec9c39864fdee3484c54bf723555b Mon Sep 17 00:00:00 2001 From: Walter Schulze Date: Tue, 2 Jun 2015 18:12:44 +0200 Subject: [PATCH] nodep --- gogoproto/gogo.pb.go | 9 + gogoproto/gogo.proto | 1 + gogoproto/helper.go | 4 + plugin/equal/equaltest.go | 3 + plugin/face/face.go | 3 + plugin/gostring/gostring.go | 3 + plugin/marshalto/marshalto.go | 3 + plugin/populate/populate.go | 3 + plugin/size/size.go | 3 + plugin/size/sizetest.go | 3 + plugin/testgen/testgen.go | 6 + plugin/unmarshal/unmarshal.go | 3 + protoc-gen-gogo/generator/generator.go | 6 +- test/Makefile | 1 + test/combos/both/thetest.pb.go | 6 +- test/combos/marshaler/thetest.pb.go | 6 +- test/combos/unmarshaler/thetest.pb.go | 6 +- test/combos/unsafeboth/thetest.pb.go | 6 +- test/combos/unsafemarshaler/thetest.pb.go | 6 +- test/combos/unsafeunmarshaler/thetest.pb.go | 6 +- test/example/example.pb.go | 6 +- test/group/group.pb.go | 6 +- test/mapsproto2/combos/both/mapsproto2.pb.go | 6 +- .../combos/marshaler/mapsproto2.pb.go | 6 +- .../combos/neither/mapsproto2.pb.go | 6 +- .../combos/unmarshaler/mapsproto2.pb.go | 6 +- .../combos/unsafeboth/mapsproto2.pb.go | 6 +- .../combos/unsafemarshaler/mapsproto2.pb.go | 6 +- .../combos/unsafeunmarshaler/mapsproto2.pb.go | 6 +- test/theproto3/combos/both/theproto3.pb.go | 6 +- .../combos/marshaler/theproto3.pb.go | 6 +- test/theproto3/combos/neither/theproto3.pb.go | 6 +- .../combos/unmarshaler/theproto3.pb.go | 6 +- .../combos/unsafeboth/theproto3.pb.go | 6 +- .../combos/unsafemarshaler/theproto3.pb.go | 6 +- .../combos/unsafeunmarshaler/theproto3.pb.go | 6 +- test/thetest.pb.go | 14 +- test/thetestpb_test.go | 801 +++++++++++------- test/unrecognized/unrecognized.pb.go | 6 +- .../unrecognizedgroup/unrecognizedgroup.pb.go | 6 +- 40 files changed, 678 insertions(+), 332 deletions(-) diff --git a/gogoproto/gogo.pb.go b/gogoproto/gogo.pb.go index 43dd8131a4..783750d2a5 100644 --- a/gogoproto/gogo.pb.go +++ b/gogoproto/gogo.pb.go @@ -230,6 +230,14 @@ var E_GoprotoUnrecognizedAll = &proto.ExtensionDesc{ Tag: "varint,63026,opt,name=goproto_unrecognized_all", } +var E_GogoprotoImport = &proto.ExtensionDesc{ + ExtendedType: (*google_protobuf.FileOptions)(nil), + ExtensionType: (*bool)(nil), + Field: 63027, + Name: "gogoproto.gogoproto_import", + Tag: "varint,63027,opt,name=gogoproto_import", +} + var E_GoprotoGetters = &proto.ExtensionDesc{ ExtendedType: (*google_protobuf.MessageOptions)(nil), ExtensionType: (*bool)(nil), @@ -465,6 +473,7 @@ func init() { proto.RegisterExtension(E_UnsafeUnmarshalerAll) proto.RegisterExtension(E_GoprotoExtensionsMapAll) proto.RegisterExtension(E_GoprotoUnrecognizedAll) + proto.RegisterExtension(E_GogoprotoImport) proto.RegisterExtension(E_GoprotoGetters) proto.RegisterExtension(E_GoprotoStringer) proto.RegisterExtension(E_VerboseEqual) diff --git a/gogoproto/gogo.proto b/gogoproto/gogo.proto index d7f77f6da7..ac3437ac2a 100644 --- a/gogoproto/gogo.proto +++ b/gogoproto/gogo.proto @@ -66,6 +66,7 @@ extend google.protobuf.FileOptions { optional bool goproto_extensions_map_all = 63025; optional bool goproto_unrecognized_all = 63026; + optional bool gogoproto_import = 63027; } extend google.protobuf.MessageOptions { diff --git a/gogoproto/helper.go b/gogoproto/helper.go index 2680c778c3..220b526086 100644 --- a/gogoproto/helper.go +++ b/gogoproto/helper.go @@ -193,3 +193,7 @@ func HasUnrecognized(file *google_protobuf.FileDescriptorProto, message *google_ func IsProto3(file *google_protobuf.FileDescriptorProto) bool { return file.GetSyntax() == "proto3" } + +func ImportsGoGoProto(file *google_protobuf.FileDescriptorProto) bool { + return proto.GetBoolExtension(file.Options, E_GogoprotoImport, true) +} diff --git a/plugin/equal/equaltest.go b/plugin/equal/equaltest.go index d3009fae4d..2fec835515 100644 --- a/plugin/equal/equaltest.go +++ b/plugin/equal/equaltest.go @@ -46,6 +46,9 @@ func (p *test) Generate(imports generator.PluginImports, file *generator.FileDes timePkg := imports.NewImport("time") testingPkg := imports.NewImport("testing") protoPkg := imports.NewImport("github.com/gogo/protobuf/proto") + if !gogoproto.ImportsGoGoProto(file.FileDescriptorProto) { + protoPkg = imports.NewImport("github.com/golang/protobuf/proto") + } for _, message := range file.Messages() { ccTypeName := generator.CamelCaseSlice(message.TypeName()) if !gogoproto.HasVerboseEqual(file.FileDescriptorProto, message.DescriptorProto) { diff --git a/plugin/face/face.go b/plugin/face/face.go index f5fcdc5c9d..c98cb08979 100644 --- a/plugin/face/face.go +++ b/plugin/face/face.go @@ -168,6 +168,9 @@ func (p *plugin) GetMapGoType(file *descriptor.FileDescriptorProto, field *descr func (p *plugin) Generate(file *generator.FileDescriptor) { p.PluginImports = generator.NewPluginImports(p.Generator) protoPkg := p.NewImport("github.com/gogo/protobuf/proto") + if !gogoproto.ImportsGoGoProto(file.FileDescriptorProto) { + protoPkg = p.NewImport("github.com/golang/protobuf/proto") + } for _, message := range file.Messages() { if !gogoproto.IsFace(file.FileDescriptorProto, message.DescriptorProto) { continue diff --git a/plugin/gostring/gostring.go b/plugin/gostring/gostring.go index cf2e557c04..f0d9cc9fdf 100644 --- a/plugin/gostring/gostring.go +++ b/plugin/gostring/gostring.go @@ -129,6 +129,9 @@ func (p *gostring) Generate(file *generator.FileDescriptor) { fmtPkg := p.NewImport("fmt") stringsPkg := p.NewImport("strings") protoPkg := p.NewImport("github.com/gogo/protobuf/proto") + if !gogoproto.ImportsGoGoProto(file.FileDescriptorProto) { + protoPkg = p.NewImport("github.com/golang/protobuf/proto") + } sortPkg := p.NewImport("sort") strconvPkg := p.NewImport("strconv") reflectPkg := p.NewImport("reflect") diff --git a/plugin/marshalto/marshalto.go b/plugin/marshalto/marshalto.go index 0f24f681cd..f793b6f4e9 100644 --- a/plugin/marshalto/marshalto.go +++ b/plugin/marshalto/marshalto.go @@ -369,6 +369,9 @@ func (p *marshalto) Generate(file *generator.FileDescriptor) { mathPkg := p.NewImport("math") protoPkg := p.NewImport("github.com/gogo/protobuf/proto") + if !gogoproto.ImportsGoGoProto(file.FileDescriptorProto) { + protoPkg = p.NewImport("github.com/golang/protobuf/proto") + } sortKeysPkg := p.NewImport("github.com/gogo/protobuf/sortkeys") p.unsafePkg = p.NewImport("unsafe") diff --git a/plugin/populate/populate.go b/plugin/populate/populate.go index 4c26f15158..beccf054a8 100644 --- a/plugin/populate/populate.go +++ b/plugin/populate/populate.go @@ -446,6 +446,9 @@ func (p *plugin) Generate(file *generator.FileDescriptor) { p.localName = generator.FileName(file) protoPkg := p.NewImport("github.com/gogo/protobuf/proto") + if !gogoproto.ImportsGoGoProto(file.FileDescriptorProto) { + protoPkg = p.NewImport("github.com/golang/protobuf/proto") + } for _, message := range file.Messages() { if !gogoproto.HasPopulate(file.FileDescriptorProto, message.DescriptorProto) { diff --git a/plugin/size/size.go b/plugin/size/size.go index 89cc589f7a..1b06e4b36b 100644 --- a/plugin/size/size.go +++ b/plugin/size/size.go @@ -199,6 +199,9 @@ func (p *size) Generate(file *generator.FileDescriptor) { p.atleastOne = false p.localName = generator.FileName(file) protoPkg := p.NewImport("github.com/gogo/protobuf/proto") + if !gogoproto.ImportsGoGoProto(file.FileDescriptorProto) { + protoPkg = p.NewImport("github.com/golang/protobuf/proto") + } for _, message := range file.Messages() { if !gogoproto.IsSizer(file.FileDescriptorProto, message.DescriptorProto) { continue diff --git a/plugin/size/sizetest.go b/plugin/size/sizetest.go index c1af9c3fa7..27314dcd07 100644 --- a/plugin/size/sizetest.go +++ b/plugin/size/sizetest.go @@ -46,6 +46,9 @@ func (p *test) Generate(imports generator.PluginImports, file *generator.FileDes timePkg := imports.NewImport("time") testingPkg := imports.NewImport("testing") protoPkg := imports.NewImport("github.com/gogo/protobuf/proto") + if !gogoproto.ImportsGoGoProto(file.FileDescriptorProto) { + protoPkg = imports.NewImport("github.com/golang/protobuf/proto") + } for _, message := range file.Messages() { ccTypeName := generator.CamelCaseSlice(message.TypeName()) if !gogoproto.IsSizer(file.FileDescriptorProto, message.DescriptorProto) { diff --git a/plugin/testgen/testgen.go b/plugin/testgen/testgen.go index e4ca457144..2eb116a559 100644 --- a/plugin/testgen/testgen.go +++ b/plugin/testgen/testgen.go @@ -269,6 +269,9 @@ func (p *testProto) Generate(imports generator.PluginImports, file *generator.Fi randPkg := imports.NewImport("math/rand") timePkg := imports.NewImport("time") protoPkg := imports.NewImport("github.com/gogo/protobuf/proto") + if !gogoproto.ImportsGoGoProto(file.FileDescriptorProto) { + protoPkg = imports.NewImport("github.com/golang/protobuf/proto") + } for _, message := range file.Messages() { ccTypeName := generator.CamelCaseSlice(message.TypeName()) if message.DescriptorProto.GetOptions().GetMapEntry() { @@ -505,6 +508,9 @@ func (p *testText) Generate(imports generator.PluginImports, file *generator.Fil randPkg := imports.NewImport("math/rand") timePkg := imports.NewImport("time") protoPkg := imports.NewImport("github.com/gogo/protobuf/proto") + if !gogoproto.ImportsGoGoProto(file.FileDescriptorProto) { + protoPkg = imports.NewImport("github.com/golang/protobuf/proto") + } //fmtPkg := imports.NewImport("fmt") for _, message := range file.Messages() { ccTypeName := generator.CamelCaseSlice(message.TypeName()) diff --git a/plugin/unmarshal/unmarshal.go b/plugin/unmarshal/unmarshal.go index c9355a8b9a..c3d59733ad 100644 --- a/plugin/unmarshal/unmarshal.go +++ b/plugin/unmarshal/unmarshal.go @@ -789,6 +789,9 @@ func (p *unmarshal) Generate(file *generator.FileDescriptor) { p.unsafePkg = p.NewImport("unsafe") fmtPkg := p.NewImport("fmt") protoPkg := p.NewImport("github.com/gogo/protobuf/proto") + if !gogoproto.ImportsGoGoProto(file.FileDescriptorProto) { + protoPkg = p.NewImport("github.com/golang/protobuf/proto") + } for _, message := range file.Messages() { ccTypeName := generator.CamelCaseSlice(message.TypeName()) diff --git a/protoc-gen-gogo/generator/generator.go b/protoc-gen-gogo/generator/generator.go index 6d3359368d..ba9e533869 100644 --- a/protoc-gen-gogo/generator/generator.go +++ b/protoc-gen-gogo/generator/generator.go @@ -1185,7 +1185,11 @@ func (g *Generator) generateImports() { // do, which is tricky when there's a plugin, just import it and // reference it later. The same argument applies to the math package, // for handling bit patterns for floating-point numbers. - g.PrintImport(g.Pkg["proto"], g.ImportPrefix+"github.com/gogo/protobuf/proto") + if gogoproto.ImportsGoGoProto(g.file.FileDescriptorProto) { + g.PrintImport(g.Pkg["proto"], g.ImportPrefix+"github.com/gogo/protobuf/proto") + } else { + g.PrintImport(g.Pkg["proto"], g.ImportPrefix+"github.com/golang/protobuf/proto") + } if !g.file.proto3 { g.PrintImport(g.Pkg["math"], "math") } diff --git a/test/Makefile b/test/Makefile index 4744d1773a..0f0e30b3ca 100644 --- a/test/Makefile +++ b/test/Makefile @@ -29,6 +29,7 @@ regenerate: go install github.com/gogo/protobuf/protoc-gen-gogo/protoc-gen-combo protoc-gen-combo --default=false --proto_path=../:../../../../:../protobuf/:. thetest.proto + protoc --gogo_out=. --proto_path=../:../../../../:../protobuf/:. thetest.proto cp uuid.go ./combos/both/ cp uuid.go ./combos/marshaler/ cp uuid.go ./combos/unmarshaler/ diff --git a/test/combos/both/thetest.pb.go b/test/combos/both/thetest.pb.go index cfb6fbbb4c..22cb75a3ab 100644 --- a/test/combos/both/thetest.pb.go +++ b/test/combos/both/thetest.pb.go @@ -30661,6 +30661,10 @@ func ThetestDescription() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v + }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("gogoproto_import"), Number: func(v int32) *int32 { return &v }(63027), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + return &v + }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { + return &v }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("goproto_getters"), Number: func(v int32) *int32 { return &v }(64001), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { @@ -30765,7 +30769,7 @@ func ThetestDescription() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v - }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: nil, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("combos/both/thetest.proto"), Package: func(v string) *string { return &v }("test"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("NidOptNative"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("Field1"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: map[int32]proto.Extension{}, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("combos/both/thetest.proto"), Package: func(v string) *string { return &v }("test"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("NidOptNative"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("Field1"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v diff --git a/test/combos/marshaler/thetest.pb.go b/test/combos/marshaler/thetest.pb.go index 8d0606868b..12d4db4255 100644 --- a/test/combos/marshaler/thetest.pb.go +++ b/test/combos/marshaler/thetest.pb.go @@ -21321,6 +21321,10 @@ func ThetestDescription() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v + }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("gogoproto_import"), Number: func(v int32) *int32 { return &v }(63027), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + return &v + }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { + return &v }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("goproto_getters"), Number: func(v int32) *int32 { return &v }(64001), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { @@ -21425,7 +21429,7 @@ func ThetestDescription() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v - }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: nil, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("combos/marshaler/thetest.proto"), Package: func(v string) *string { return &v }("test"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("NidOptNative"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("Field1"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: map[int32]proto.Extension{}, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("combos/marshaler/thetest.proto"), Package: func(v string) *string { return &v }("test"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("NidOptNative"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("Field1"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v diff --git a/test/combos/unmarshaler/thetest.pb.go b/test/combos/unmarshaler/thetest.pb.go index 65d41c1522..a190e82442 100644 --- a/test/combos/unmarshaler/thetest.pb.go +++ b/test/combos/unmarshaler/thetest.pb.go @@ -26648,6 +26648,10 @@ func ThetestDescription() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v + }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("gogoproto_import"), Number: func(v int32) *int32 { return &v }(63027), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + return &v + }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { + return &v }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("goproto_getters"), Number: func(v int32) *int32 { return &v }(64001), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { @@ -26752,7 +26756,7 @@ func ThetestDescription() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v - }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: nil, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("combos/unmarshaler/thetest.proto"), Package: func(v string) *string { return &v }("test"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("NidOptNative"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("Field1"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: map[int32]proto.Extension{}, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("combos/unmarshaler/thetest.proto"), Package: func(v string) *string { return &v }("test"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("NidOptNative"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("Field1"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v diff --git a/test/combos/unsafeboth/thetest.pb.go b/test/combos/unsafeboth/thetest.pb.go index d5ef6942f4..7e93db8078 100644 --- a/test/combos/unsafeboth/thetest.pb.go +++ b/test/combos/unsafeboth/thetest.pb.go @@ -29856,6 +29856,10 @@ func ThetestDescription() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v + }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("gogoproto_import"), Number: func(v int32) *int32 { return &v }(63027), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + return &v + }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { + return &v }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("goproto_getters"), Number: func(v int32) *int32 { return &v }(64001), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { @@ -29960,7 +29964,7 @@ func ThetestDescription() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v - }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: nil, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("combos/unsafeboth/thetest.proto"), Package: func(v string) *string { return &v }("test"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("NidOptNative"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("Field1"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: map[int32]proto.Extension{}, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("combos/unsafeboth/thetest.proto"), Package: func(v string) *string { return &v }("test"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("NidOptNative"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("Field1"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v diff --git a/test/combos/unsafemarshaler/thetest.pb.go b/test/combos/unsafemarshaler/thetest.pb.go index 5ff872b4b1..918686ec1f 100644 --- a/test/combos/unsafemarshaler/thetest.pb.go +++ b/test/combos/unsafemarshaler/thetest.pb.go @@ -21012,6 +21012,10 @@ func ThetestDescription() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v + }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("gogoproto_import"), Number: func(v int32) *int32 { return &v }(63027), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + return &v + }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { + return &v }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("goproto_getters"), Number: func(v int32) *int32 { return &v }(64001), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { @@ -21116,7 +21120,7 @@ func ThetestDescription() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v - }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: nil, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("combos/unsafemarshaler/thetest.proto"), Package: func(v string) *string { return &v }("test"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("NidOptNative"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("Field1"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: map[int32]proto.Extension{}, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("combos/unsafemarshaler/thetest.proto"), Package: func(v string) *string { return &v }("test"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("NidOptNative"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("Field1"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v diff --git a/test/combos/unsafeunmarshaler/thetest.pb.go b/test/combos/unsafeunmarshaler/thetest.pb.go index 2d77da313f..8e516b2984 100644 --- a/test/combos/unsafeunmarshaler/thetest.pb.go +++ b/test/combos/unsafeunmarshaler/thetest.pb.go @@ -26154,6 +26154,10 @@ func ThetestDescription() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v + }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("gogoproto_import"), Number: func(v int32) *int32 { return &v }(63027), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + return &v + }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { + return &v }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("goproto_getters"), Number: func(v int32) *int32 { return &v }(64001), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { @@ -26258,7 +26262,7 @@ func ThetestDescription() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v - }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: nil, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("combos/unsafeunmarshaler/thetest.proto"), Package: func(v string) *string { return &v }("test"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("NidOptNative"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("Field1"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: map[int32]proto.Extension{}, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("combos/unsafeunmarshaler/thetest.proto"), Package: func(v string) *string { return &v }("test"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("NidOptNative"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("Field1"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v diff --git a/test/example/example.pb.go b/test/example/example.pb.go index 55d3b9a692..81e59b9478 100644 --- a/test/example/example.pb.go +++ b/test/example/example.pb.go @@ -2179,6 +2179,10 @@ func ExampleDescription() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v + }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("gogoproto_import"), Number: func(v int32) *int32 { return &v }(63027), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + return &v + }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { + return &v }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("goproto_getters"), Number: func(v int32) *int32 { return &v }(64001), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { @@ -2283,7 +2287,7 @@ func ExampleDescription() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v - }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: nil, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("example.proto"), Package: func(v string) *string { return &v }("test"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("A"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("Description"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: map[int32]proto.Extension{}, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("example.proto"), Package: func(v string) *string { return &v }("test"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("A"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("Description"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v diff --git a/test/group/group.pb.go b/test/group/group.pb.go index c0874227ac..93c29d83a6 100644 --- a/test/group/group.pb.go +++ b/test/group/group.pb.go @@ -1122,6 +1122,10 @@ func GroupDescription() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v + }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("gogoproto_import"), Number: func(v int32) *int32 { return &v }(63027), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + return &v + }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { + return &v }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("goproto_getters"), Number: func(v int32) *int32 { return &v }(64001), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { @@ -1226,7 +1230,7 @@ func GroupDescription() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v - }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: nil, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("group.proto"), Package: func(v string) *string { return &v }("group"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("Groups1"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("g"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: map[int32]proto.Extension{}, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("group.proto"), Package: func(v string) *string { return &v }("group"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("Groups1"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("g"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(3), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v diff --git a/test/mapsproto2/combos/both/mapsproto2.pb.go b/test/mapsproto2/combos/both/mapsproto2.pb.go index 35345bf50b..3b312c2906 100644 --- a/test/mapsproto2/combos/both/mapsproto2.pb.go +++ b/test/mapsproto2/combos/both/mapsproto2.pb.go @@ -3860,6 +3860,10 @@ func Mapsproto2Description() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v + }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("gogoproto_import"), Number: func(v int32) *int32 { return &v }(63027), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + return &v + }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { + return &v }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("goproto_getters"), Number: func(v int32) *int32 { return &v }(64001), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { @@ -3964,7 +3968,7 @@ func Mapsproto2Description() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v - }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: nil, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("combos/both/mapsproto2.proto"), Package: func(v string) *string { return &v }("mapsproto2"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("FloatingPoint"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("f"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: map[int32]proto.Extension{}, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("combos/both/mapsproto2.proto"), Package: func(v string) *string { return &v }("mapsproto2"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("FloatingPoint"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("f"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v diff --git a/test/mapsproto2/combos/marshaler/mapsproto2.pb.go b/test/mapsproto2/combos/marshaler/mapsproto2.pb.go index 75c4cd0444..adab10c965 100644 --- a/test/mapsproto2/combos/marshaler/mapsproto2.pb.go +++ b/test/mapsproto2/combos/marshaler/mapsproto2.pb.go @@ -2452,6 +2452,10 @@ func Mapsproto2Description() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v + }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("gogoproto_import"), Number: func(v int32) *int32 { return &v }(63027), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + return &v + }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { + return &v }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("goproto_getters"), Number: func(v int32) *int32 { return &v }(64001), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { @@ -2556,7 +2560,7 @@ func Mapsproto2Description() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v - }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: nil, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("combos/marshaler/mapsproto2.proto"), Package: func(v string) *string { return &v }("mapsproto2"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("FloatingPoint"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("f"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: map[int32]proto.Extension{}, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("combos/marshaler/mapsproto2.proto"), Package: func(v string) *string { return &v }("mapsproto2"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("FloatingPoint"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("f"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v diff --git a/test/mapsproto2/combos/neither/mapsproto2.pb.go b/test/mapsproto2/combos/neither/mapsproto2.pb.go index f1a5a4297e..0d2b25cf29 100644 --- a/test/mapsproto2/combos/neither/mapsproto2.pb.go +++ b/test/mapsproto2/combos/neither/mapsproto2.pb.go @@ -2010,6 +2010,10 @@ func Mapsproto2Description() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v + }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("gogoproto_import"), Number: func(v int32) *int32 { return &v }(63027), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + return &v + }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { + return &v }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("goproto_getters"), Number: func(v int32) *int32 { return &v }(64001), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { @@ -2114,7 +2118,7 @@ func Mapsproto2Description() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v - }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: nil, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("combos/neither/mapsproto2.proto"), Package: func(v string) *string { return &v }("mapsproto2"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("FloatingPoint"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("f"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: map[int32]proto.Extension{}, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("combos/neither/mapsproto2.proto"), Package: func(v string) *string { return &v }("mapsproto2"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("FloatingPoint"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("f"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v diff --git a/test/mapsproto2/combos/unmarshaler/mapsproto2.pb.go b/test/mapsproto2/combos/unmarshaler/mapsproto2.pb.go index 66efb85a3b..677a9c5523 100644 --- a/test/mapsproto2/combos/unmarshaler/mapsproto2.pb.go +++ b/test/mapsproto2/combos/unmarshaler/mapsproto2.pb.go @@ -3418,6 +3418,10 @@ func Mapsproto2Description() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v + }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("gogoproto_import"), Number: func(v int32) *int32 { return &v }(63027), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + return &v + }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { + return &v }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("goproto_getters"), Number: func(v int32) *int32 { return &v }(64001), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { @@ -3522,7 +3526,7 @@ func Mapsproto2Description() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v - }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: nil, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("combos/unmarshaler/mapsproto2.proto"), Package: func(v string) *string { return &v }("mapsproto2"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("FloatingPoint"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("f"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: map[int32]proto.Extension{}, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("combos/unmarshaler/mapsproto2.proto"), Package: func(v string) *string { return &v }("mapsproto2"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("FloatingPoint"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("f"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v diff --git a/test/mapsproto2/combos/unsafeboth/mapsproto2.pb.go b/test/mapsproto2/combos/unsafeboth/mapsproto2.pb.go index 849a7bd163..a5ac2df9ed 100644 --- a/test/mapsproto2/combos/unsafeboth/mapsproto2.pb.go +++ b/test/mapsproto2/combos/unsafeboth/mapsproto2.pb.go @@ -3854,6 +3854,10 @@ func Mapsproto2Description() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v + }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("gogoproto_import"), Number: func(v int32) *int32 { return &v }(63027), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + return &v + }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { + return &v }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("goproto_getters"), Number: func(v int32) *int32 { return &v }(64001), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { @@ -3958,7 +3962,7 @@ func Mapsproto2Description() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v - }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: nil, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("combos/unsafeboth/mapsproto2.proto"), Package: func(v string) *string { return &v }("mapsproto2"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("FloatingPoint"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("f"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: map[int32]proto.Extension{}, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("combos/unsafeboth/mapsproto2.proto"), Package: func(v string) *string { return &v }("mapsproto2"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("FloatingPoint"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("f"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v diff --git a/test/mapsproto2/combos/unsafemarshaler/mapsproto2.pb.go b/test/mapsproto2/combos/unsafemarshaler/mapsproto2.pb.go index 49cd58302c..b7bd9f0570 100644 --- a/test/mapsproto2/combos/unsafemarshaler/mapsproto2.pb.go +++ b/test/mapsproto2/combos/unsafemarshaler/mapsproto2.pb.go @@ -2455,6 +2455,10 @@ func Mapsproto2Description() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v + }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("gogoproto_import"), Number: func(v int32) *int32 { return &v }(63027), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + return &v + }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { + return &v }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("goproto_getters"), Number: func(v int32) *int32 { return &v }(64001), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { @@ -2559,7 +2563,7 @@ func Mapsproto2Description() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v - }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: nil, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("combos/unsafemarshaler/mapsproto2.proto"), Package: func(v string) *string { return &v }("mapsproto2"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("FloatingPoint"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("f"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: map[int32]proto.Extension{}, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("combos/unsafemarshaler/mapsproto2.proto"), Package: func(v string) *string { return &v }("mapsproto2"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("FloatingPoint"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("f"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v diff --git a/test/mapsproto2/combos/unsafeunmarshaler/mapsproto2.pb.go b/test/mapsproto2/combos/unsafeunmarshaler/mapsproto2.pb.go index 2caf16b969..43c0849284 100644 --- a/test/mapsproto2/combos/unsafeunmarshaler/mapsproto2.pb.go +++ b/test/mapsproto2/combos/unsafeunmarshaler/mapsproto2.pb.go @@ -3411,6 +3411,10 @@ func Mapsproto2Description() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v + }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("gogoproto_import"), Number: func(v int32) *int32 { return &v }(63027), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + return &v + }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { + return &v }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("goproto_getters"), Number: func(v int32) *int32 { return &v }(64001), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { @@ -3515,7 +3519,7 @@ func Mapsproto2Description() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v - }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: nil, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("combos/unsafeunmarshaler/mapsproto2.proto"), Package: func(v string) *string { return &v }("mapsproto2"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("FloatingPoint"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("f"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: map[int32]proto.Extension{}, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("combos/unsafeunmarshaler/mapsproto2.proto"), Package: func(v string) *string { return &v }("mapsproto2"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("FloatingPoint"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("f"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v diff --git a/test/theproto3/combos/both/theproto3.pb.go b/test/theproto3/combos/both/theproto3.pb.go index 360e6b47c2..f9c70ba6bf 100644 --- a/test/theproto3/combos/both/theproto3.pb.go +++ b/test/theproto3/combos/both/theproto3.pb.go @@ -5624,6 +5624,10 @@ func Theproto3Description() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v + }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("gogoproto_import"), Number: func(v int32) *int32 { return &v }(63027), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + return &v + }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { + return &v }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("goproto_getters"), Number: func(v int32) *int32 { return &v }(64001), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { @@ -5728,7 +5732,7 @@ func Theproto3Description() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v - }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: nil, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("github.com/gogo/protobuf/test/combos/both/thetest.proto"), Package: func(v string) *string { return &v }("test"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("NidOptNative"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("Field1"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: map[int32]proto.Extension{}, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("github.com/gogo/protobuf/test/combos/both/thetest.proto"), Package: func(v string) *string { return &v }("test"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("NidOptNative"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("Field1"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v diff --git a/test/theproto3/combos/marshaler/theproto3.pb.go b/test/theproto3/combos/marshaler/theproto3.pb.go index 5eef3c220f..242255eae2 100644 --- a/test/theproto3/combos/marshaler/theproto3.pb.go +++ b/test/theproto3/combos/marshaler/theproto3.pb.go @@ -3473,6 +3473,10 @@ func Theproto3Description() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v + }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("gogoproto_import"), Number: func(v int32) *int32 { return &v }(63027), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + return &v + }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { + return &v }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("goproto_getters"), Number: func(v int32) *int32 { return &v }(64001), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { @@ -3577,7 +3581,7 @@ func Theproto3Description() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v - }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: nil, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("github.com/gogo/protobuf/test/combos/both/thetest.proto"), Package: func(v string) *string { return &v }("test"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("NidOptNative"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("Field1"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: map[int32]proto.Extension{}, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("github.com/gogo/protobuf/test/combos/both/thetest.proto"), Package: func(v string) *string { return &v }("test"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("NidOptNative"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("Field1"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v diff --git a/test/theproto3/combos/neither/theproto3.pb.go b/test/theproto3/combos/neither/theproto3.pb.go index 05140eaced..2faca122ce 100644 --- a/test/theproto3/combos/neither/theproto3.pb.go +++ b/test/theproto3/combos/neither/theproto3.pb.go @@ -2783,6 +2783,10 @@ func Theproto3Description() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v + }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("gogoproto_import"), Number: func(v int32) *int32 { return &v }(63027), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + return &v + }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { + return &v }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("goproto_getters"), Number: func(v int32) *int32 { return &v }(64001), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { @@ -2887,7 +2891,7 @@ func Theproto3Description() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v - }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: nil, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("github.com/gogo/protobuf/test/combos/both/thetest.proto"), Package: func(v string) *string { return &v }("test"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("NidOptNative"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("Field1"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: map[int32]proto.Extension{}, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("github.com/gogo/protobuf/test/combos/both/thetest.proto"), Package: func(v string) *string { return &v }("test"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("NidOptNative"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("Field1"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v diff --git a/test/theproto3/combos/unmarshaler/theproto3.pb.go b/test/theproto3/combos/unmarshaler/theproto3.pb.go index 1d02443546..e64ac5c6d1 100644 --- a/test/theproto3/combos/unmarshaler/theproto3.pb.go +++ b/test/theproto3/combos/unmarshaler/theproto3.pb.go @@ -4936,6 +4936,10 @@ func Theproto3Description() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v + }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("gogoproto_import"), Number: func(v int32) *int32 { return &v }(63027), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + return &v + }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { + return &v }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("goproto_getters"), Number: func(v int32) *int32 { return &v }(64001), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { @@ -5040,7 +5044,7 @@ func Theproto3Description() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v - }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: nil, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("github.com/gogo/protobuf/test/combos/both/thetest.proto"), Package: func(v string) *string { return &v }("test"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("NidOptNative"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("Field1"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: map[int32]proto.Extension{}, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("github.com/gogo/protobuf/test/combos/both/thetest.proto"), Package: func(v string) *string { return &v }("test"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("NidOptNative"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("Field1"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v diff --git a/test/theproto3/combos/unsafeboth/theproto3.pb.go b/test/theproto3/combos/unsafeboth/theproto3.pb.go index 478a7c0dd9..496c19116e 100644 --- a/test/theproto3/combos/unsafeboth/theproto3.pb.go +++ b/test/theproto3/combos/unsafeboth/theproto3.pb.go @@ -5613,6 +5613,10 @@ func Theproto3Description() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v + }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("gogoproto_import"), Number: func(v int32) *int32 { return &v }(63027), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + return &v + }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { + return &v }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("goproto_getters"), Number: func(v int32) *int32 { return &v }(64001), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { @@ -5717,7 +5721,7 @@ func Theproto3Description() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v - }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: nil, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("github.com/gogo/protobuf/test/combos/both/thetest.proto"), Package: func(v string) *string { return &v }("test"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("NidOptNative"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("Field1"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: map[int32]proto.Extension{}, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("github.com/gogo/protobuf/test/combos/both/thetest.proto"), Package: func(v string) *string { return &v }("test"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("NidOptNative"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("Field1"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v diff --git a/test/theproto3/combos/unsafemarshaler/theproto3.pb.go b/test/theproto3/combos/unsafemarshaler/theproto3.pb.go index 09e980a552..d6bb66dc6d 100644 --- a/test/theproto3/combos/unsafemarshaler/theproto3.pb.go +++ b/test/theproto3/combos/unsafemarshaler/theproto3.pb.go @@ -3476,6 +3476,10 @@ func Theproto3Description() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v + }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("gogoproto_import"), Number: func(v int32) *int32 { return &v }(63027), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + return &v + }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { + return &v }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("goproto_getters"), Number: func(v int32) *int32 { return &v }(64001), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { @@ -3580,7 +3584,7 @@ func Theproto3Description() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v - }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: nil, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("github.com/gogo/protobuf/test/combos/both/thetest.proto"), Package: func(v string) *string { return &v }("test"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("NidOptNative"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("Field1"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: map[int32]proto.Extension{}, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("github.com/gogo/protobuf/test/combos/both/thetest.proto"), Package: func(v string) *string { return &v }("test"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("NidOptNative"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("Field1"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v diff --git a/test/theproto3/combos/unsafeunmarshaler/theproto3.pb.go b/test/theproto3/combos/unsafeunmarshaler/theproto3.pb.go index fa8d781ce2..aafb57d10f 100644 --- a/test/theproto3/combos/unsafeunmarshaler/theproto3.pb.go +++ b/test/theproto3/combos/unsafeunmarshaler/theproto3.pb.go @@ -4923,6 +4923,10 @@ func Theproto3Description() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v + }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("gogoproto_import"), Number: func(v int32) *int32 { return &v }(63027), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + return &v + }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { + return &v }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("goproto_getters"), Number: func(v int32) *int32 { return &v }(64001), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { @@ -5027,7 +5031,7 @@ func Theproto3Description() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v - }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: nil, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("github.com/gogo/protobuf/test/combos/both/thetest.proto"), Package: func(v string) *string { return &v }("test"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("NidOptNative"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("Field1"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: map[int32]proto.Extension{}, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("github.com/gogo/protobuf/test/combos/both/thetest.proto"), Package: func(v string) *string { return &v }("test"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("NidOptNative"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("Field1"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v diff --git a/test/thetest.pb.go b/test/thetest.pb.go index 4662b5a221..06bb11e2ea 100644 --- a/test/thetest.pb.go +++ b/test/thetest.pb.go @@ -6125,7 +6125,13 @@ type randyThetest interface { } func randUTF8RuneThetest(r randyThetest) rune { - return rune(r.Intn(126-43) + 43) + ru := r.Intn(62) + if ru < 10 { + return rune(ru + 48) + } else if ru < 36 { + return rune(ru + 55) + } + return rune(ru + 61) } func randStringThetest(r randyThetest) string { v238 := r.Intn(100) @@ -17302,6 +17308,10 @@ func ThetestDescription() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v + }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("gogoproto_import"), Number: func(v int32) *int32 { return &v }(63027), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + return &v + }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { + return &v }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("goproto_getters"), Number: func(v int32) *int32 { return &v }(64001), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { @@ -17406,7 +17416,7 @@ func ThetestDescription() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v - }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: nil, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("thetest.proto"), Package: func(v string) *string { return &v }("test"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("NidOptNative"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("Field1"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: map[int32]proto.Extension{}, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("thetest.proto"), Package: func(v string) *string { return &v }("test"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("NidOptNative"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("Field1"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v diff --git a/test/thetestpb_test.go b/test/thetestpb_test.go index 6dd9249c28..c6a5d384dd 100644 --- a/test/thetestpb_test.go +++ b/test/thetestpb_test.go @@ -76,6 +76,14 @@ import github_com_gogo_protobuf_proto "github.com/gogo/protobuf/proto" import encoding_json "encoding/json" import fmt "fmt" import go_parser "go/parser" +import proto "github.com/gogo/protobuf/proto" +import math "math" + +// discarding unused import gogoproto "github.com/gogo/protobuf/gogoproto/gogo.pb" + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = math.Inf func TestNidOptNativeProto(t *testing.T) { popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) @@ -3864,12 +3872,15 @@ func TestNidOptNativeJSON(t *testing.T) { p := NewPopulatedNidOptNative(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &NidOptNative{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -3883,12 +3894,15 @@ func TestNinOptNativeJSON(t *testing.T) { p := NewPopulatedNinOptNative(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &NinOptNative{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -3902,12 +3916,15 @@ func TestNidRepNativeJSON(t *testing.T) { p := NewPopulatedNidRepNative(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &NidRepNative{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -3921,12 +3938,15 @@ func TestNinRepNativeJSON(t *testing.T) { p := NewPopulatedNinRepNative(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &NinRepNative{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -3940,12 +3960,15 @@ func TestNidRepPackedNativeJSON(t *testing.T) { p := NewPopulatedNidRepPackedNative(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &NidRepPackedNative{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -3959,12 +3982,15 @@ func TestNinRepPackedNativeJSON(t *testing.T) { p := NewPopulatedNinRepPackedNative(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &NinRepPackedNative{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -3978,12 +4004,15 @@ func TestNidOptStructJSON(t *testing.T) { p := NewPopulatedNidOptStruct(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &NidOptStruct{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -3997,12 +4026,15 @@ func TestNinOptStructJSON(t *testing.T) { p := NewPopulatedNinOptStruct(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &NinOptStruct{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4016,12 +4048,15 @@ func TestNidRepStructJSON(t *testing.T) { p := NewPopulatedNidRepStruct(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &NidRepStruct{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4035,12 +4070,15 @@ func TestNinRepStructJSON(t *testing.T) { p := NewPopulatedNinRepStruct(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &NinRepStruct{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4054,12 +4092,15 @@ func TestNidEmbeddedStructJSON(t *testing.T) { p := NewPopulatedNidEmbeddedStruct(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &NidEmbeddedStruct{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4073,12 +4114,15 @@ func TestNinEmbeddedStructJSON(t *testing.T) { p := NewPopulatedNinEmbeddedStruct(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &NinEmbeddedStruct{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4092,12 +4136,15 @@ func TestNidNestedStructJSON(t *testing.T) { p := NewPopulatedNidNestedStruct(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &NidNestedStruct{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4111,12 +4158,15 @@ func TestNinNestedStructJSON(t *testing.T) { p := NewPopulatedNinNestedStruct(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &NinNestedStruct{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4130,12 +4180,15 @@ func TestNidOptCustomJSON(t *testing.T) { p := NewPopulatedNidOptCustom(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &NidOptCustom{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4149,12 +4202,15 @@ func TestCustomDashJSON(t *testing.T) { p := NewPopulatedCustomDash(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &CustomDash{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4168,12 +4224,15 @@ func TestNinOptCustomJSON(t *testing.T) { p := NewPopulatedNinOptCustom(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &NinOptCustom{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4187,12 +4246,15 @@ func TestNidRepCustomJSON(t *testing.T) { p := NewPopulatedNidRepCustom(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &NidRepCustom{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4206,12 +4268,15 @@ func TestNinRepCustomJSON(t *testing.T) { p := NewPopulatedNinRepCustom(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &NinRepCustom{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4225,12 +4290,15 @@ func TestNinOptNativeUnionJSON(t *testing.T) { p := NewPopulatedNinOptNativeUnion(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &NinOptNativeUnion{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4244,12 +4312,15 @@ func TestNinOptStructUnionJSON(t *testing.T) { p := NewPopulatedNinOptStructUnion(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &NinOptStructUnion{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4263,12 +4334,15 @@ func TestNinEmbeddedStructUnionJSON(t *testing.T) { p := NewPopulatedNinEmbeddedStructUnion(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &NinEmbeddedStructUnion{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4282,12 +4356,15 @@ func TestNinNestedStructUnionJSON(t *testing.T) { p := NewPopulatedNinNestedStructUnion(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &NinNestedStructUnion{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4301,12 +4378,15 @@ func TestTreeJSON(t *testing.T) { p := NewPopulatedTree(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &Tree{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4320,12 +4400,15 @@ func TestOrBranchJSON(t *testing.T) { p := NewPopulatedOrBranch(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &OrBranch{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4339,12 +4422,15 @@ func TestAndBranchJSON(t *testing.T) { p := NewPopulatedAndBranch(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &AndBranch{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4358,12 +4444,15 @@ func TestLeafJSON(t *testing.T) { p := NewPopulatedLeaf(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &Leaf{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4377,12 +4466,15 @@ func TestDeepTreeJSON(t *testing.T) { p := NewPopulatedDeepTree(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &DeepTree{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4396,12 +4488,15 @@ func TestADeepBranchJSON(t *testing.T) { p := NewPopulatedADeepBranch(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &ADeepBranch{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4415,12 +4510,15 @@ func TestAndDeepBranchJSON(t *testing.T) { p := NewPopulatedAndDeepBranch(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &AndDeepBranch{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4434,12 +4532,15 @@ func TestDeepLeafJSON(t *testing.T) { p := NewPopulatedDeepLeaf(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &DeepLeaf{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4453,12 +4554,15 @@ func TestNilJSON(t *testing.T) { p := NewPopulatedNil(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &Nil{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4472,12 +4576,15 @@ func TestNidOptEnumJSON(t *testing.T) { p := NewPopulatedNidOptEnum(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &NidOptEnum{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4491,12 +4598,15 @@ func TestNinOptEnumJSON(t *testing.T) { p := NewPopulatedNinOptEnum(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &NinOptEnum{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4510,12 +4620,15 @@ func TestNidRepEnumJSON(t *testing.T) { p := NewPopulatedNidRepEnum(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &NidRepEnum{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4529,12 +4642,15 @@ func TestNinRepEnumJSON(t *testing.T) { p := NewPopulatedNinRepEnum(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &NinRepEnum{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4548,12 +4664,15 @@ func TestNinOptEnumDefaultJSON(t *testing.T) { p := NewPopulatedNinOptEnumDefault(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &NinOptEnumDefault{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4567,12 +4686,15 @@ func TestAnotherNinOptEnumJSON(t *testing.T) { p := NewPopulatedAnotherNinOptEnum(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &AnotherNinOptEnum{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4586,12 +4708,15 @@ func TestAnotherNinOptEnumDefaultJSON(t *testing.T) { p := NewPopulatedAnotherNinOptEnumDefault(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &AnotherNinOptEnumDefault{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4605,12 +4730,15 @@ func TestTimerJSON(t *testing.T) { p := NewPopulatedTimer(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &Timer{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4624,12 +4752,15 @@ func TestMyExtendableJSON(t *testing.T) { p := NewPopulatedMyExtendable(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &MyExtendable{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4643,12 +4774,15 @@ func TestOtherExtenableJSON(t *testing.T) { p := NewPopulatedOtherExtenable(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &OtherExtenable{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4662,12 +4796,15 @@ func TestNestedDefinitionJSON(t *testing.T) { p := NewPopulatedNestedDefinition(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &NestedDefinition{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4681,12 +4818,15 @@ func TestNestedDefinition_NestedMessageJSON(t *testing.T) { p := NewPopulatedNestedDefinition_NestedMessage(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &NestedDefinition_NestedMessage{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4700,12 +4840,15 @@ func TestNestedDefinition_NestedMessage_NestedNestedMsgJSON(t *testing.T) { p := NewPopulatedNestedDefinition_NestedMessage_NestedNestedMsg(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &NestedDefinition_NestedMessage_NestedNestedMsg{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4719,12 +4862,15 @@ func TestNestedScopeJSON(t *testing.T) { p := NewPopulatedNestedScope(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &NestedScope{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4738,12 +4884,15 @@ func TestNinOptNativeDefaultJSON(t *testing.T) { p := NewPopulatedNinOptNativeDefault(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &NinOptNativeDefault{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4757,12 +4906,15 @@ func TestCustomContainerJSON(t *testing.T) { p := NewPopulatedCustomContainer(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &CustomContainer{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4776,12 +4928,15 @@ func TestCustomNameNidOptNativeJSON(t *testing.T) { p := NewPopulatedCustomNameNidOptNative(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &CustomNameNidOptNative{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4795,12 +4950,15 @@ func TestCustomNameNinOptNativeJSON(t *testing.T) { p := NewPopulatedCustomNameNinOptNative(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &CustomNameNinOptNative{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4814,12 +4972,15 @@ func TestCustomNameNinRepNativeJSON(t *testing.T) { p := NewPopulatedCustomNameNinRepNative(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &CustomNameNinRepNative{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4833,12 +4994,15 @@ func TestCustomNameNinStructJSON(t *testing.T) { p := NewPopulatedCustomNameNinStruct(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &CustomNameNinStruct{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4852,12 +5016,15 @@ func TestCustomNameCustomTypeJSON(t *testing.T) { p := NewPopulatedCustomNameCustomType(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &CustomNameCustomType{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4871,12 +5038,15 @@ func TestCustomNameNinEmbeddedStructUnionJSON(t *testing.T) { p := NewPopulatedCustomNameNinEmbeddedStructUnion(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &CustomNameNinEmbeddedStructUnion{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4890,12 +5060,15 @@ func TestCustomNameEnumJSON(t *testing.T) { p := NewPopulatedCustomNameEnum(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &CustomNameEnum{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4909,12 +5082,15 @@ func TestNoExtensionsMapJSON(t *testing.T) { p := NewPopulatedNoExtensionsMap(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &NoExtensionsMap{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4928,12 +5104,15 @@ func TestUnrecognizedJSON(t *testing.T) { p := NewPopulatedUnrecognized(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &Unrecognized{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4947,12 +5126,15 @@ func TestUnrecognizedWithInnerJSON(t *testing.T) { p := NewPopulatedUnrecognizedWithInner(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &UnrecognizedWithInner{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4966,12 +5148,15 @@ func TestUnrecognizedWithInner_InnerJSON(t *testing.T) { p := NewPopulatedUnrecognizedWithInner_Inner(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &UnrecognizedWithInner_Inner{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -4985,12 +5170,15 @@ func TestUnrecognizedWithEmbedJSON(t *testing.T) { p := NewPopulatedUnrecognizedWithEmbed(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &UnrecognizedWithEmbed{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -5004,12 +5192,15 @@ func TestUnrecognizedWithEmbed_EmbeddedJSON(t *testing.T) { p := NewPopulatedUnrecognizedWithEmbed_Embedded(popr, true) jsondata, err := encoding_json.Marshal(p) if err != nil { - panic(err) + if _, ok := err.(*encoding_json.UnsupportedTypeError); ok { + t.Skip(err) + } + t.Fatal(err) } msg := &UnrecognizedWithEmbed_Embedded{} err = encoding_json.Unmarshal(jsondata, msg) if err != nil { - panic(err) + t.Fatal(err) } if err := p.VerboseEqual(msg); err != nil { t.Fatalf("%#v !VerboseProto %#v, since %v", msg, p, err) @@ -7613,14 +7804,14 @@ func TestNidOptNativeSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -7648,14 +7839,14 @@ func TestNinOptNativeSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -7683,14 +7874,14 @@ func TestNidRepNativeSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -7718,14 +7909,14 @@ func TestNinRepNativeSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -7753,14 +7944,14 @@ func TestNidRepPackedNativeSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -7788,14 +7979,14 @@ func TestNinRepPackedNativeSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -7823,14 +8014,14 @@ func TestNidOptStructSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -7858,14 +8049,14 @@ func TestNinOptStructSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -7893,14 +8084,14 @@ func TestNidRepStructSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -7928,14 +8119,14 @@ func TestNinRepStructSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -7963,14 +8154,14 @@ func TestNidEmbeddedStructSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -7998,14 +8189,14 @@ func TestNinEmbeddedStructSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -8033,14 +8224,14 @@ func TestNidNestedStructSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -8068,14 +8259,14 @@ func TestNinNestedStructSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -8103,14 +8294,14 @@ func TestNidOptCustomSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -8138,14 +8329,14 @@ func TestCustomDashSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -8173,14 +8364,14 @@ func TestNinOptCustomSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -8208,14 +8399,14 @@ func TestNidRepCustomSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -8243,14 +8434,14 @@ func TestNinRepCustomSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -8278,14 +8469,14 @@ func TestNinOptNativeUnionSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -8313,14 +8504,14 @@ func TestNinOptStructUnionSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -8348,14 +8539,14 @@ func TestNinEmbeddedStructUnionSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -8383,14 +8574,14 @@ func TestNinNestedStructUnionSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -8418,14 +8609,14 @@ func TestTreeSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -8453,14 +8644,14 @@ func TestOrBranchSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -8488,14 +8679,14 @@ func TestAndBranchSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -8523,14 +8714,14 @@ func TestLeafSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -8558,14 +8749,14 @@ func TestDeepTreeSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -8593,14 +8784,14 @@ func TestADeepBranchSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -8628,14 +8819,14 @@ func TestAndDeepBranchSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -8663,14 +8854,14 @@ func TestDeepLeafSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -8698,14 +8889,14 @@ func TestNilSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -8733,14 +8924,14 @@ func TestNidOptEnumSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -8768,14 +8959,14 @@ func TestNinOptEnumSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -8803,14 +8994,14 @@ func TestNidRepEnumSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -8838,14 +9029,14 @@ func TestNinRepEnumSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -8873,14 +9064,14 @@ func TestNinOptEnumDefaultSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -8908,14 +9099,14 @@ func TestAnotherNinOptEnumSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -8943,14 +9134,14 @@ func TestAnotherNinOptEnumDefaultSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -8978,14 +9169,14 @@ func TestTimerSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -9013,14 +9204,14 @@ func TestMyExtendableSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -9048,14 +9239,14 @@ func TestOtherExtenableSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -9083,14 +9274,14 @@ func TestNestedDefinitionSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -9118,14 +9309,14 @@ func TestNestedDefinition_NestedMessageSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -9153,14 +9344,14 @@ func TestNestedDefinition_NestedMessage_NestedNestedMsgSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -9188,14 +9379,14 @@ func TestNestedScopeSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -9223,14 +9414,14 @@ func TestNinOptNativeDefaultSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -9258,14 +9449,14 @@ func TestCustomContainerSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -9293,14 +9484,14 @@ func TestCustomNameNidOptNativeSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -9328,14 +9519,14 @@ func TestCustomNameNinOptNativeSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -9363,14 +9554,14 @@ func TestCustomNameNinRepNativeSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -9398,14 +9589,14 @@ func TestCustomNameNinStructSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -9433,14 +9624,14 @@ func TestCustomNameCustomTypeSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -9468,14 +9659,14 @@ func TestCustomNameNinEmbeddedStructUnionSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -9503,14 +9694,14 @@ func TestCustomNameEnumSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -9538,14 +9729,14 @@ func TestNoExtensionsMapSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -9573,14 +9764,14 @@ func TestUnrecognizedSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -9608,14 +9799,14 @@ func TestUnrecognizedWithInnerSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -9643,14 +9834,14 @@ func TestUnrecognizedWithInner_InnerSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -9678,14 +9869,14 @@ func TestUnrecognizedWithEmbedSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } @@ -9713,14 +9904,14 @@ func TestUnrecognizedWithEmbed_EmbeddedSize(t *testing.T) { } size := p.Size() if len(data) != size { - t.Fatalf("size %v != marshalled size %v", size, len(data)) + t.Errorf("size %v != marshalled size %v", size, len(data)) } if size2 != size { - t.Fatalf("size %v != before marshal proto.Size %v", size, size2) + t.Errorf("size %v != before marshal proto.Size %v", size, size2) } size3 := github_com_gogo_protobuf_proto.Size(p) if size3 != size { - t.Fatalf("size %v != after marshal proto.Size %v", size, size3) + t.Errorf("size %v != after marshal proto.Size %v", size, size3) } } diff --git a/test/unrecognized/unrecognized.pb.go b/test/unrecognized/unrecognized.pb.go index fa7b5787f6..50bb98b332 100644 --- a/test/unrecognized/unrecognized.pb.go +++ b/test/unrecognized/unrecognized.pb.go @@ -3777,6 +3777,10 @@ func UnrecognizedDescription() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v + }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("gogoproto_import"), Number: func(v int32) *int32 { return &v }(63027), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + return &v + }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { + return &v }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("goproto_getters"), Number: func(v int32) *int32 { return &v }(64001), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { @@ -3881,7 +3885,7 @@ func UnrecognizedDescription() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v - }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: nil, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("unrecognized.proto"), Package: func(v string) *string { return &v }("unrecognized"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("A"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("B"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: map[int32]proto.Extension{}, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("unrecognized.proto"), Package: func(v string) *string { return &v }("unrecognized"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("A"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("B"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(3), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v diff --git a/test/unrecognizedgroup/unrecognizedgroup.pb.go b/test/unrecognizedgroup/unrecognizedgroup.pb.go index cc1c217c2c..c84c22452b 100644 --- a/test/unrecognizedgroup/unrecognizedgroup.pb.go +++ b/test/unrecognizedgroup/unrecognizedgroup.pb.go @@ -1702,6 +1702,10 @@ func UnrecognizedgroupDescription() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v + }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("gogoproto_import"), Number: func(v int32) *int32 { return &v }(63027), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + return &v + }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { + return &v }(8), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FileOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("goproto_getters"), Number: func(v int32) *int32 { return &v }(64001), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { @@ -1806,7 +1810,7 @@ func UnrecognizedgroupDescription() (desc *google_protobuf.FileDescriptorSet) { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v - }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: nil, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("unrecognizedgroup.proto"), Package: func(v string) *string { return &v }("unrecognizedgroup"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("NewNoGroup"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("Field1"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { + }(9), TypeName: nil, Extendee: func(v string) *string { return &v }(".google.protobuf.FieldOptions"), DefaultValue: nil, OneofIndex: nil, Options: nil, XXX_unrecognized: []byte(nil)}}, Options: &google_protobuf.FileOptions{JavaPackage: func(v string) *string { return &v }("com.google.protobuf"), JavaOuterClassname: func(v string) *string { return &v }("GoGoProtos"), JavaMultipleFiles: nil, JavaGenerateEqualsAndHash: nil, JavaStringCheckUtf8: nil, OptimizeFor: nil, GoPackage: nil, CcGenericServices: nil, JavaGenericServices: nil, PyGenericServices: nil, Deprecated: nil, CcEnableArenas: nil, UninterpretedOption: []*google_protobuf.UninterpretedOption(nil), XXX_extensions: map[int32]proto.Extension{}, XXX_unrecognized: []byte(nil)}, SourceCodeInfo: nil, Syntax: nil, XXX_unrecognized: []byte(nil)}, {Name: func(v string) *string { return &v }("unrecognizedgroup.proto"), Package: func(v string) *string { return &v }("unrecognizedgroup"), Dependency: []string{"github.com/gogo/protobuf/gogoproto/gogo.proto"}, PublicDependency: []int32(nil), WeakDependency: []int32(nil), MessageType: []*google_protobuf.DescriptorProto{{Name: func(v string) *string { return &v }("NewNoGroup"), Field: []*google_protobuf.FieldDescriptorProto{{Name: func(v string) *string { return &v }("Field1"), Number: func(v int32) *int32 { return &v }(1), Label: func(v google_protobuf.FieldDescriptorProto_Label) *google_protobuf.FieldDescriptorProto_Label { return &v }(1), Type: func(v google_protobuf.FieldDescriptorProto_Type) *google_protobuf.FieldDescriptorProto_Type { return &v