diff --git a/cmd/protoc-gen-go-grpc/testdata/grpc/grpc.pb.go b/cmd/protoc-gen-go-grpc/testdata/grpc/grpc.pb.go index ca53790e..778b0eb7 100644 --- a/cmd/protoc-gen-go-grpc/testdata/grpc/grpc.pb.go +++ b/cmd/protoc-gen-go-grpc/testdata/grpc/grpc.pb.go @@ -14,9 +14,9 @@ import ( const _ = protoimpl.EnforceVersion(protoimpl.Version - 0) type Request struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Request) Reset() { @@ -43,9 +43,9 @@ func (*Request) Descriptor() ([]byte, []int) { } type Response struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Response) Reset() { diff --git a/cmd/protoc-gen-go/internal_gengo/main.go b/cmd/protoc-gen-go/internal_gengo/main.go index 77f5de30..6bcfebd3 100644 --- a/cmd/protoc-gen-go/internal_gengo/main.go +++ b/cmd/protoc-gen-go/internal_gengo/main.go @@ -371,10 +371,10 @@ func genMessage(gen *protogen.Plugin, g *protogen.GeneratedFile, f *fileInfo, me tags = append(tags, `protobuf_messageset:"1"`) } tags = append(tags, `json:"-"`) - g.P("XXX_InternalExtensions ", protoimplPackage.Ident("ExtensionFieldsV1"), " `", strings.Join(tags, " "), "`") + g.P("XXX_InternalExtensions ", protoimplPackage.Ident("ExtensionFields"), " `", strings.Join(tags, " "), "`") } - g.P("XXX_unrecognized []byte `json:\"-\"`") - g.P("XXX_sizecache int32 `json:\"-\"`") + g.P("XXX_unrecognized ", protoimplPackage.Ident("UnknownFields"), " `json:\"-\"`") + g.P("XXX_sizecache ", protoimplPackage.Ident("SizeCache"), " `json:\"-\"`") g.P("}") g.P() diff --git a/cmd/protoc-gen-go/testdata/annotations/annotations.pb.go b/cmd/protoc-gen-go/testdata/annotations/annotations.pb.go index 7a77394c..a2cd56fc 100644 --- a/cmd/protoc-gen-go/testdata/annotations/annotations.pb.go +++ b/cmd/protoc-gen-go/testdata/annotations/annotations.pb.go @@ -63,10 +63,10 @@ func (AnnotationsTestEnum) EnumDescriptor() ([]byte, []int) { } type AnnotationsTestMessage struct { - AnnotationsTestField *string `protobuf:"bytes,1,opt,name=AnnotationsTestField" json:"AnnotationsTestField,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + AnnotationsTestField *string `protobuf:"bytes,1,opt,name=AnnotationsTestField" json:"AnnotationsTestField,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *AnnotationsTestMessage) Reset() { diff --git a/cmd/protoc-gen-go/testdata/annotations/annotations.pb.go.meta b/cmd/protoc-gen-go/testdata/annotations/annotations.pb.go.meta index 9c184545..318cefc7 100644 --- a/cmd/protoc-gen-go/testdata/annotations/annotations.pb.go.meta +++ b/cmd/protoc-gen-go/testdata/annotations/annotations.pb.go.meta @@ -1 +1 @@ -annotation:{path:5 path:0 source_file:"annotations/annotations.proto" begin:461 end:480} annotation:{path:5 path:0 path:2 path:0 source_file:"annotations/annotations.proto" begin:497 end:544} annotation:{path:4 path:0 source_file:"annotations/annotations.proto" begin:1732 end:1754} annotation:{path:4 path:0 path:2 path:0 source_file:"annotations/annotations.proto" begin:1765 end:1785} annotation:{path:4 path:0 path:2 path:0 source_file:"annotations/annotations.proto" begin:2746 end:2769} \ No newline at end of file +annotation:{path:5 path:0 source_file:"annotations/annotations.proto" begin:461 end:480} annotation:{path:5 path:0 path:2 path:0 source_file:"annotations/annotations.proto" begin:497 end:544} annotation:{path:4 path:0 source_file:"annotations/annotations.proto" begin:1732 end:1754} annotation:{path:4 path:0 path:2 path:0 source_file:"annotations/annotations.proto" begin:1765 end:1785} annotation:{path:4 path:0 path:2 path:0 source_file:"annotations/annotations.proto" begin:2806 end:2829} \ No newline at end of file diff --git a/cmd/protoc-gen-go/testdata/comments/comments.pb.go b/cmd/protoc-gen-go/testdata/comments/comments.pb.go index 8ff9b29b..340d9e4a 100644 --- a/cmd/protoc-gen-go/testdata/comments/comments.pb.go +++ b/cmd/protoc-gen-go/testdata/comments/comments.pb.go @@ -24,10 +24,10 @@ type Message1 struct { // Types that are valid to be assigned to Oneof1A: // COMMENT: Oneof1AField1 // *Message1_Oneof1AField1 - Oneof1A isMessage1_Oneof1A `protobuf_oneof:"Oneof1a"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Oneof1A isMessage1_Oneof1A `protobuf_oneof:"Oneof1a"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Message1) Reset() { @@ -93,9 +93,9 @@ func (*Message1_Oneof1AField1) isMessage1_Oneof1A() {} // COMMENT: Message2 type Message2 struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Message2) Reset() { @@ -123,9 +123,9 @@ func (*Message2) Descriptor() ([]byte, []int) { // COMMENT: Message1A type Message1_Message1A struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Message1_Message1A) Reset() { @@ -153,9 +153,9 @@ func (*Message1_Message1A) Descriptor() ([]byte, []int) { // COMMENT: Message1B type Message1_Message1B struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Message1_Message1B) Reset() { @@ -183,9 +183,9 @@ func (*Message1_Message1B) Descriptor() ([]byte, []int) { // COMMENT: Message2A type Message2_Message2A struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Message2_Message2A) Reset() { @@ -213,9 +213,9 @@ func (*Message2_Message2A) Descriptor() ([]byte, []int) { // COMMENT: Message2B type Message2_Message2B struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Message2_Message2B) Reset() { diff --git a/cmd/protoc-gen-go/testdata/comments/deprecated.pb.go b/cmd/protoc-gen-go/testdata/comments/deprecated.pb.go index dac53da2..3f37f26a 100644 --- a/cmd/protoc-gen-go/testdata/comments/deprecated.pb.go +++ b/cmd/protoc-gen-go/testdata/comments/deprecated.pb.go @@ -47,10 +47,10 @@ func (DeprecatedEnum) EnumDescriptor() ([]byte, []int) { // Deprecated: Do not use. type DeprecatedMessage struct { - DeprecatedField string `protobuf:"bytes,1,opt,name=deprecated_field,json=deprecatedField,proto3" json:"deprecated_field,omitempty"` // Deprecated: Do not use. - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + DeprecatedField string `protobuf:"bytes,1,opt,name=deprecated_field,json=deprecatedField,proto3" json:"deprecated_field,omitempty"` // Deprecated: Do not use. + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *DeprecatedMessage) Reset() { diff --git a/cmd/protoc-gen-go/testdata/extensions/base/base.pb.go b/cmd/protoc-gen-go/testdata/extensions/base/base.pb.go index cfc0d702..1a2ebb4b 100644 --- a/cmd/protoc-gen-go/testdata/extensions/base/base.pb.go +++ b/cmd/protoc-gen-go/testdata/extensions/base/base.pb.go @@ -14,11 +14,11 @@ import ( const _ = protoimpl.EnforceVersion(protoimpl.Version - 0) type BaseMessage struct { - Field *string `protobuf:"bytes,1,opt,name=field" json:"field,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_InternalExtensions protoimpl.ExtensionFieldsV1 `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Field *string `protobuf:"bytes,1,opt,name=field" json:"field,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *BaseMessage) Reset() { @@ -62,10 +62,10 @@ func (x *BaseMessage) GetField() string { } type MessageSetWireFormatMessage struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_InternalExtensions protoimpl.ExtensionFieldsV1 `protobuf_messageset:"1" json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_InternalExtensions protoimpl.ExtensionFields `protobuf_messageset:"1" json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *MessageSetWireFormatMessage) Reset() { diff --git a/cmd/protoc-gen-go/testdata/extensions/ext/ext.pb.go b/cmd/protoc-gen-go/testdata/extensions/ext/ext.pb.go index e4740a47..d7588a34 100644 --- a/cmd/protoc-gen-go/testdata/extensions/ext/ext.pb.go +++ b/cmd/protoc-gen-go/testdata/extensions/ext/ext.pb.go @@ -65,10 +65,10 @@ func (Enum) EnumDescriptor() ([]byte, []int) { } type Message struct { - Data []byte `protobuf:"bytes,1,opt,name=data" json:"data,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Data []byte `protobuf:"bytes,1,opt,name=data" json:"data,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Message) Reset() { @@ -102,10 +102,10 @@ func (x *Message) GetData() []byte { } type ExtensionGroup struct { - ExtensionGroup *string `protobuf:"bytes,120,opt,name=extension_group,json=extensionGroup" json:"extension_group,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + ExtensionGroup *string `protobuf:"bytes,120,opt,name=extension_group,json=extensionGroup" json:"extension_group,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *ExtensionGroup) Reset() { @@ -140,9 +140,9 @@ func (x *ExtensionGroup) GetExtensionGroup() string { // Extend in the scope of another type. type ExtendingMessage struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *ExtendingMessage) Reset() { @@ -169,10 +169,10 @@ func (*ExtendingMessage) Descriptor() ([]byte, []int) { } type RepeatedGroup struct { - RepeatedXGroup []string `protobuf:"bytes,319,rep,name=repeated_x_group,json=repeatedXGroup" json:"repeated_x_group,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + RepeatedXGroup []string `protobuf:"bytes,319,rep,name=repeated_x_group,json=repeatedXGroup" json:"repeated_x_group,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *RepeatedGroup) Reset() { @@ -207,10 +207,10 @@ func (x *RepeatedGroup) GetRepeatedXGroup() []string { // An extension of an extension. type Extendable struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_InternalExtensions protoimpl.ExtensionFieldsV1 `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Extendable) Reset() { @@ -247,9 +247,9 @@ func (*Extendable) ExtensionRangeArray() []protoiface.ExtensionRangeV1 { // Message set wire format. type MessageSetWireFormatExtension struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *MessageSetWireFormatExtension) Reset() { @@ -276,9 +276,9 @@ func (*MessageSetWireFormatExtension) Descriptor() ([]byte, []int) { } type Message_M struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Message_M) Reset() { @@ -305,9 +305,9 @@ func (*Message_M) Descriptor() ([]byte, []int) { } type ExtendingMessage_ExtendingMessageSubmessage struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *ExtendingMessage_ExtendingMessageSubmessage) Reset() { diff --git a/cmd/protoc-gen-go/testdata/extensions/extra/extra.pb.go b/cmd/protoc-gen-go/testdata/extensions/extra/extra.pb.go index ad3b3778..e6615673 100644 --- a/cmd/protoc-gen-go/testdata/extensions/extra/extra.pb.go +++ b/cmd/protoc-gen-go/testdata/extensions/extra/extra.pb.go @@ -14,10 +14,10 @@ import ( const _ = protoimpl.EnforceVersion(protoimpl.Version - 0) type ExtraMessage struct { - Data []byte `protobuf:"bytes,1,opt,name=data" json:"data,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Data []byte `protobuf:"bytes,1,opt,name=data" json:"data,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *ExtraMessage) Reset() { diff --git a/cmd/protoc-gen-go/testdata/extensions/proto3/ext3.pb.go b/cmd/protoc-gen-go/testdata/extensions/proto3/ext3.pb.go index 47a791db..b5460d07 100644 --- a/cmd/protoc-gen-go/testdata/extensions/proto3/ext3.pb.go +++ b/cmd/protoc-gen-go/testdata/extensions/proto3/ext3.pb.go @@ -48,9 +48,9 @@ func (Enum) EnumDescriptor() ([]byte, []int) { } type Message struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Message) Reset() { diff --git a/cmd/protoc-gen-go/testdata/fieldnames/fieldnames.pb.go b/cmd/protoc-gen-go/testdata/fieldnames/fieldnames.pb.go index 21655674..580ae0e4 100644 --- a/cmd/protoc-gen-go/testdata/fieldnames/fieldnames.pb.go +++ b/cmd/protoc-gen-go/testdata/fieldnames/fieldnames.pb.go @@ -54,8 +54,8 @@ type Message struct { // *Message_OneofMessageConflict_ OneofConflictC isMessage_OneofConflictC `protobuf_oneof:"oneof_conflict_c"` XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Message) Reset() { @@ -275,9 +275,9 @@ type Message_OneofMessageConflict_ struct { func (*Message_OneofMessageConflict_) isMessage_OneofConflictC() {} type Message_OneofMessageConflict struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Message_OneofMessageConflict) Reset() { diff --git a/cmd/protoc-gen-go/testdata/import_public/a.pb.go b/cmd/protoc-gen-go/testdata/import_public/a.pb.go index cf638dff..b33e9f0a 100644 --- a/cmd/protoc-gen-go/testdata/import_public/a.pb.go +++ b/cmd/protoc-gen-go/testdata/import_public/a.pb.go @@ -58,12 +58,12 @@ var E_ExtensionField = sub.E_ExtensionField type Sub2Message = sub2.Sub2Message type Public struct { - M *sub.M `protobuf:"bytes,1,opt,name=m" json:"m,omitempty"` - E *sub.E `protobuf:"varint,2,opt,name=e,enum=goproto.protoc.import_public.sub.E" json:"e,omitempty"` - Local *Local `protobuf:"bytes,3,opt,name=local" json:"local,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + M *sub.M `protobuf:"bytes,1,opt,name=m" json:"m,omitempty"` + E *sub.E `protobuf:"varint,2,opt,name=e,enum=goproto.protoc.import_public.sub.E" json:"e,omitempty"` + Local *Local `protobuf:"bytes,3,opt,name=local" json:"local,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Public) Reset() { diff --git a/cmd/protoc-gen-go/testdata/import_public/b.pb.go b/cmd/protoc-gen-go/testdata/import_public/b.pb.go index 18e9f922..2f966eee 100644 --- a/cmd/protoc-gen-go/testdata/import_public/b.pb.go +++ b/cmd/protoc-gen-go/testdata/import_public/b.pb.go @@ -15,11 +15,11 @@ import ( const _ = protoimpl.EnforceVersion(protoimpl.Version - 0) type Local struct { - M *sub.M `protobuf:"bytes,1,opt,name=m" json:"m,omitempty"` - E *sub.E `protobuf:"varint,2,opt,name=e,enum=goproto.protoc.import_public.sub.E" json:"e,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + M *sub.M `protobuf:"bytes,1,opt,name=m" json:"m,omitempty"` + E *sub.E `protobuf:"varint,2,opt,name=e,enum=goproto.protoc.import_public.sub.E" json:"e,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Local) Reset() { diff --git a/cmd/protoc-gen-go/testdata/import_public/sub/a.pb.go b/cmd/protoc-gen-go/testdata/import_public/sub/a.pb.go index 64b3e594..6c6c93a9 100644 --- a/cmd/protoc-gen-go/testdata/import_public/sub/a.pb.go +++ b/cmd/protoc-gen-go/testdata/import_public/sub/a.pb.go @@ -175,11 +175,11 @@ type M struct { // Types that are valid to be assigned to OneofField: // *M_OneofInt32 // *M_OneofInt64 - OneofField isM_OneofField `protobuf_oneof:"oneof_field"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_InternalExtensions protoimpl.ExtensionFieldsV1 `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + OneofField isM_OneofField `protobuf_oneof:"oneof_field"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *M) Reset() { @@ -298,8 +298,8 @@ type M_Submessage struct { // *M_Submessage_SubmessageOneofInt64 SubmessageOneofField isM_Submessage_SubmessageOneofField `protobuf_oneof:"submessage_oneof_field"` XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *M_Submessage) Reset() { diff --git a/cmd/protoc-gen-go/testdata/import_public/sub/b.pb.go b/cmd/protoc-gen-go/testdata/import_public/sub/b.pb.go index 05ae47ea..93c39669 100644 --- a/cmd/protoc-gen-go/testdata/import_public/sub/b.pb.go +++ b/cmd/protoc-gen-go/testdata/import_public/sub/b.pb.go @@ -14,9 +14,9 @@ import ( const _ = protoimpl.EnforceVersion(protoimpl.Version - 0) type M2 struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *M2) Reset() { diff --git a/cmd/protoc-gen-go/testdata/import_public/sub2/a.pb.go b/cmd/protoc-gen-go/testdata/import_public/sub2/a.pb.go index 63a70231..bf58d13f 100644 --- a/cmd/protoc-gen-go/testdata/import_public/sub2/a.pb.go +++ b/cmd/protoc-gen-go/testdata/import_public/sub2/a.pb.go @@ -14,9 +14,9 @@ import ( const _ = protoimpl.EnforceVersion(protoimpl.Version - 0) type Sub2Message struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Sub2Message) Reset() { diff --git a/cmd/protoc-gen-go/testdata/imports/fmt/m.pb.go b/cmd/protoc-gen-go/testdata/imports/fmt/m.pb.go index 68966e29..5821f22e 100644 --- a/cmd/protoc-gen-go/testdata/imports/fmt/m.pb.go +++ b/cmd/protoc-gen-go/testdata/imports/fmt/m.pb.go @@ -14,9 +14,9 @@ import ( const _ = protoimpl.EnforceVersion(protoimpl.Version - 0) type M struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *M) Reset() { diff --git a/cmd/protoc-gen-go/testdata/imports/test_a_1/m1.pb.go b/cmd/protoc-gen-go/testdata/imports/test_a_1/m1.pb.go index 29e87c0e..d4023d7f 100644 --- a/cmd/protoc-gen-go/testdata/imports/test_a_1/m1.pb.go +++ b/cmd/protoc-gen-go/testdata/imports/test_a_1/m1.pb.go @@ -47,9 +47,9 @@ func (E1) EnumDescriptor() ([]byte, []int) { } type M1 struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *M1) Reset() { @@ -76,10 +76,10 @@ func (*M1) Descriptor() ([]byte, []int) { } type M1_1 struct { - M1 *M1 `protobuf:"bytes,1,opt,name=m1,proto3" json:"m1,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + M1 *M1 `protobuf:"bytes,1,opt,name=m1,proto3" json:"m1,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *M1_1) Reset() { diff --git a/cmd/protoc-gen-go/testdata/imports/test_a_1/m2.pb.go b/cmd/protoc-gen-go/testdata/imports/test_a_1/m2.pb.go index 9b6e8765..f9b829fe 100644 --- a/cmd/protoc-gen-go/testdata/imports/test_a_1/m2.pb.go +++ b/cmd/protoc-gen-go/testdata/imports/test_a_1/m2.pb.go @@ -14,9 +14,9 @@ import ( const _ = protoimpl.EnforceVersion(protoimpl.Version - 0) type M2 struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *M2) Reset() { diff --git a/cmd/protoc-gen-go/testdata/imports/test_a_2/m3.pb.go b/cmd/protoc-gen-go/testdata/imports/test_a_2/m3.pb.go index 9b914b25..24adcf82 100644 --- a/cmd/protoc-gen-go/testdata/imports/test_a_2/m3.pb.go +++ b/cmd/protoc-gen-go/testdata/imports/test_a_2/m3.pb.go @@ -14,9 +14,9 @@ import ( const _ = protoimpl.EnforceVersion(protoimpl.Version - 0) type M3 struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *M3) Reset() { diff --git a/cmd/protoc-gen-go/testdata/imports/test_a_2/m4.pb.go b/cmd/protoc-gen-go/testdata/imports/test_a_2/m4.pb.go index ff9b36ce..9a12200c 100644 --- a/cmd/protoc-gen-go/testdata/imports/test_a_2/m4.pb.go +++ b/cmd/protoc-gen-go/testdata/imports/test_a_2/m4.pb.go @@ -14,9 +14,9 @@ import ( const _ = protoimpl.EnforceVersion(protoimpl.Version - 0) type M4 struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *M4) Reset() { diff --git a/cmd/protoc-gen-go/testdata/imports/test_b_1/m1.pb.go b/cmd/protoc-gen-go/testdata/imports/test_b_1/m1.pb.go index 8b4fc404..1a3bbbe5 100644 --- a/cmd/protoc-gen-go/testdata/imports/test_b_1/m1.pb.go +++ b/cmd/protoc-gen-go/testdata/imports/test_b_1/m1.pb.go @@ -14,9 +14,9 @@ import ( const _ = protoimpl.EnforceVersion(protoimpl.Version - 0) type M1 struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *M1) Reset() { diff --git a/cmd/protoc-gen-go/testdata/imports/test_b_1/m2.pb.go b/cmd/protoc-gen-go/testdata/imports/test_b_1/m2.pb.go index 0e8e245a..d72785ec 100644 --- a/cmd/protoc-gen-go/testdata/imports/test_b_1/m2.pb.go +++ b/cmd/protoc-gen-go/testdata/imports/test_b_1/m2.pb.go @@ -14,9 +14,9 @@ import ( const _ = protoimpl.EnforceVersion(protoimpl.Version - 0) type M2 struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *M2) Reset() { diff --git a/cmd/protoc-gen-go/testdata/imports/test_import_a1m1.pb.go b/cmd/protoc-gen-go/testdata/imports/test_import_a1m1.pb.go index 8297ccc6..a2704df9 100644 --- a/cmd/protoc-gen-go/testdata/imports/test_import_a1m1.pb.go +++ b/cmd/protoc-gen-go/testdata/imports/test_import_a1m1.pb.go @@ -15,10 +15,10 @@ import ( const _ = protoimpl.EnforceVersion(protoimpl.Version - 0) type A1M1 struct { - F *test_a_1.M1 `protobuf:"bytes,1,opt,name=f,proto3" json:"f,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + F *test_a_1.M1 `protobuf:"bytes,1,opt,name=f,proto3" json:"f,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *A1M1) Reset() { diff --git a/cmd/protoc-gen-go/testdata/imports/test_import_a1m2.pb.go b/cmd/protoc-gen-go/testdata/imports/test_import_a1m2.pb.go index 4ac07331..c337a1b8 100644 --- a/cmd/protoc-gen-go/testdata/imports/test_import_a1m2.pb.go +++ b/cmd/protoc-gen-go/testdata/imports/test_import_a1m2.pb.go @@ -15,10 +15,10 @@ import ( const _ = protoimpl.EnforceVersion(protoimpl.Version - 0) type A1M2 struct { - F *test_a_1.M2 `protobuf:"bytes,1,opt,name=f,proto3" json:"f,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + F *test_a_1.M2 `protobuf:"bytes,1,opt,name=f,proto3" json:"f,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *A1M2) Reset() { diff --git a/cmd/protoc-gen-go/testdata/imports/test_import_all.pb.go b/cmd/protoc-gen-go/testdata/imports/test_import_all.pb.go index 89d4569f..90fed579 100644 --- a/cmd/protoc-gen-go/testdata/imports/test_import_all.pb.go +++ b/cmd/protoc-gen-go/testdata/imports/test_import_all.pb.go @@ -18,14 +18,14 @@ import ( const _ = protoimpl.EnforceVersion(protoimpl.Version - 0) type All struct { - Am1 *test_a_1.M1 `protobuf:"bytes,1,opt,name=am1,proto3" json:"am1,omitempty"` - Am2 *test_a_1.M2 `protobuf:"bytes,2,opt,name=am2,proto3" json:"am2,omitempty"` - Bm1 *test_b_1.M1 `protobuf:"bytes,5,opt,name=bm1,proto3" json:"bm1,omitempty"` - Bm2 *test_b_1.M2 `protobuf:"bytes,6,opt,name=bm2,proto3" json:"bm2,omitempty"` - Fmt *fmt.M `protobuf:"bytes,7,opt,name=fmt,proto3" json:"fmt,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Am1 *test_a_1.M1 `protobuf:"bytes,1,opt,name=am1,proto3" json:"am1,omitempty"` + Am2 *test_a_1.M2 `protobuf:"bytes,2,opt,name=am2,proto3" json:"am2,omitempty"` + Bm1 *test_b_1.M1 `protobuf:"bytes,5,opt,name=bm1,proto3" json:"bm1,omitempty"` + Bm2 *test_b_1.M2 `protobuf:"bytes,6,opt,name=bm2,proto3" json:"bm2,omitempty"` + Fmt *fmt.M `protobuf:"bytes,7,opt,name=fmt,proto3" json:"fmt,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *All) Reset() { diff --git a/cmd/protoc-gen-go/testdata/issue780_oneof_conflict/test.pb.go b/cmd/protoc-gen-go/testdata/issue780_oneof_conflict/test.pb.go index 514b1c87..b87e4d49 100644 --- a/cmd/protoc-gen-go/testdata/issue780_oneof_conflict/test.pb.go +++ b/cmd/protoc-gen-go/testdata/issue780_oneof_conflict/test.pb.go @@ -16,10 +16,10 @@ const _ = protoimpl.EnforceVersion(protoimpl.Version - 0) type Foo struct { // Types that are valid to be assigned to Bar: // *Foo_GetBar - Bar isFoo_Bar `protobuf_oneof:"bar"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Bar isFoo_Bar `protobuf_oneof:"bar"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Foo) Reset() { diff --git a/cmd/protoc-gen-go/testdata/nopackage/nopackage.pb.go b/cmd/protoc-gen-go/testdata/nopackage/nopackage.pb.go index 5398c1f3..b56eec11 100644 --- a/cmd/protoc-gen-go/testdata/nopackage/nopackage.pb.go +++ b/cmd/protoc-gen-go/testdata/nopackage/nopackage.pb.go @@ -63,11 +63,11 @@ func (Enum) EnumDescriptor() ([]byte, []int) { } type Message struct { - StringField *string `protobuf:"bytes,1,opt,name=string_field,json=stringField" json:"string_field,omitempty"` - EnumField *Enum `protobuf:"varint,2,opt,name=enum_field,json=enumField,enum=Enum,def=0" json:"enum_field,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + StringField *string `protobuf:"bytes,1,opt,name=string_field,json=stringField" json:"string_field,omitempty"` + EnumField *Enum `protobuf:"varint,2,opt,name=enum_field,json=enumField,enum=Enum,def=0" json:"enum_field,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Message) Reset() { diff --git a/cmd/protoc-gen-go/testdata/proto2/enum.pb.go b/cmd/protoc-gen-go/testdata/proto2/enum.pb.go index 071d96a1..d73fa9ed 100644 --- a/cmd/protoc-gen-go/testdata/proto2/enum.pb.go +++ b/cmd/protoc-gen-go/testdata/proto2/enum.pb.go @@ -321,11 +321,11 @@ func (EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2B) EnumDescript } type EnumContainerMessage1 struct { - DefaultDuplicate1 *EnumType2 `protobuf:"varint,1,opt,name=default_duplicate1,json=defaultDuplicate1,enum=goproto.protoc.proto2.EnumType2,def=1" json:"default_duplicate1,omitempty"` - DefaultDuplicate2 *EnumType2 `protobuf:"varint,2,opt,name=default_duplicate2,json=defaultDuplicate2,enum=goproto.protoc.proto2.EnumType2,def=1" json:"default_duplicate2,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + DefaultDuplicate1 *EnumType2 `protobuf:"varint,1,opt,name=default_duplicate1,json=defaultDuplicate1,enum=goproto.protoc.proto2.EnumType2,def=1" json:"default_duplicate1,omitempty"` + DefaultDuplicate2 *EnumType2 `protobuf:"varint,2,opt,name=default_duplicate2,json=defaultDuplicate2,enum=goproto.protoc.proto2.EnumType2,def=1" json:"default_duplicate2,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *EnumContainerMessage1) Reset() { @@ -369,9 +369,9 @@ func (x *EnumContainerMessage1) GetDefaultDuplicate2() EnumType2 { } type EnumContainerMessage1_EnumContainerMessage2 struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *EnumContainerMessage1_EnumContainerMessage2) Reset() { diff --git a/cmd/protoc-gen-go/testdata/proto2/fields.pb.go b/cmd/protoc-gen-go/testdata/proto2/fields.pb.go index eb2a01a4..139fa807 100644 --- a/cmd/protoc-gen-go/testdata/proto2/fields.pb.go +++ b/cmd/protoc-gen-go/testdata/proto2/fields.pb.go @@ -174,8 +174,8 @@ type FieldTestMessage struct { // *FieldTestMessage_OneofTwo_2 OneofTwo isFieldTestMessage_OneofTwo `protobuf_oneof:"oneof_two"` XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *FieldTestMessage) Reset() { @@ -1119,10 +1119,10 @@ func (*FieldTestMessage_OneofTwo_1) isFieldTestMessage_OneofTwo() {} func (*FieldTestMessage_OneofTwo_2) isFieldTestMessage_OneofTwo() {} type FieldTestMessage_OptionalGroup struct { - OptionalGroup *string `protobuf:"bytes,19,opt,name=optional_group,json=optionalGroup" json:"optional_group,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + OptionalGroup *string `protobuf:"bytes,19,opt,name=optional_group,json=optionalGroup" json:"optional_group,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *FieldTestMessage_OptionalGroup) Reset() { @@ -1156,10 +1156,10 @@ func (x *FieldTestMessage_OptionalGroup) GetOptionalGroup() string { } type FieldTestMessage_RequiredGroup struct { - RequiredGroup *string `protobuf:"bytes,119,req,name=required_group,json=requiredGroup" json:"required_group,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + RequiredGroup *string `protobuf:"bytes,119,req,name=required_group,json=requiredGroup" json:"required_group,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *FieldTestMessage_RequiredGroup) Reset() { @@ -1193,10 +1193,10 @@ func (x *FieldTestMessage_RequiredGroup) GetRequiredGroup() string { } type FieldTestMessage_RepeatedGroup struct { - RepeatedGroup []string `protobuf:"bytes,219,rep,name=repeated_group,json=repeatedGroup" json:"repeated_group,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + RepeatedGroup []string `protobuf:"bytes,219,rep,name=repeated_group,json=repeatedGroup" json:"repeated_group,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *FieldTestMessage_RepeatedGroup) Reset() { @@ -1230,10 +1230,10 @@ func (x *FieldTestMessage_RepeatedGroup) GetRepeatedGroup() []string { } type FieldTestMessage_OneofGroup struct { - OneofGroupField *string `protobuf:"bytes,619,opt,name=oneof_group_field,json=oneofGroupField" json:"oneof_group_field,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + OneofGroupField *string `protobuf:"bytes,619,opt,name=oneof_group_field,json=oneofGroupField" json:"oneof_group_field,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *FieldTestMessage_OneofGroup) Reset() { @@ -1267,9 +1267,9 @@ func (x *FieldTestMessage_OneofGroup) GetOneofGroupField() string { } type FieldTestMessage_Message struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *FieldTestMessage_Message) Reset() { diff --git a/cmd/protoc-gen-go/testdata/proto2/nested_messages.pb.go b/cmd/protoc-gen-go/testdata/proto2/nested_messages.pb.go index 49cc2347..12446647 100644 --- a/cmd/protoc-gen-go/testdata/proto2/nested_messages.pb.go +++ b/cmd/protoc-gen-go/testdata/proto2/nested_messages.pb.go @@ -14,11 +14,11 @@ import ( const _ = protoimpl.EnforceVersion(protoimpl.Version - 0) type Layer1 struct { - L2 *Layer1_Layer2 `protobuf:"bytes,1,opt,name=l2" json:"l2,omitempty"` - L3 *Layer1_Layer2_Layer3 `protobuf:"bytes,2,opt,name=l3" json:"l3,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + L2 *Layer1_Layer2 `protobuf:"bytes,1,opt,name=l2" json:"l2,omitempty"` + L3 *Layer1_Layer2_Layer3 `protobuf:"bytes,2,opt,name=l3" json:"l3,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Layer1) Reset() { @@ -59,10 +59,10 @@ func (x *Layer1) GetL3() *Layer1_Layer2_Layer3 { } type Layer1_Layer2 struct { - L3 *Layer1_Layer2_Layer3 `protobuf:"bytes,1,opt,name=l3" json:"l3,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + L3 *Layer1_Layer2_Layer3 `protobuf:"bytes,1,opt,name=l3" json:"l3,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Layer1_Layer2) Reset() { @@ -96,9 +96,9 @@ func (x *Layer1_Layer2) GetL3() *Layer1_Layer2_Layer3 { } type Layer1_Layer2_Layer3 struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Layer1_Layer2_Layer3) Reset() { diff --git a/cmd/protoc-gen-go/testdata/proto2/proto2.pb.go b/cmd/protoc-gen-go/testdata/proto2/proto2.pb.go index 7001b597..40670b2c 100644 --- a/cmd/protoc-gen-go/testdata/proto2/proto2.pb.go +++ b/cmd/protoc-gen-go/testdata/proto2/proto2.pb.go @@ -14,11 +14,11 @@ import ( const _ = protoimpl.EnforceVersion(protoimpl.Version - 0) type Message struct { - I32 *int32 `protobuf:"varint,1,opt,name=i32" json:"i32,omitempty"` - M *Message `protobuf:"bytes,2,opt,name=m" json:"m,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + I32 *int32 `protobuf:"varint,1,opt,name=i32" json:"i32,omitempty"` + M *Message `protobuf:"bytes,2,opt,name=m" json:"m,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Message) Reset() { diff --git a/cmd/protoc-gen-go/testdata/proto3/fields.pb.go b/cmd/protoc-gen-go/testdata/proto3/fields.pb.go index f62795eb..321bca3d 100644 --- a/cmd/protoc-gen-go/testdata/proto3/fields.pb.go +++ b/cmd/protoc-gen-go/testdata/proto3/fields.pb.go @@ -85,8 +85,8 @@ type FieldTestMessage struct { MapStringMessage map[string]*FieldTestMessage_Message `protobuf:"bytes,501,rep,name=map_string_message,json=mapStringMessage,proto3" json:"map_string_message,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` MapFixed64Enum map[uint64]FieldTestMessage_Enum `protobuf:"bytes,502,rep,name=map_fixed64_enum,json=mapFixed64Enum,proto3" json:"map_fixed64_enum,omitempty" protobuf_key:"fixed64,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3,enum=goproto.protoc.proto3.FieldTestMessage_Enum"` XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *FieldTestMessage) Reset() { @@ -372,9 +372,9 @@ func (x *FieldTestMessage) GetMapFixed64Enum() map[uint64]FieldTestMessage_Enum } type FieldTestMessage_Message struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *FieldTestMessage_Message) Reset() { diff --git a/encoding/testprotos/pb2/test.pb.go b/encoding/testprotos/pb2/test.pb.go index eda68665..f5b9f40f 100644 --- a/encoding/testprotos/pb2/test.pb.go +++ b/encoding/testprotos/pb2/test.pb.go @@ -126,24 +126,24 @@ func (Enums_NestedEnum) EnumDescriptor() ([]byte, []int) { // Scalars contains optional scalar fields. type Scalars struct { - OptBool *bool `protobuf:"varint,1,opt,name=opt_bool,json=optBool" json:"opt_bool,omitempty"` - OptInt32 *int32 `protobuf:"varint,2,opt,name=opt_int32,json=optInt32" json:"opt_int32,omitempty"` - OptInt64 *int64 `protobuf:"varint,3,opt,name=opt_int64,json=optInt64" json:"opt_int64,omitempty"` - OptUint32 *uint32 `protobuf:"varint,4,opt,name=opt_uint32,json=optUint32" json:"opt_uint32,omitempty"` - OptUint64 *uint64 `protobuf:"varint,5,opt,name=opt_uint64,json=optUint64" json:"opt_uint64,omitempty"` - OptSint32 *int32 `protobuf:"zigzag32,6,opt,name=opt_sint32,json=optSint32" json:"opt_sint32,omitempty"` - OptSint64 *int64 `protobuf:"zigzag64,7,opt,name=opt_sint64,json=optSint64" json:"opt_sint64,omitempty"` - OptFixed32 *uint32 `protobuf:"fixed32,8,opt,name=opt_fixed32,json=optFixed32" json:"opt_fixed32,omitempty"` - OptFixed64 *uint64 `protobuf:"fixed64,9,opt,name=opt_fixed64,json=optFixed64" json:"opt_fixed64,omitempty"` - OptSfixed32 *int32 `protobuf:"fixed32,10,opt,name=opt_sfixed32,json=optSfixed32" json:"opt_sfixed32,omitempty"` - OptSfixed64 *int64 `protobuf:"fixed64,11,opt,name=opt_sfixed64,json=optSfixed64" json:"opt_sfixed64,omitempty"` - OptFloat *float32 `protobuf:"fixed32,20,opt,name=opt_float,json=optFloat" json:"opt_float,omitempty"` - OptDouble *float64 `protobuf:"fixed64,21,opt,name=opt_double,json=optDouble" json:"opt_double,omitempty"` - OptBytes []byte `protobuf:"bytes,14,opt,name=opt_bytes,json=optBytes" json:"opt_bytes,omitempty"` - OptString *string `protobuf:"bytes,13,opt,name=opt_string,json=optString" json:"opt_string,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + OptBool *bool `protobuf:"varint,1,opt,name=opt_bool,json=optBool" json:"opt_bool,omitempty"` + OptInt32 *int32 `protobuf:"varint,2,opt,name=opt_int32,json=optInt32" json:"opt_int32,omitempty"` + OptInt64 *int64 `protobuf:"varint,3,opt,name=opt_int64,json=optInt64" json:"opt_int64,omitempty"` + OptUint32 *uint32 `protobuf:"varint,4,opt,name=opt_uint32,json=optUint32" json:"opt_uint32,omitempty"` + OptUint64 *uint64 `protobuf:"varint,5,opt,name=opt_uint64,json=optUint64" json:"opt_uint64,omitempty"` + OptSint32 *int32 `protobuf:"zigzag32,6,opt,name=opt_sint32,json=optSint32" json:"opt_sint32,omitempty"` + OptSint64 *int64 `protobuf:"zigzag64,7,opt,name=opt_sint64,json=optSint64" json:"opt_sint64,omitempty"` + OptFixed32 *uint32 `protobuf:"fixed32,8,opt,name=opt_fixed32,json=optFixed32" json:"opt_fixed32,omitempty"` + OptFixed64 *uint64 `protobuf:"fixed64,9,opt,name=opt_fixed64,json=optFixed64" json:"opt_fixed64,omitempty"` + OptSfixed32 *int32 `protobuf:"fixed32,10,opt,name=opt_sfixed32,json=optSfixed32" json:"opt_sfixed32,omitempty"` + OptSfixed64 *int64 `protobuf:"fixed64,11,opt,name=opt_sfixed64,json=optSfixed64" json:"opt_sfixed64,omitempty"` + OptFloat *float32 `protobuf:"fixed32,20,opt,name=opt_float,json=optFloat" json:"opt_float,omitempty"` + OptDouble *float64 `protobuf:"fixed64,21,opt,name=opt_double,json=optDouble" json:"opt_double,omitempty"` + OptBytes []byte `protobuf:"bytes,14,opt,name=opt_bytes,json=optBytes" json:"opt_bytes,omitempty"` + OptString *string `protobuf:"bytes,13,opt,name=opt_string,json=optString" json:"opt_string,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Scalars) Reset() { @@ -276,13 +276,13 @@ func (x *Scalars) GetOptString() string { // Message contains enum fields. type Enums struct { - OptEnum *Enum `protobuf:"varint,1,opt,name=opt_enum,json=optEnum,enum=pb2.Enum" json:"opt_enum,omitempty"` - RptEnum []Enum `protobuf:"varint,2,rep,name=rpt_enum,json=rptEnum,enum=pb2.Enum" json:"rpt_enum,omitempty"` - OptNestedEnum *Enums_NestedEnum `protobuf:"varint,3,opt,name=opt_nested_enum,json=optNestedEnum,enum=pb2.Enums_NestedEnum" json:"opt_nested_enum,omitempty"` - RptNestedEnum []Enums_NestedEnum `protobuf:"varint,4,rep,name=rpt_nested_enum,json=rptNestedEnum,enum=pb2.Enums_NestedEnum" json:"rpt_nested_enum,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + OptEnum *Enum `protobuf:"varint,1,opt,name=opt_enum,json=optEnum,enum=pb2.Enum" json:"opt_enum,omitempty"` + RptEnum []Enum `protobuf:"varint,2,rep,name=rpt_enum,json=rptEnum,enum=pb2.Enum" json:"rpt_enum,omitempty"` + OptNestedEnum *Enums_NestedEnum `protobuf:"varint,3,opt,name=opt_nested_enum,json=optNestedEnum,enum=pb2.Enums_NestedEnum" json:"opt_nested_enum,omitempty"` + RptNestedEnum []Enums_NestedEnum `protobuf:"varint,4,rep,name=rpt_nested_enum,json=rptNestedEnum,enum=pb2.Enums_NestedEnum" json:"rpt_nested_enum,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Enums) Reset() { @@ -338,18 +338,18 @@ func (x *Enums) GetRptNestedEnum() []Enums_NestedEnum { // Message contains repeated fields. type Repeats struct { - RptBool []bool `protobuf:"varint,1,rep,name=rpt_bool,json=rptBool" json:"rpt_bool,omitempty"` - RptInt32 []int32 `protobuf:"varint,2,rep,name=rpt_int32,json=rptInt32" json:"rpt_int32,omitempty"` - RptInt64 []int64 `protobuf:"varint,3,rep,name=rpt_int64,json=rptInt64" json:"rpt_int64,omitempty"` - RptUint32 []uint32 `protobuf:"varint,4,rep,name=rpt_uint32,json=rptUint32" json:"rpt_uint32,omitempty"` - RptUint64 []uint64 `protobuf:"varint,5,rep,name=rpt_uint64,json=rptUint64" json:"rpt_uint64,omitempty"` - RptFloat []float32 `protobuf:"fixed32,6,rep,name=rpt_float,json=rptFloat" json:"rpt_float,omitempty"` - RptDouble []float64 `protobuf:"fixed64,7,rep,name=rpt_double,json=rptDouble" json:"rpt_double,omitempty"` - RptString []string `protobuf:"bytes,8,rep,name=rpt_string,json=rptString" json:"rpt_string,omitempty"` - RptBytes [][]byte `protobuf:"bytes,9,rep,name=rpt_bytes,json=rptBytes" json:"rpt_bytes,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + RptBool []bool `protobuf:"varint,1,rep,name=rpt_bool,json=rptBool" json:"rpt_bool,omitempty"` + RptInt32 []int32 `protobuf:"varint,2,rep,name=rpt_int32,json=rptInt32" json:"rpt_int32,omitempty"` + RptInt64 []int64 `protobuf:"varint,3,rep,name=rpt_int64,json=rptInt64" json:"rpt_int64,omitempty"` + RptUint32 []uint32 `protobuf:"varint,4,rep,name=rpt_uint32,json=rptUint32" json:"rpt_uint32,omitempty"` + RptUint64 []uint64 `protobuf:"varint,5,rep,name=rpt_uint64,json=rptUint64" json:"rpt_uint64,omitempty"` + RptFloat []float32 `protobuf:"fixed32,6,rep,name=rpt_float,json=rptFloat" json:"rpt_float,omitempty"` + RptDouble []float64 `protobuf:"fixed64,7,rep,name=rpt_double,json=rptDouble" json:"rpt_double,omitempty"` + RptString []string `protobuf:"bytes,8,rep,name=rpt_string,json=rptString" json:"rpt_string,omitempty"` + RptBytes [][]byte `protobuf:"bytes,9,rep,name=rpt_bytes,json=rptBytes" json:"rpt_bytes,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Repeats) Reset() { @@ -440,11 +440,11 @@ func (x *Repeats) GetRptBytes() [][]byte { // Message type used as submessage. type Nested struct { - OptString *string `protobuf:"bytes,1,opt,name=opt_string,json=optString" json:"opt_string,omitempty"` - OptNested *Nested `protobuf:"bytes,2,opt,name=opt_nested,json=optNested" json:"opt_nested,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + OptString *string `protobuf:"bytes,1,opt,name=opt_string,json=optString" json:"opt_string,omitempty"` + OptNested *Nested `protobuf:"bytes,2,opt,name=opt_nested,json=optNested" json:"opt_nested,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Nested) Reset() { @@ -486,13 +486,13 @@ func (x *Nested) GetOptNested() *Nested { // Message contains message and group fields. type Nests struct { - OptNested *Nested `protobuf:"bytes,1,opt,name=opt_nested,json=optNested" json:"opt_nested,omitempty"` - Optgroup *Nests_OptGroup `protobuf:"group,2,opt,name=OptGroup,json=optgroup" json:"optgroup,omitempty"` - RptNested []*Nested `protobuf:"bytes,4,rep,name=rpt_nested,json=rptNested" json:"rpt_nested,omitempty"` - Rptgroup []*Nests_RptGroup `protobuf:"group,5,rep,name=RptGroup,json=rptgroup" json:"rptgroup,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + OptNested *Nested `protobuf:"bytes,1,opt,name=opt_nested,json=optNested" json:"opt_nested,omitempty"` + Optgroup *Nests_OptGroup `protobuf:"group,2,opt,name=OptGroup,json=optgroup" json:"optgroup,omitempty"` + RptNested []*Nested `protobuf:"bytes,4,rep,name=rpt_nested,json=rptNested" json:"rpt_nested,omitempty"` + Rptgroup []*Nests_RptGroup `protobuf:"group,5,rep,name=RptGroup,json=rptgroup" json:"rptgroup,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Nests) Reset() { @@ -548,15 +548,15 @@ func (x *Nests) GetRptgroup() []*Nests_RptGroup { // Message contains required fields. type Requireds struct { - ReqBool *bool `protobuf:"varint,1,req,name=req_bool,json=reqBool" json:"req_bool,omitempty"` - ReqSfixed64 *int64 `protobuf:"fixed64,2,req,name=req_sfixed64,json=reqSfixed64" json:"req_sfixed64,omitempty"` - ReqDouble *float64 `protobuf:"fixed64,3,req,name=req_double,json=reqDouble" json:"req_double,omitempty"` - ReqString *string `protobuf:"bytes,4,req,name=req_string,json=reqString" json:"req_string,omitempty"` - ReqEnum *Enum `protobuf:"varint,5,req,name=req_enum,json=reqEnum,enum=pb2.Enum" json:"req_enum,omitempty"` - ReqNested *Nested `protobuf:"bytes,6,req,name=req_nested,json=reqNested" json:"req_nested,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + ReqBool *bool `protobuf:"varint,1,req,name=req_bool,json=reqBool" json:"req_bool,omitempty"` + ReqSfixed64 *int64 `protobuf:"fixed64,2,req,name=req_sfixed64,json=reqSfixed64" json:"req_sfixed64,omitempty"` + ReqDouble *float64 `protobuf:"fixed64,3,req,name=req_double,json=reqDouble" json:"req_double,omitempty"` + ReqString *string `protobuf:"bytes,4,req,name=req_string,json=reqString" json:"req_string,omitempty"` + ReqEnum *Enum `protobuf:"varint,5,req,name=req_enum,json=reqEnum,enum=pb2.Enum" json:"req_enum,omitempty"` + ReqNested *Nested `protobuf:"bytes,6,req,name=req_nested,json=reqNested" json:"req_nested,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Requireds) Reset() { @@ -626,11 +626,11 @@ func (x *Requireds) GetReqNested() *Nested { // Message contains both required and optional fields. type PartialRequired struct { - ReqString *string `protobuf:"bytes,1,req,name=req_string,json=reqString" json:"req_string,omitempty"` - OptString *string `protobuf:"bytes,2,opt,name=opt_string,json=optString" json:"opt_string,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + ReqString *string `protobuf:"bytes,1,req,name=req_string,json=reqString" json:"req_string,omitempty"` + OptString *string `protobuf:"bytes,2,opt,name=opt_string,json=optString" json:"opt_string,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *PartialRequired) Reset() { @@ -671,10 +671,10 @@ func (x *PartialRequired) GetOptString() string { } type NestedWithRequired struct { - ReqString *string `protobuf:"bytes,1,req,name=req_string,json=reqString" json:"req_string,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + ReqString *string `protobuf:"bytes,1,req,name=req_string,json=reqString" json:"req_string,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *NestedWithRequired) Reset() { @@ -715,8 +715,8 @@ type IndirectRequired struct { // *IndirectRequired_OneofNested Union isIndirectRequired_Union `protobuf_oneof:"union"` XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *IndirectRequired) Reset() { @@ -795,13 +795,13 @@ type IndirectRequired_OneofNested struct { func (*IndirectRequired_OneofNested) isIndirectRequired_Union() {} type Extensions struct { - OptString *string `protobuf:"bytes,1,opt,name=opt_string,json=optString" json:"opt_string,omitempty"` - OptBool *bool `protobuf:"varint,101,opt,name=opt_bool,json=optBool" json:"opt_bool,omitempty"` - OptInt32 *int32 `protobuf:"varint,2,opt,name=opt_int32,json=optInt32" json:"opt_int32,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_InternalExtensions protoimpl.ExtensionFieldsV1 `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + OptString *string `protobuf:"bytes,1,opt,name=opt_string,json=optString" json:"opt_string,omitempty"` + OptBool *bool `protobuf:"varint,101,opt,name=opt_bool,json=optBool" json:"opt_bool,omitempty"` + OptInt32 *int32 `protobuf:"varint,2,opt,name=opt_int32,json=optInt32" json:"opt_int32,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Extensions) Reset() { @@ -858,9 +858,9 @@ func (x *Extensions) GetOptInt32() int32 { } type ExtensionsContainer struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *ExtensionsContainer) Reset() { @@ -887,10 +887,10 @@ func (*ExtensionsContainer) Descriptor() ([]byte, []int) { } type MessageSet struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_InternalExtensions protoimpl.ExtensionFieldsV1 `protobuf_messageset:"1" json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_InternalExtensions protoimpl.ExtensionFields `protobuf_messageset:"1" json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *MessageSet) Reset() { @@ -926,10 +926,10 @@ func (*MessageSet) ExtensionRangeArray() []protoiface.ExtensionRangeV1 { } type MessageSetExtension struct { - OptString *string `protobuf:"bytes,1,opt,name=opt_string,json=optString" json:"opt_string,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + OptString *string `protobuf:"bytes,1,opt,name=opt_string,json=optString" json:"opt_string,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *MessageSetExtension) Reset() { @@ -963,10 +963,10 @@ func (x *MessageSetExtension) GetOptString() string { } type FakeMessageSet struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_InternalExtensions protoimpl.ExtensionFieldsV1 `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *FakeMessageSet) Reset() { @@ -1002,10 +1002,10 @@ func (*FakeMessageSet) ExtensionRangeArray() []protoiface.ExtensionRangeV1 { } type FakeMessageSetExtension struct { - OptString *string `protobuf:"bytes,1,opt,name=opt_string,json=optString" json:"opt_string,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + OptString *string `protobuf:"bytes,1,opt,name=opt_string,json=optString" json:"opt_string,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *FakeMessageSetExtension) Reset() { @@ -1040,27 +1040,27 @@ func (x *FakeMessageSetExtension) GetOptString() string { // Message contains well-known type fields. type KnownTypes struct { - OptBool *known.BoolValue `protobuf:"bytes,1,opt,name=opt_bool,json=optBool" json:"opt_bool,omitempty"` - OptInt32 *known.Int32Value `protobuf:"bytes,2,opt,name=opt_int32,json=optInt32" json:"opt_int32,omitempty"` - OptInt64 *known.Int64Value `protobuf:"bytes,3,opt,name=opt_int64,json=optInt64" json:"opt_int64,omitempty"` - OptUint32 *known.UInt32Value `protobuf:"bytes,4,opt,name=opt_uint32,json=optUint32" json:"opt_uint32,omitempty"` - OptUint64 *known.UInt64Value `protobuf:"bytes,5,opt,name=opt_uint64,json=optUint64" json:"opt_uint64,omitempty"` - OptFloat *known.FloatValue `protobuf:"bytes,6,opt,name=opt_float,json=optFloat" json:"opt_float,omitempty"` - OptDouble *known.DoubleValue `protobuf:"bytes,7,opt,name=opt_double,json=optDouble" json:"opt_double,omitempty"` - OptString *known.StringValue `protobuf:"bytes,8,opt,name=opt_string,json=optString" json:"opt_string,omitempty"` - OptBytes *known.BytesValue `protobuf:"bytes,9,opt,name=opt_bytes,json=optBytes" json:"opt_bytes,omitempty"` - OptDuration *known.Duration `protobuf:"bytes,20,opt,name=opt_duration,json=optDuration" json:"opt_duration,omitempty"` - OptTimestamp *known.Timestamp `protobuf:"bytes,21,opt,name=opt_timestamp,json=optTimestamp" json:"opt_timestamp,omitempty"` - OptStruct *known.Struct `protobuf:"bytes,25,opt,name=opt_struct,json=optStruct" json:"opt_struct,omitempty"` - OptList *known.ListValue `protobuf:"bytes,26,opt,name=opt_list,json=optList" json:"opt_list,omitempty"` - OptValue *known.Value `protobuf:"bytes,27,opt,name=opt_value,json=optValue" json:"opt_value,omitempty"` - OptNull *known.NullValue `protobuf:"varint,28,opt,name=opt_null,json=optNull,enum=google.protobuf.NullValue" json:"opt_null,omitempty"` - OptEmpty *known.Empty `protobuf:"bytes,30,opt,name=opt_empty,json=optEmpty" json:"opt_empty,omitempty"` - OptAny *known.Any `protobuf:"bytes,32,opt,name=opt_any,json=optAny" json:"opt_any,omitempty"` - OptFieldmask *known.FieldMask `protobuf:"bytes,40,opt,name=opt_fieldmask,json=optFieldmask" json:"opt_fieldmask,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + OptBool *known.BoolValue `protobuf:"bytes,1,opt,name=opt_bool,json=optBool" json:"opt_bool,omitempty"` + OptInt32 *known.Int32Value `protobuf:"bytes,2,opt,name=opt_int32,json=optInt32" json:"opt_int32,omitempty"` + OptInt64 *known.Int64Value `protobuf:"bytes,3,opt,name=opt_int64,json=optInt64" json:"opt_int64,omitempty"` + OptUint32 *known.UInt32Value `protobuf:"bytes,4,opt,name=opt_uint32,json=optUint32" json:"opt_uint32,omitempty"` + OptUint64 *known.UInt64Value `protobuf:"bytes,5,opt,name=opt_uint64,json=optUint64" json:"opt_uint64,omitempty"` + OptFloat *known.FloatValue `protobuf:"bytes,6,opt,name=opt_float,json=optFloat" json:"opt_float,omitempty"` + OptDouble *known.DoubleValue `protobuf:"bytes,7,opt,name=opt_double,json=optDouble" json:"opt_double,omitempty"` + OptString *known.StringValue `protobuf:"bytes,8,opt,name=opt_string,json=optString" json:"opt_string,omitempty"` + OptBytes *known.BytesValue `protobuf:"bytes,9,opt,name=opt_bytes,json=optBytes" json:"opt_bytes,omitempty"` + OptDuration *known.Duration `protobuf:"bytes,20,opt,name=opt_duration,json=optDuration" json:"opt_duration,omitempty"` + OptTimestamp *known.Timestamp `protobuf:"bytes,21,opt,name=opt_timestamp,json=optTimestamp" json:"opt_timestamp,omitempty"` + OptStruct *known.Struct `protobuf:"bytes,25,opt,name=opt_struct,json=optStruct" json:"opt_struct,omitempty"` + OptList *known.ListValue `protobuf:"bytes,26,opt,name=opt_list,json=optList" json:"opt_list,omitempty"` + OptValue *known.Value `protobuf:"bytes,27,opt,name=opt_value,json=optValue" json:"opt_value,omitempty"` + OptNull *known.NullValue `protobuf:"varint,28,opt,name=opt_null,json=optNull,enum=google.protobuf.NullValue" json:"opt_null,omitempty"` + OptEmpty *known.Empty `protobuf:"bytes,30,opt,name=opt_empty,json=optEmpty" json:"opt_empty,omitempty"` + OptAny *known.Any `protobuf:"bytes,32,opt,name=opt_any,json=optAny" json:"opt_any,omitempty"` + OptFieldmask *known.FieldMask `protobuf:"bytes,40,opt,name=opt_fieldmask,json=optFieldmask" json:"opt_fieldmask,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *KnownTypes) Reset() { @@ -1217,8 +1217,8 @@ type Nests_OptGroup struct { OptNested *Nested `protobuf:"bytes,2,opt,name=opt_nested,json=optNested" json:"opt_nested,omitempty"` Optnestedgroup *Nests_OptGroup_OptNestedGroup `protobuf:"group,3,opt,name=OptNestedGroup,json=optnestedgroup" json:"optnestedgroup,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Nests_OptGroup) Reset() { @@ -1266,10 +1266,10 @@ func (x *Nests_OptGroup) GetOptnestedgroup() *Nests_OptGroup_OptNestedGroup { } type Nests_RptGroup struct { - RptString []string `protobuf:"bytes,1,rep,name=rpt_string,json=rptString" json:"rpt_string,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + RptString []string `protobuf:"bytes,1,rep,name=rpt_string,json=rptString" json:"rpt_string,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Nests_RptGroup) Reset() { @@ -1303,10 +1303,10 @@ func (x *Nests_RptGroup) GetRptString() []string { } type Nests_OptGroup_OptNestedGroup struct { - OptFixed32 *uint32 `protobuf:"fixed32,1,opt,name=opt_fixed32,json=optFixed32" json:"opt_fixed32,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + OptFixed32 *uint32 `protobuf:"fixed32,1,opt,name=opt_fixed32,json=optFixed32" json:"opt_fixed32,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Nests_OptGroup_OptNestedGroup) Reset() { diff --git a/encoding/testprotos/pb3/test.pb.go b/encoding/testprotos/pb3/test.pb.go index 7e1c4432..0e0b2b35 100644 --- a/encoding/testprotos/pb3/test.pb.go +++ b/encoding/testprotos/pb3/test.pb.go @@ -99,24 +99,24 @@ func (Enums_NestedEnum) EnumDescriptor() ([]byte, []int) { // Scalars contains scalar field types. type Scalars struct { - SBool bool `protobuf:"varint,1,opt,name=s_bool,json=sBool,proto3" json:"s_bool,omitempty"` - SInt32 int32 `protobuf:"varint,2,opt,name=s_int32,json=sInt32,proto3" json:"s_int32,omitempty"` - SInt64 int64 `protobuf:"varint,3,opt,name=s_int64,json=sInt64,proto3" json:"s_int64,omitempty"` - SUint32 uint32 `protobuf:"varint,4,opt,name=s_uint32,json=sUint32,proto3" json:"s_uint32,omitempty"` - SUint64 uint64 `protobuf:"varint,5,opt,name=s_uint64,json=sUint64,proto3" json:"s_uint64,omitempty"` - SSint32 int32 `protobuf:"zigzag32,6,opt,name=s_sint32,json=sSint32,proto3" json:"s_sint32,omitempty"` - SSint64 int64 `protobuf:"zigzag64,7,opt,name=s_sint64,json=sSint64,proto3" json:"s_sint64,omitempty"` - SFixed32 uint32 `protobuf:"fixed32,8,opt,name=s_fixed32,json=sFixed32,proto3" json:"s_fixed32,omitempty"` - SFixed64 uint64 `protobuf:"fixed64,9,opt,name=s_fixed64,json=sFixed64,proto3" json:"s_fixed64,omitempty"` - SSfixed32 int32 `protobuf:"fixed32,10,opt,name=s_sfixed32,json=sSfixed32,proto3" json:"s_sfixed32,omitempty"` - SSfixed64 int64 `protobuf:"fixed64,11,opt,name=s_sfixed64,json=sSfixed64,proto3" json:"s_sfixed64,omitempty"` - SFloat float32 `protobuf:"fixed32,20,opt,name=s_float,json=sFloat,proto3" json:"s_float,omitempty"` - SDouble float64 `protobuf:"fixed64,21,opt,name=s_double,json=sDouble,proto3" json:"s_double,omitempty"` - SBytes []byte `protobuf:"bytes,14,opt,name=s_bytes,json=sBytes,proto3" json:"s_bytes,omitempty"` - SString string `protobuf:"bytes,13,opt,name=s_string,json=sString,proto3" json:"s_string,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + SBool bool `protobuf:"varint,1,opt,name=s_bool,json=sBool,proto3" json:"s_bool,omitempty"` + SInt32 int32 `protobuf:"varint,2,opt,name=s_int32,json=sInt32,proto3" json:"s_int32,omitempty"` + SInt64 int64 `protobuf:"varint,3,opt,name=s_int64,json=sInt64,proto3" json:"s_int64,omitempty"` + SUint32 uint32 `protobuf:"varint,4,opt,name=s_uint32,json=sUint32,proto3" json:"s_uint32,omitempty"` + SUint64 uint64 `protobuf:"varint,5,opt,name=s_uint64,json=sUint64,proto3" json:"s_uint64,omitempty"` + SSint32 int32 `protobuf:"zigzag32,6,opt,name=s_sint32,json=sSint32,proto3" json:"s_sint32,omitempty"` + SSint64 int64 `protobuf:"zigzag64,7,opt,name=s_sint64,json=sSint64,proto3" json:"s_sint64,omitempty"` + SFixed32 uint32 `protobuf:"fixed32,8,opt,name=s_fixed32,json=sFixed32,proto3" json:"s_fixed32,omitempty"` + SFixed64 uint64 `protobuf:"fixed64,9,opt,name=s_fixed64,json=sFixed64,proto3" json:"s_fixed64,omitempty"` + SSfixed32 int32 `protobuf:"fixed32,10,opt,name=s_sfixed32,json=sSfixed32,proto3" json:"s_sfixed32,omitempty"` + SSfixed64 int64 `protobuf:"fixed64,11,opt,name=s_sfixed64,json=sSfixed64,proto3" json:"s_sfixed64,omitempty"` + SFloat float32 `protobuf:"fixed32,20,opt,name=s_float,json=sFloat,proto3" json:"s_float,omitempty"` + SDouble float64 `protobuf:"fixed64,21,opt,name=s_double,json=sDouble,proto3" json:"s_double,omitempty"` + SBytes []byte `protobuf:"bytes,14,opt,name=s_bytes,json=sBytes,proto3" json:"s_bytes,omitempty"` + SString string `protobuf:"bytes,13,opt,name=s_string,json=sString,proto3" json:"s_string,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Scalars) Reset() { @@ -249,11 +249,11 @@ func (x *Scalars) GetSString() string { // Message contains enum fields. type Enums struct { - SEnum Enum `protobuf:"varint,1,opt,name=s_enum,json=sEnum,proto3,enum=pb3.Enum" json:"s_enum,omitempty"` - SNestedEnum Enums_NestedEnum `protobuf:"varint,3,opt,name=s_nested_enum,json=sNestedEnum,proto3,enum=pb3.Enums_NestedEnum" json:"s_nested_enum,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + SEnum Enum `protobuf:"varint,1,opt,name=s_enum,json=sEnum,proto3,enum=pb3.Enum" json:"s_enum,omitempty"` + SNestedEnum Enums_NestedEnum `protobuf:"varint,3,opt,name=s_nested_enum,json=sNestedEnum,proto3,enum=pb3.Enums_NestedEnum" json:"s_nested_enum,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Enums) Reset() { @@ -295,10 +295,10 @@ func (x *Enums) GetSNestedEnum() Enums_NestedEnum { // Message contains nested message field. type Nests struct { - SNested *Nested `protobuf:"bytes,2,opt,name=s_nested,json=sNested,proto3" json:"s_nested,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + SNested *Nested `protobuf:"bytes,2,opt,name=s_nested,json=sNested,proto3" json:"s_nested,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Nests) Reset() { @@ -333,11 +333,11 @@ func (x *Nests) GetSNested() *Nested { // Message type used as submessage. type Nested struct { - SString string `protobuf:"bytes,1,opt,name=s_string,json=sString,proto3" json:"s_string,omitempty"` - SNested *Nested `protobuf:"bytes,2,opt,name=s_nested,json=sNested,proto3" json:"s_nested,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + SString string `protobuf:"bytes,1,opt,name=s_string,json=sString,proto3" json:"s_string,omitempty"` + SNested *Nested `protobuf:"bytes,2,opt,name=s_nested,json=sNested,proto3" json:"s_nested,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Nested) Reset() { @@ -383,10 +383,10 @@ type Oneofs struct { // *Oneofs_OneofEnum // *Oneofs_OneofString // *Oneofs_OneofNested - Union isOneofs_Union `protobuf_oneof:"union"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Union isOneofs_Union `protobuf_oneof:"union"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Oneofs) Reset() { @@ -473,14 +473,14 @@ func (*Oneofs_OneofNested) isOneofs_Union() {} // Message contains map fields. type Maps struct { - Int32ToStr map[int32]string `protobuf:"bytes,1,rep,name=int32_to_str,json=int32ToStr,proto3" json:"int32_to_str,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - BoolToUint32 map[bool]uint32 `protobuf:"bytes,2,rep,name=bool_to_uint32,json=boolToUint32,proto3" json:"bool_to_uint32,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` - Uint64ToEnum map[uint64]Enum `protobuf:"bytes,3,rep,name=uint64_to_enum,json=uint64ToEnum,proto3" json:"uint64_to_enum,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3,enum=pb3.Enum"` - StrToNested map[string]*Nested `protobuf:"bytes,4,rep,name=str_to_nested,json=strToNested,proto3" json:"str_to_nested,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - StrToOneofs map[string]*Oneofs `protobuf:"bytes,5,rep,name=str_to_oneofs,json=strToOneofs,proto3" json:"str_to_oneofs,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Int32ToStr map[int32]string `protobuf:"bytes,1,rep,name=int32_to_str,json=int32ToStr,proto3" json:"int32_to_str,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + BoolToUint32 map[bool]uint32 `protobuf:"bytes,2,rep,name=bool_to_uint32,json=boolToUint32,proto3" json:"bool_to_uint32,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` + Uint64ToEnum map[uint64]Enum `protobuf:"bytes,3,rep,name=uint64_to_enum,json=uint64ToEnum,proto3" json:"uint64_to_enum,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3,enum=pb3.Enum"` + StrToNested map[string]*Nested `protobuf:"bytes,4,rep,name=str_to_nested,json=strToNested,proto3" json:"str_to_nested,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + StrToOneofs map[string]*Oneofs `protobuf:"bytes,5,rep,name=str_to_oneofs,json=strToOneofs,proto3" json:"str_to_oneofs,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Maps) Reset() { @@ -543,10 +543,10 @@ func (x *Maps) GetStrToOneofs() map[string]*Oneofs { // Message for testing json_name option. type JSONNames struct { - SString string `protobuf:"bytes,1,opt,name=s_string,json=foo_bar,proto3" json:"s_string,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + SString string `protobuf:"bytes,1,opt,name=s_string,json=foo_bar,proto3" json:"s_string,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *JSONNames) Reset() { diff --git a/internal/testprotos/conformance/conformance.pb.go b/internal/testprotos/conformance/conformance.pb.go index 51ea4919..1bd47253 100644 --- a/internal/testprotos/conformance/conformance.pb.go +++ b/internal/testprotos/conformance/conformance.pb.go @@ -118,10 +118,10 @@ func (TestCategory) EnumDescriptor() ([]byte, []int) { // This will be known by message_type == "conformance.FailureSet", a conformance // test should return a serialized FailureSet in protobuf_payload. type FailureSet struct { - Failure []string `protobuf:"bytes,1,rep,name=failure,proto3" json:"failure,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Failure []string `protobuf:"bytes,1,rep,name=failure,proto3" json:"failure,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *FailureSet) Reset() { @@ -186,10 +186,10 @@ type ConformanceRequest struct { // for more information. TestCategory TestCategory `protobuf:"varint,5,opt,name=test_category,json=testCategory,proto3,enum=conformance.TestCategory" json:"test_category,omitempty"` // Specify details for how to encode jspb. - JspbEncodingOptions *JspbEncodingConfig `protobuf:"bytes,6,opt,name=jspb_encoding_options,json=jspbEncodingOptions,proto3" json:"jspb_encoding_options,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + JspbEncodingOptions *JspbEncodingConfig `protobuf:"bytes,6,opt,name=jspb_encoding_options,json=jspbEncodingOptions,proto3" json:"jspb_encoding_options,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *ConformanceRequest) Reset() { @@ -351,8 +351,8 @@ type ConformanceResponse struct { // *ConformanceResponse_TextPayload Result isConformanceResponse_Result `protobuf_oneof:"result"` XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *ConformanceResponse) Reset() { @@ -510,10 +510,10 @@ func (*ConformanceResponse_TextPayload) isConformanceResponse_Result() {} // Encoding options for jspb format. type JspbEncodingConfig struct { // Encode the value field of Any as jspb array if ture, otherwise binary. - UseJspbArrayAnyFormat bool `protobuf:"varint,1,opt,name=use_jspb_array_any_format,json=useJspbArrayAnyFormat,proto3" json:"use_jspb_array_any_format,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + UseJspbArrayAnyFormat bool `protobuf:"varint,1,opt,name=use_jspb_array_any_format,json=useJspbArrayAnyFormat,proto3" json:"use_jspb_array_any_format,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *JspbEncodingConfig) Reset() { diff --git a/internal/testprotos/legacy/legacy.pb.go b/internal/testprotos/legacy/legacy.pb.go index dfea835a..cc3dbc1e 100644 --- a/internal/testprotos/legacy/legacy.pb.go +++ b/internal/testprotos/legacy/legacy.pb.go @@ -26,21 +26,21 @@ import ( const _ = protoimpl.EnforceVersion(protoimpl.Version - 0) type Legacy struct { - F1 *proto2_v0_0.Message `protobuf:"bytes,1,opt,name=f1,proto3" json:"f1,omitempty"` - F2 *proto3_v0_0.Message `protobuf:"bytes,2,opt,name=f2,proto3" json:"f2,omitempty"` - F3 *proto2_v0_01.Message `protobuf:"bytes,3,opt,name=f3,proto3" json:"f3,omitempty"` - F4 *proto3_v0_01.Message `protobuf:"bytes,4,opt,name=f4,proto3" json:"f4,omitempty"` - F5 *proto2_v1_0.Message `protobuf:"bytes,5,opt,name=f5,proto3" json:"f5,omitempty"` - F6 *proto3_v1_0.Message `protobuf:"bytes,6,opt,name=f6,proto3" json:"f6,omitempty"` - F7 *proto2_v1_1.Message `protobuf:"bytes,7,opt,name=f7,proto3" json:"f7,omitempty"` - F8 *proto3_v1_1.Message `protobuf:"bytes,8,opt,name=f8,proto3" json:"f8,omitempty"` - F9 *proto2_v1_2.Message `protobuf:"bytes,9,opt,name=f9,proto3" json:"f9,omitempty"` - F10 *proto3_v1_2.Message `protobuf:"bytes,10,opt,name=f10,proto3" json:"f10,omitempty"` - F11 *proto2_v1_21.Message `protobuf:"bytes,11,opt,name=f11,proto3" json:"f11,omitempty"` - F12 *proto3_v1_21.Message `protobuf:"bytes,12,opt,name=f12,proto3" json:"f12,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + F1 *proto2_v0_0.Message `protobuf:"bytes,1,opt,name=f1,proto3" json:"f1,omitempty"` + F2 *proto3_v0_0.Message `protobuf:"bytes,2,opt,name=f2,proto3" json:"f2,omitempty"` + F3 *proto2_v0_01.Message `protobuf:"bytes,3,opt,name=f3,proto3" json:"f3,omitempty"` + F4 *proto3_v0_01.Message `protobuf:"bytes,4,opt,name=f4,proto3" json:"f4,omitempty"` + F5 *proto2_v1_0.Message `protobuf:"bytes,5,opt,name=f5,proto3" json:"f5,omitempty"` + F6 *proto3_v1_0.Message `protobuf:"bytes,6,opt,name=f6,proto3" json:"f6,omitempty"` + F7 *proto2_v1_1.Message `protobuf:"bytes,7,opt,name=f7,proto3" json:"f7,omitempty"` + F8 *proto3_v1_1.Message `protobuf:"bytes,8,opt,name=f8,proto3" json:"f8,omitempty"` + F9 *proto2_v1_2.Message `protobuf:"bytes,9,opt,name=f9,proto3" json:"f9,omitempty"` + F10 *proto3_v1_2.Message `protobuf:"bytes,10,opt,name=f10,proto3" json:"f10,omitempty"` + F11 *proto2_v1_21.Message `protobuf:"bytes,11,opt,name=f11,proto3" json:"f11,omitempty"` + F12 *proto3_v1_21.Message `protobuf:"bytes,12,opt,name=f12,proto3" json:"f12,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Legacy) Reset() { diff --git a/internal/testprotos/test/test.pb.go b/internal/testprotos/test/test.pb.go index 6eb43c8b..263dd3af 100644 --- a/internal/testprotos/test/test.pb.go +++ b/internal/testprotos/test/test.pb.go @@ -315,8 +315,8 @@ type TestAllTypes struct { // *TestAllTypes_OneofEnum OneofField isTestAllTypes_OneofField `protobuf_oneof:"oneof_field"` XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *TestAllTypes) Reset() { @@ -1058,8 +1058,8 @@ type TestDeprecatedMessage struct { // *TestDeprecatedMessage_DeprecatedOneofField DeprecatedOneof isTestDeprecatedMessage_DeprecatedOneof `protobuf_oneof:"deprecated_oneof"` XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *TestDeprecatedMessage) Reset() { @@ -1126,11 +1126,11 @@ type TestDeprecatedMessage_DeprecatedOneofField struct { func (*TestDeprecatedMessage_DeprecatedOneofField) isTestDeprecatedMessage_DeprecatedOneof() {} type ForeignMessage struct { - C *int32 `protobuf:"varint,1,opt,name=c" json:"c,omitempty"` - D *int32 `protobuf:"varint,2,opt,name=d" json:"d,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + C *int32 `protobuf:"varint,1,opt,name=c" json:"c,omitempty"` + D *int32 `protobuf:"varint,2,opt,name=d" json:"d,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *ForeignMessage) Reset() { @@ -1171,9 +1171,9 @@ func (x *ForeignMessage) GetD() int32 { } type TestReservedFields struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *TestReservedFields) Reset() { @@ -1200,10 +1200,10 @@ func (*TestReservedFields) Descriptor() ([]byte, []int) { } type TestAllExtensions struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_InternalExtensions protoimpl.ExtensionFieldsV1 `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *TestAllExtensions) Reset() { @@ -1239,10 +1239,10 @@ func (*TestAllExtensions) ExtensionRangeArray() []protoiface.ExtensionRangeV1 { } type OptionalGroupExtension struct { - A *int32 `protobuf:"varint,17,opt,name=a" json:"a,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + A *int32 `protobuf:"varint,17,opt,name=a" json:"a,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *OptionalGroupExtension) Reset() { @@ -1276,10 +1276,10 @@ func (x *OptionalGroupExtension) GetA() int32 { } type RepeatedGroupExtension struct { - A *int32 `protobuf:"varint,47,opt,name=a" json:"a,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + A *int32 `protobuf:"varint,47,opt,name=a" json:"a,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *RepeatedGroupExtension) Reset() { @@ -1313,9 +1313,9 @@ func (x *RepeatedGroupExtension) GetA() int32 { } type TestNestedExtension struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *TestNestedExtension) Reset() { @@ -1342,10 +1342,10 @@ func (*TestNestedExtension) Descriptor() ([]byte, []int) { } type TestRequired struct { - RequiredField *int32 `protobuf:"varint,1,req,name=required_field,json=requiredField" json:"required_field,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + RequiredField *int32 `protobuf:"varint,1,req,name=required_field,json=requiredField" json:"required_field,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *TestRequired) Reset() { @@ -1383,8 +1383,8 @@ type TestRequiredForeign struct { RepeatedMessage []*TestRequired `protobuf:"bytes,2,rep,name=repeated_message,json=repeatedMessage" json:"repeated_message,omitempty"` MapMessage map[int32]*TestRequired `protobuf:"bytes,3,rep,name=map_message,json=mapMessage" json:"map_message,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *TestRequiredForeign) Reset() { @@ -1435,8 +1435,8 @@ type TestRequiredGroupFields struct { Optionalgroup *TestRequiredGroupFields_OptionalGroup `protobuf:"group,1,opt,name=OptionalGroup,json=optionalgroup" json:"optionalgroup,omitempty"` Repeatedgroup []*TestRequiredGroupFields_RepeatedGroup `protobuf:"group,3,rep,name=RepeatedGroup,json=repeatedgroup" json:"repeatedgroup,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *TestRequiredGroupFields) Reset() { @@ -1478,9 +1478,9 @@ func (x *TestRequiredGroupFields) GetRepeatedgroup() []*TestRequiredGroupFields_ // Test that RPC services work. type FooRequest struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *FooRequest) Reset() { @@ -1507,9 +1507,9 @@ func (*FooRequest) Descriptor() ([]byte, []int) { } type FooResponse struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *FooResponse) Reset() { @@ -1536,11 +1536,11 @@ func (*FooResponse) Descriptor() ([]byte, []int) { } type TestAllTypes_NestedMessage struct { - A *int32 `protobuf:"varint,1,opt,name=a" json:"a,omitempty"` - Corecursive *TestAllTypes `protobuf:"bytes,2,opt,name=corecursive" json:"corecursive,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + A *int32 `protobuf:"varint,1,opt,name=a" json:"a,omitempty"` + Corecursive *TestAllTypes `protobuf:"bytes,2,opt,name=corecursive" json:"corecursive,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *TestAllTypes_NestedMessage) Reset() { @@ -1581,10 +1581,10 @@ func (x *TestAllTypes_NestedMessage) GetCorecursive() *TestAllTypes { } type TestAllTypes_OptionalGroup struct { - A *int32 `protobuf:"varint,17,opt,name=a" json:"a,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + A *int32 `protobuf:"varint,17,opt,name=a" json:"a,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *TestAllTypes_OptionalGroup) Reset() { @@ -1618,10 +1618,10 @@ func (x *TestAllTypes_OptionalGroup) GetA() int32 { } type TestAllTypes_RepeatedGroup struct { - A *int32 `protobuf:"varint,47,opt,name=a" json:"a,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + A *int32 `protobuf:"varint,47,opt,name=a" json:"a,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *TestAllTypes_RepeatedGroup) Reset() { @@ -1655,10 +1655,10 @@ func (x *TestAllTypes_RepeatedGroup) GetA() int32 { } type TestRequiredGroupFields_OptionalGroup struct { - A *int32 `protobuf:"varint,2,req,name=a" json:"a,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + A *int32 `protobuf:"varint,2,req,name=a" json:"a,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *TestRequiredGroupFields_OptionalGroup) Reset() { @@ -1692,10 +1692,10 @@ func (x *TestRequiredGroupFields_OptionalGroup) GetA() int32 { } type TestRequiredGroupFields_RepeatedGroup struct { - A *int32 `protobuf:"varint,4,req,name=a" json:"a,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + A *int32 `protobuf:"varint,4,req,name=a" json:"a,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *TestRequiredGroupFields_RepeatedGroup) Reset() { diff --git a/internal/testprotos/test/test_import.pb.go b/internal/testprotos/test/test_import.pb.go index eb889ee7..3b9766f8 100644 --- a/internal/testprotos/test/test_import.pb.go +++ b/internal/testprotos/test/test_import.pb.go @@ -63,9 +63,9 @@ func (ImportEnum) EnumDescriptor() ([]byte, []int) { } type ImportMessage struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *ImportMessage) Reset() { diff --git a/internal/testprotos/test/test_public.pb.go b/internal/testprotos/test/test_public.pb.go index 7132a4b6..4f12706e 100644 --- a/internal/testprotos/test/test_public.pb.go +++ b/internal/testprotos/test/test_public.pb.go @@ -14,9 +14,9 @@ import ( const _ = protoimpl.EnforceVersion(protoimpl.Version - 0) type PublicImportMessage struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *PublicImportMessage) Reset() { diff --git a/internal/testprotos/test/test_weak.pb.go b/internal/testprotos/test/test_weak.pb.go index b36082bb..0a716ef9 100644 --- a/internal/testprotos/test/test_weak.pb.go +++ b/internal/testprotos/test/test_weak.pb.go @@ -14,9 +14,9 @@ import ( const _ = protoimpl.EnforceVersion(protoimpl.Version - 0) type WeakImportMessage struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *WeakImportMessage) Reset() { diff --git a/internal/testprotos/test3/test.pb.go b/internal/testprotos/test3/test.pb.go index d2d2a611..d871a2e7 100644 --- a/internal/testprotos/test3/test.pb.go +++ b/internal/testprotos/test3/test.pb.go @@ -169,8 +169,8 @@ type TestAllTypes struct { // *TestAllTypes_OneofEnum OneofField isTestAllTypes_OneofField `protobuf_oneof:"oneof_field"` XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *TestAllTypes) Reset() { @@ -753,11 +753,11 @@ func (*TestAllTypes_OneofDouble) isTestAllTypes_OneofField() {} func (*TestAllTypes_OneofEnum) isTestAllTypes_OneofField() {} type ForeignMessage struct { - C int32 `protobuf:"varint,1,opt,name=c,proto3" json:"c,omitempty"` - D int32 `protobuf:"varint,2,opt,name=d,proto3" json:"d,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + C int32 `protobuf:"varint,1,opt,name=c,proto3" json:"c,omitempty"` + D int32 `protobuf:"varint,2,opt,name=d,proto3" json:"d,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *ForeignMessage) Reset() { @@ -798,11 +798,11 @@ func (x *ForeignMessage) GetD() int32 { } type TestAllTypes_NestedMessage struct { - A int32 `protobuf:"varint,1,opt,name=a,proto3" json:"a,omitempty"` - Corecursive *TestAllTypes `protobuf:"bytes,2,opt,name=corecursive,proto3" json:"corecursive,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + A int32 `protobuf:"varint,1,opt,name=a,proto3" json:"a,omitempty"` + Corecursive *TestAllTypes `protobuf:"bytes,2,opt,name=corecursive,proto3" json:"corecursive,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *TestAllTypes_NestedMessage) Reset() { diff --git a/internal/testprotos/test3/test_import.pb.go b/internal/testprotos/test3/test_import.pb.go index 2ee6535e..385827b4 100644 --- a/internal/testprotos/test3/test_import.pb.go +++ b/internal/testprotos/test3/test_import.pb.go @@ -47,9 +47,9 @@ func (ImportEnum) EnumDescriptor() ([]byte, []int) { } type ImportMessage struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *ImportMessage) Reset() { diff --git a/reflect/protoregistry/testprotos/test.pb.go b/reflect/protoregistry/testprotos/test.pb.go index 6ba10ad9..435b8b0d 100644 --- a/reflect/protoregistry/testprotos/test.pb.go +++ b/reflect/protoregistry/testprotos/test.pb.go @@ -161,10 +161,10 @@ func (Enum3) EnumDescriptor() ([]byte, []int) { } type Message1 struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_InternalExtensions protoimpl.ExtensionFieldsV1 `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Message1) Reset() { @@ -200,9 +200,9 @@ func (*Message1) ExtensionRangeArray() []protoiface.ExtensionRangeV1 { } type Message2 struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Message2) Reset() { @@ -229,9 +229,9 @@ func (*Message2) Descriptor() ([]byte, []int) { } type Message3 struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Message3) Reset() { @@ -258,10 +258,10 @@ func (*Message3) Descriptor() ([]byte, []int) { } type Message4 struct { - BoolField *bool `protobuf:"varint,30,opt,name=bool_field,json=boolField" json:"bool_field,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + BoolField *bool `protobuf:"varint,30,opt,name=bool_field,json=boolField" json:"bool_field,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Message4) Reset() { diff --git a/runtime/protoimpl/impl.go b/runtime/protoimpl/impl.go index 3c202969..bbfab278 100644 --- a/runtime/protoimpl/impl.go +++ b/runtime/protoimpl/impl.go @@ -41,6 +41,11 @@ type ( MessageType = impl.MessageType FileBuilder = fileinit.FileBuilder + // TODO: Change these to more efficient data structures. + ExtensionFields = map[int32]impl.ExtensionFieldV1 + UnknownFields = []byte + SizeCache = int32 + ExtensionFieldV1 = impl.ExtensionFieldV1 ExtensionFieldsV1 = impl.ExtensionFieldsV1 ) diff --git a/types/descriptor/descriptor.pb.go b/types/descriptor/descriptor.pb.go index bab87956..bcddc8ef 100644 --- a/types/descriptor/descriptor.pb.go +++ b/types/descriptor/descriptor.pb.go @@ -412,10 +412,10 @@ func (MethodOptions_IdempotencyLevel) EnumDescriptor() ([]byte, []int) { // The protocol compiler can output a FileDescriptorSet containing the .proto // files it parses. type FileDescriptorSet struct { - File []*FileDescriptorProto `protobuf:"bytes,1,rep,name=file" json:"file,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + File []*FileDescriptorProto `protobuf:"bytes,1,rep,name=file" json:"file,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *FileDescriptorSet) Reset() { @@ -472,10 +472,10 @@ type FileDescriptorProto struct { SourceCodeInfo *SourceCodeInfo `protobuf:"bytes,9,opt,name=source_code_info,json=sourceCodeInfo" json:"source_code_info,omitempty"` // The syntax of the proto file. // The supported values are "proto2" and "proto3". - Syntax *string `protobuf:"bytes,12,opt,name=syntax" json:"syntax,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Syntax *string `protobuf:"bytes,12,opt,name=syntax" json:"syntax,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *FileDescriptorProto) Reset() { @@ -598,10 +598,10 @@ type DescriptorProto struct { ReservedRange []*DescriptorProto_ReservedRange `protobuf:"bytes,9,rep,name=reserved_range,json=reservedRange" json:"reserved_range,omitempty"` // Reserved field names, which may not be used by fields in the same message. // A given name may only be reserved once. - ReservedName []string `protobuf:"bytes,10,rep,name=reserved_name,json=reservedName" json:"reserved_name,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + ReservedName []string `protobuf:"bytes,10,rep,name=reserved_name,json=reservedName" json:"reserved_name,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *DescriptorProto) Reset() { @@ -699,11 +699,11 @@ func (x *DescriptorProto) GetReservedName() []string { type ExtensionRangeOptions struct { // The parser stores options it doesn't recognize here. See above. - UninterpretedOption []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_InternalExtensions protoimpl.ExtensionFieldsV1 `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + UninterpretedOption []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *ExtensionRangeOptions) Reset() { @@ -775,11 +775,11 @@ type FieldDescriptorProto struct { // user has set a "json_name" option on this field, that option's value // will be used. Otherwise, it's deduced from the field's name by converting // it to camelCase. - JsonName *string `protobuf:"bytes,10,opt,name=json_name,json=jsonName" json:"json_name,omitempty"` - Options *FieldOptions `protobuf:"bytes,8,opt,name=options" json:"options,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + JsonName *string `protobuf:"bytes,10,opt,name=json_name,json=jsonName" json:"json_name,omitempty"` + Options *FieldOptions `protobuf:"bytes,8,opt,name=options" json:"options,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *FieldDescriptorProto) Reset() { @@ -877,11 +877,11 @@ func (x *FieldDescriptorProto) GetOptions() *FieldOptions { // Describes a oneof. type OneofDescriptorProto struct { - Name *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` - Options *OneofOptions `protobuf:"bytes,2,opt,name=options" json:"options,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Name *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` + Options *OneofOptions `protobuf:"bytes,2,opt,name=options" json:"options,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *OneofDescriptorProto) Reset() { @@ -932,10 +932,10 @@ type EnumDescriptorProto struct { ReservedRange []*EnumDescriptorProto_EnumReservedRange `protobuf:"bytes,4,rep,name=reserved_range,json=reservedRange" json:"reserved_range,omitempty"` // Reserved enum value names, which may not be reused. A given name may only // be reserved once. - ReservedName []string `protobuf:"bytes,5,rep,name=reserved_name,json=reservedName" json:"reserved_name,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + ReservedName []string `protobuf:"bytes,5,rep,name=reserved_name,json=reservedName" json:"reserved_name,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *EnumDescriptorProto) Reset() { @@ -998,12 +998,12 @@ func (x *EnumDescriptorProto) GetReservedName() []string { // Describes a value within an enum. type EnumValueDescriptorProto struct { - Name *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` - Number *int32 `protobuf:"varint,2,opt,name=number" json:"number,omitempty"` - Options *EnumValueOptions `protobuf:"bytes,3,opt,name=options" json:"options,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Name *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` + Number *int32 `protobuf:"varint,2,opt,name=number" json:"number,omitempty"` + Options *EnumValueOptions `protobuf:"bytes,3,opt,name=options" json:"options,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *EnumValueDescriptorProto) Reset() { @@ -1056,8 +1056,8 @@ type ServiceDescriptorProto struct { Method []*MethodDescriptorProto `protobuf:"bytes,2,rep,name=method" json:"method,omitempty"` Options *ServiceOptions `protobuf:"bytes,3,opt,name=options" json:"options,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *ServiceDescriptorProto) Reset() { @@ -1115,10 +1115,10 @@ type MethodDescriptorProto struct { // Identifies if client streams multiple client messages ClientStreaming *bool `protobuf:"varint,5,opt,name=client_streaming,json=clientStreaming,def=0" json:"client_streaming,omitempty"` // Identifies if server streams multiple server messages - ServerStreaming *bool `protobuf:"varint,6,opt,name=server_streaming,json=serverStreaming,def=0" json:"server_streaming,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + ServerStreaming *bool `protobuf:"varint,6,opt,name=server_streaming,json=serverStreaming,def=0" json:"server_streaming,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *MethodDescriptorProto) Reset() { @@ -1273,11 +1273,11 @@ type FileOptions struct { RubyPackage *string `protobuf:"bytes,45,opt,name=ruby_package,json=rubyPackage" json:"ruby_package,omitempty"` // The parser stores options it doesn't recognize here. // See the documentation for the "Options" section above. - UninterpretedOption []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_InternalExtensions protoimpl.ExtensionFieldsV1 `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + UninterpretedOption []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *FileOptions) Reset() { @@ -1522,11 +1522,11 @@ type MessageOptions struct { // parser. MapEntry *bool `protobuf:"varint,7,opt,name=map_entry,json=mapEntry" json:"map_entry,omitempty"` // The parser stores options it doesn't recognize here. See above. - UninterpretedOption []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_InternalExtensions protoimpl.ExtensionFieldsV1 `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + UninterpretedOption []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *MessageOptions) Reset() { @@ -1661,11 +1661,11 @@ type FieldOptions struct { // For Google-internal migration only. Do not use. Weak *bool `protobuf:"varint,10,opt,name=weak,def=0" json:"weak,omitempty"` // The parser stores options it doesn't recognize here. See above. - UninterpretedOption []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_InternalExtensions protoimpl.ExtensionFieldsV1 `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + UninterpretedOption []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *FieldOptions) Reset() { @@ -1757,11 +1757,11 @@ func (x *FieldOptions) GetUninterpretedOption() []*UninterpretedOption { type OneofOptions struct { // The parser stores options it doesn't recognize here. See above. - UninterpretedOption []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_InternalExtensions protoimpl.ExtensionFieldsV1 `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + UninterpretedOption []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *OneofOptions) Reset() { @@ -1813,11 +1813,11 @@ type EnumOptions struct { // is a formalization for deprecating enums. Deprecated *bool `protobuf:"varint,3,opt,name=deprecated,def=0" json:"deprecated,omitempty"` // The parser stores options it doesn't recognize here. See above. - UninterpretedOption []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_InternalExtensions protoimpl.ExtensionFieldsV1 `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + UninterpretedOption []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *EnumOptions) Reset() { @@ -1882,11 +1882,11 @@ type EnumValueOptions struct { // this is a formalization for deprecating enum values. Deprecated *bool `protobuf:"varint,1,opt,name=deprecated,def=0" json:"deprecated,omitempty"` // The parser stores options it doesn't recognize here. See above. - UninterpretedOption []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_InternalExtensions protoimpl.ExtensionFieldsV1 `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + UninterpretedOption []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *EnumValueOptions) Reset() { @@ -1944,11 +1944,11 @@ type ServiceOptions struct { // this is a formalization for deprecating services. Deprecated *bool `protobuf:"varint,33,opt,name=deprecated,def=0" json:"deprecated,omitempty"` // The parser stores options it doesn't recognize here. See above. - UninterpretedOption []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_InternalExtensions protoimpl.ExtensionFieldsV1 `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + UninterpretedOption []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *ServiceOptions) Reset() { @@ -2007,11 +2007,11 @@ type MethodOptions struct { Deprecated *bool `protobuf:"varint,33,opt,name=deprecated,def=0" json:"deprecated,omitempty"` IdempotencyLevel *MethodOptions_IdempotencyLevel `protobuf:"varint,34,opt,name=idempotency_level,json=idempotencyLevel,enum=google.protobuf.MethodOptions_IdempotencyLevel,def=0" json:"idempotency_level,omitempty"` // The parser stores options it doesn't recognize here. See above. - UninterpretedOption []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_InternalExtensions protoimpl.ExtensionFieldsV1 `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + UninterpretedOption []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *MethodOptions) Reset() { @@ -2080,15 +2080,15 @@ type UninterpretedOption struct { Name []*UninterpretedOption_NamePart `protobuf:"bytes,2,rep,name=name" json:"name,omitempty"` // The value of the uninterpreted option, in whatever type the tokenizer // identified it as during parsing. Exactly one of these should be set. - IdentifierValue *string `protobuf:"bytes,3,opt,name=identifier_value,json=identifierValue" json:"identifier_value,omitempty"` - PositiveIntValue *uint64 `protobuf:"varint,4,opt,name=positive_int_value,json=positiveIntValue" json:"positive_int_value,omitempty"` - NegativeIntValue *int64 `protobuf:"varint,5,opt,name=negative_int_value,json=negativeIntValue" json:"negative_int_value,omitempty"` - DoubleValue *float64 `protobuf:"fixed64,6,opt,name=double_value,json=doubleValue" json:"double_value,omitempty"` - StringValue []byte `protobuf:"bytes,7,opt,name=string_value,json=stringValue" json:"string_value,omitempty"` - AggregateValue *string `protobuf:"bytes,8,opt,name=aggregate_value,json=aggregateValue" json:"aggregate_value,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + IdentifierValue *string `protobuf:"bytes,3,opt,name=identifier_value,json=identifierValue" json:"identifier_value,omitempty"` + PositiveIntValue *uint64 `protobuf:"varint,4,opt,name=positive_int_value,json=positiveIntValue" json:"positive_int_value,omitempty"` + NegativeIntValue *int64 `protobuf:"varint,5,opt,name=negative_int_value,json=negativeIntValue" json:"negative_int_value,omitempty"` + DoubleValue *float64 `protobuf:"fixed64,6,opt,name=double_value,json=doubleValue" json:"double_value,omitempty"` + StringValue []byte `protobuf:"bytes,7,opt,name=string_value,json=stringValue" json:"string_value,omitempty"` + AggregateValue *string `protobuf:"bytes,8,opt,name=aggregate_value,json=aggregateValue" json:"aggregate_value,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *UninterpretedOption) Reset() { @@ -2211,8 +2211,8 @@ type SourceCodeInfo struct { // be recorded in the future. Location []*SourceCodeInfo_Location `protobuf:"bytes,1,rep,name=location" json:"location,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *SourceCodeInfo) Reset() { @@ -2253,8 +2253,8 @@ type GeneratedCodeInfo struct { // of its generating .proto file. Annotation []*GeneratedCodeInfo_Annotation `protobuf:"bytes,1,rep,name=annotation" json:"annotation,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *GeneratedCodeInfo) Reset() { @@ -2288,12 +2288,12 @@ func (x *GeneratedCodeInfo) GetAnnotation() []*GeneratedCodeInfo_Annotation { } type DescriptorProto_ExtensionRange struct { - Start *int32 `protobuf:"varint,1,opt,name=start" json:"start,omitempty"` - End *int32 `protobuf:"varint,2,opt,name=end" json:"end,omitempty"` - Options *ExtensionRangeOptions `protobuf:"bytes,3,opt,name=options" json:"options,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Start *int32 `protobuf:"varint,1,opt,name=start" json:"start,omitempty"` + End *int32 `protobuf:"varint,2,opt,name=end" json:"end,omitempty"` + Options *ExtensionRangeOptions `protobuf:"bytes,3,opt,name=options" json:"options,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *DescriptorProto_ExtensionRange) Reset() { @@ -2344,11 +2344,11 @@ func (x *DescriptorProto_ExtensionRange) GetOptions() *ExtensionRangeOptions { // fields or extension ranges in the same message. Reserved ranges may // not overlap. type DescriptorProto_ReservedRange struct { - Start *int32 `protobuf:"varint,1,opt,name=start" json:"start,omitempty"` - End *int32 `protobuf:"varint,2,opt,name=end" json:"end,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Start *int32 `protobuf:"varint,1,opt,name=start" json:"start,omitempty"` + End *int32 `protobuf:"varint,2,opt,name=end" json:"end,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *DescriptorProto_ReservedRange) Reset() { @@ -2395,11 +2395,11 @@ func (x *DescriptorProto_ReservedRange) GetEnd() int32 { // is inclusive such that it can appropriately represent the entire int32 // domain. type EnumDescriptorProto_EnumReservedRange struct { - Start *int32 `protobuf:"varint,1,opt,name=start" json:"start,omitempty"` - End *int32 `protobuf:"varint,2,opt,name=end" json:"end,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Start *int32 `protobuf:"varint,1,opt,name=start" json:"start,omitempty"` + End *int32 `protobuf:"varint,2,opt,name=end" json:"end,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *EnumDescriptorProto_EnumReservedRange) Reset() { @@ -2445,11 +2445,11 @@ func (x *EnumDescriptorProto_EnumReservedRange) GetEnd() int32 { // E.g.,{ ["foo", false], ["bar.baz", true], ["qux", false] } represents // "foo.(bar.baz).qux". type UninterpretedOption_NamePart struct { - NamePart *string `protobuf:"bytes,1,req,name=name_part,json=namePart" json:"name_part,omitempty"` - IsExtension *bool `protobuf:"varint,2,req,name=is_extension,json=isExtension" json:"is_extension,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + NamePart *string `protobuf:"bytes,1,req,name=name_part,json=namePart" json:"name_part,omitempty"` + IsExtension *bool `protobuf:"varint,2,req,name=is_extension,json=isExtension" json:"is_extension,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *UninterpretedOption_NamePart) Reset() { @@ -2567,12 +2567,12 @@ type SourceCodeInfo_Location struct { // optional int32 grault = 6; // // // ignored detached comments. - LeadingComments *string `protobuf:"bytes,3,opt,name=leading_comments,json=leadingComments" json:"leading_comments,omitempty"` - TrailingComments *string `protobuf:"bytes,4,opt,name=trailing_comments,json=trailingComments" json:"trailing_comments,omitempty"` - LeadingDetachedComments []string `protobuf:"bytes,6,rep,name=leading_detached_comments,json=leadingDetachedComments" json:"leading_detached_comments,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + LeadingComments *string `protobuf:"bytes,3,opt,name=leading_comments,json=leadingComments" json:"leading_comments,omitempty"` + TrailingComments *string `protobuf:"bytes,4,opt,name=trailing_comments,json=trailingComments" json:"trailing_comments,omitempty"` + LeadingDetachedComments []string `protobuf:"bytes,6,rep,name=leading_detached_comments,json=leadingDetachedComments" json:"leading_detached_comments,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *SourceCodeInfo_Location) Reset() { @@ -2645,10 +2645,10 @@ type GeneratedCodeInfo_Annotation struct { // Identifies the ending offset in bytes in the generated code that // relates to the identified offset. The end offset should be one past // the last relevant byte (so the length of the text = end - begin). - End *int32 `protobuf:"varint,4,opt,name=end" json:"end,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + End *int32 `protobuf:"varint,4,opt,name=end" json:"end,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *GeneratedCodeInfo_Annotation) Reset() { diff --git a/types/known/any.pb.go b/types/known/any.pb.go index ca5b5bd6..ee1396cf 100644 --- a/types/known/any.pb.go +++ b/types/known/any.pb.go @@ -124,10 +124,10 @@ type Any struct { // TypeUrl string `protobuf:"bytes,1,opt,name=type_url,json=typeUrl,proto3" json:"type_url,omitempty"` // Must be a valid serialized protocol buffer of the above specified type. - Value []byte `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Value []byte `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Any) Reset() { diff --git a/types/known/api.pb.go b/types/known/api.pb.go index 10986727..cdd0563e 100644 --- a/types/known/api.pb.go +++ b/types/known/api.pb.go @@ -58,10 +58,10 @@ type Api struct { // Included interfaces. See [Mixin][]. Mixins []*Mixin `protobuf:"bytes,6,rep,name=mixins,proto3" json:"mixins,omitempty"` // The source syntax of the service. - Syntax Syntax `protobuf:"varint,7,opt,name=syntax,proto3,enum=google.protobuf.Syntax" json:"syntax,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Syntax Syntax `protobuf:"varint,7,opt,name=syntax,proto3,enum=google.protobuf.Syntax" json:"syntax,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Api) Reset() { @@ -151,10 +151,10 @@ type Method struct { // Any metadata attached to the method. Options []*Option `protobuf:"bytes,6,rep,name=options,proto3" json:"options,omitempty"` // The source syntax of this method. - Syntax Syntax `protobuf:"varint,7,opt,name=syntax,proto3,enum=google.protobuf.Syntax" json:"syntax,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Syntax Syntax `protobuf:"varint,7,opt,name=syntax,proto3,enum=google.protobuf.Syntax" json:"syntax,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Method) Reset() { @@ -312,10 +312,10 @@ type Mixin struct { Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` // If non-empty specifies a path under which inherited HTTP paths // are rooted. - Root string `protobuf:"bytes,2,opt,name=root,proto3" json:"root,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Root string `protobuf:"bytes,2,opt,name=root,proto3" json:"root,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Mixin) Reset() { diff --git a/types/known/duration.pb.go b/types/known/duration.pb.go index fefa77e7..27835939 100644 --- a/types/known/duration.pb.go +++ b/types/known/duration.pb.go @@ -84,10 +84,10 @@ type Duration struct { // of one second or more, a non-zero value for the `nanos` field must be // of the same sign as the `seconds` field. Must be from -999,999,999 // to +999,999,999 inclusive. - Nanos int32 `protobuf:"varint,2,opt,name=nanos,proto3" json:"nanos,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Nanos int32 `protobuf:"varint,2,opt,name=nanos,proto3" json:"nanos,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Duration) Reset() { diff --git a/types/known/empty.pb.go b/types/known/empty.pb.go index dab3c116..3b1a6624 100644 --- a/types/known/empty.pb.go +++ b/types/known/empty.pb.go @@ -23,9 +23,9 @@ const _ = protoimpl.EnforceVersion(protoimpl.Version - 0) // // The JSON representation for `Empty` is empty JSON object `{}`. type Empty struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Empty) Reset() { diff --git a/types/known/field_mask.pb.go b/types/known/field_mask.pb.go index 6a6d36d5..3174b910 100644 --- a/types/known/field_mask.pb.go +++ b/types/known/field_mask.pb.go @@ -214,10 +214,10 @@ const _ = protoimpl.EnforceVersion(protoimpl.Version - 0) // `INVALID_ARGUMENT` error if any path is duplicated or unmappable. type FieldMask struct { // The set of field mask paths. - Paths []string `protobuf:"bytes,1,rep,name=paths,proto3" json:"paths,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Paths []string `protobuf:"bytes,1,rep,name=paths,proto3" json:"paths,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *FieldMask) Reset() { diff --git a/types/known/source_context.pb.go b/types/known/source_context.pb.go index f00d77d9..5538d09c 100644 --- a/types/known/source_context.pb.go +++ b/types/known/source_context.pb.go @@ -18,10 +18,10 @@ const _ = protoimpl.EnforceVersion(protoimpl.Version - 0) type SourceContext struct { // The path-qualified name of the .proto file that contained the associated // protobuf element. For example: `"google/protobuf/source_context.proto"`. - FileName string `protobuf:"bytes,1,opt,name=file_name,json=fileName,proto3" json:"file_name,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + FileName string `protobuf:"bytes,1,opt,name=file_name,json=fileName,proto3" json:"file_name,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *SourceContext) Reset() { diff --git a/types/known/struct.pb.go b/types/known/struct.pb.go index 72af0368..f5c876e6 100644 --- a/types/known/struct.pb.go +++ b/types/known/struct.pb.go @@ -63,10 +63,10 @@ func (NullValue) XXX_WellKnownType() string { return "NullValue" } // The JSON representation for `Struct` is JSON object. type Struct struct { // Unordered map of dynamically typed values. - Fields map[string]*Value `protobuf:"bytes,1,rep,name=fields,proto3" json:"fields,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Fields map[string]*Value `protobuf:"bytes,1,rep,name=fields,proto3" json:"fields,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Struct) Reset() { @@ -123,10 +123,10 @@ type Value struct { // *Value_StructValue // Represents a repeated `Value`. // *Value_ListValue - Kind isValue_Kind `protobuf_oneof:"kind"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Kind isValue_Kind `protobuf_oneof:"kind"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Value) Reset() { @@ -260,10 +260,10 @@ func (*Value_ListValue) isValue_Kind() {} // The JSON representation for `ListValue` is JSON array. type ListValue struct { // Repeated field of dynamically typed values. - Values []*Value `protobuf:"bytes,1,rep,name=values,proto3" json:"values,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Values []*Value `protobuf:"bytes,1,rep,name=values,proto3" json:"values,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *ListValue) Reset() { diff --git a/types/known/timestamp.pb.go b/types/known/timestamp.pb.go index 71fcc74c..3201e481 100644 --- a/types/known/timestamp.pb.go +++ b/types/known/timestamp.pb.go @@ -104,10 +104,10 @@ type Timestamp struct { // second values with fractions must still have non-negative nanos values // that count forward in time. Must be from 0 to 999,999,999 // inclusive. - Nanos int32 `protobuf:"varint,2,opt,name=nanos,proto3" json:"nanos,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Nanos int32 `protobuf:"varint,2,opt,name=nanos,proto3" json:"nanos,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Timestamp) Reset() { diff --git a/types/known/type.pb.go b/types/known/type.pb.go index ec25db58..b3b1ba2e 100644 --- a/types/known/type.pb.go +++ b/types/known/type.pb.go @@ -219,10 +219,10 @@ type Type struct { // The source context. SourceContext *SourceContext `protobuf:"bytes,5,opt,name=source_context,json=sourceContext,proto3" json:"source_context,omitempty"` // The source syntax. - Syntax Syntax `protobuf:"varint,6,opt,name=syntax,proto3,enum=google.protobuf.Syntax" json:"syntax,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Syntax Syntax `protobuf:"varint,6,opt,name=syntax,proto3,enum=google.protobuf.Syntax" json:"syntax,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Type) Reset() { @@ -313,10 +313,10 @@ type Field struct { // The field JSON name. JsonName string `protobuf:"bytes,10,opt,name=json_name,json=jsonName,proto3" json:"json_name,omitempty"` // The string value of the default value of this field. Proto2 syntax only. - DefaultValue string `protobuf:"bytes,11,opt,name=default_value,json=defaultValue,proto3" json:"default_value,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + DefaultValue string `protobuf:"bytes,11,opt,name=default_value,json=defaultValue,proto3" json:"default_value,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Field) Reset() { @@ -423,10 +423,10 @@ type Enum struct { // The source context. SourceContext *SourceContext `protobuf:"bytes,4,opt,name=source_context,json=sourceContext,proto3" json:"source_context,omitempty"` // The source syntax. - Syntax Syntax `protobuf:"varint,5,opt,name=syntax,proto3,enum=google.protobuf.Syntax" json:"syntax,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Syntax Syntax `protobuf:"varint,5,opt,name=syntax,proto3,enum=google.protobuf.Syntax" json:"syntax,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Enum) Reset() { @@ -494,10 +494,10 @@ type EnumValue struct { // Enum value number. Number int32 `protobuf:"varint,2,opt,name=number,proto3" json:"number,omitempty"` // Protocol buffer options. - Options []*Option `protobuf:"bytes,3,rep,name=options,proto3" json:"options,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Options []*Option `protobuf:"bytes,3,rep,name=options,proto3" json:"options,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *EnumValue) Reset() { @@ -556,10 +556,10 @@ type Option struct { // the corresponding wrapper type defined in google/protobuf/wrappers.proto // should be used. If the value is an enum, it should be stored as an int32 // value using the google.protobuf.Int32Value type. - Value *Any `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Value *Any `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Option) Reset() { diff --git a/types/known/wrappers.pb.go b/types/known/wrappers.pb.go index da81920c..143bd9c7 100644 --- a/types/known/wrappers.pb.go +++ b/types/known/wrappers.pb.go @@ -18,10 +18,10 @@ const _ = protoimpl.EnforceVersion(protoimpl.Version - 0) // The JSON representation for `DoubleValue` is JSON number. type DoubleValue struct { // The double value. - Value float64 `protobuf:"fixed64,1,opt,name=value,proto3" json:"value,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Value float64 `protobuf:"fixed64,1,opt,name=value,proto3" json:"value,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *DoubleValue) Reset() { @@ -61,10 +61,10 @@ func (x *DoubleValue) GetValue() float64 { // The JSON representation for `FloatValue` is JSON number. type FloatValue struct { // The float value. - Value float32 `protobuf:"fixed32,1,opt,name=value,proto3" json:"value,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Value float32 `protobuf:"fixed32,1,opt,name=value,proto3" json:"value,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *FloatValue) Reset() { @@ -104,10 +104,10 @@ func (x *FloatValue) GetValue() float32 { // The JSON representation for `Int64Value` is JSON string. type Int64Value struct { // The int64 value. - Value int64 `protobuf:"varint,1,opt,name=value,proto3" json:"value,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Value int64 `protobuf:"varint,1,opt,name=value,proto3" json:"value,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Int64Value) Reset() { @@ -147,10 +147,10 @@ func (x *Int64Value) GetValue() int64 { // The JSON representation for `UInt64Value` is JSON string. type UInt64Value struct { // The uint64 value. - Value uint64 `protobuf:"varint,1,opt,name=value,proto3" json:"value,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Value uint64 `protobuf:"varint,1,opt,name=value,proto3" json:"value,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *UInt64Value) Reset() { @@ -190,10 +190,10 @@ func (x *UInt64Value) GetValue() uint64 { // The JSON representation for `Int32Value` is JSON number. type Int32Value struct { // The int32 value. - Value int32 `protobuf:"varint,1,opt,name=value,proto3" json:"value,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Value int32 `protobuf:"varint,1,opt,name=value,proto3" json:"value,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Int32Value) Reset() { @@ -233,10 +233,10 @@ func (x *Int32Value) GetValue() int32 { // The JSON representation for `UInt32Value` is JSON number. type UInt32Value struct { // The uint32 value. - Value uint32 `protobuf:"varint,1,opt,name=value,proto3" json:"value,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Value uint32 `protobuf:"varint,1,opt,name=value,proto3" json:"value,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *UInt32Value) Reset() { @@ -276,10 +276,10 @@ func (x *UInt32Value) GetValue() uint32 { // The JSON representation for `BoolValue` is JSON `true` and `false`. type BoolValue struct { // The bool value. - Value bool `protobuf:"varint,1,opt,name=value,proto3" json:"value,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Value bool `protobuf:"varint,1,opt,name=value,proto3" json:"value,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *BoolValue) Reset() { @@ -319,10 +319,10 @@ func (x *BoolValue) GetValue() bool { // The JSON representation for `StringValue` is JSON string. type StringValue struct { // The string value. - Value string `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Value string `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *StringValue) Reset() { @@ -362,10 +362,10 @@ func (x *StringValue) GetValue() string { // The JSON representation for `BytesValue` is JSON string. type BytesValue struct { // The bytes value. - Value []byte `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Value []byte `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *BytesValue) Reset() { diff --git a/types/plugin/plugin.pb.go b/types/plugin/plugin.pb.go index 4a31517d..e7606d58 100644 --- a/types/plugin/plugin.pb.go +++ b/types/plugin/plugin.pb.go @@ -21,10 +21,10 @@ type Version struct { Patch *int32 `protobuf:"varint,3,opt,name=patch" json:"patch,omitempty"` // A suffix for alpha, beta or rc release, e.g., "alpha-1", "rc2". It should // be empty for mainline stable releases. - Suffix *string `protobuf:"bytes,4,opt,name=suffix" json:"suffix,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Suffix *string `protobuf:"bytes,4,opt,name=suffix" json:"suffix,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *Version) Reset() { @@ -102,10 +102,10 @@ type CodeGeneratorRequest struct { // fully qualified. ProtoFile []*descriptor.FileDescriptorProto `protobuf:"bytes,15,rep,name=proto_file,json=protoFile" json:"proto_file,omitempty"` // The version number of protocol compiler. - CompilerVersion *Version `protobuf:"bytes,3,opt,name=compiler_version,json=compilerVersion" json:"compiler_version,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + CompilerVersion *Version `protobuf:"bytes,3,opt,name=compiler_version,json=compilerVersion" json:"compiler_version,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *CodeGeneratorRequest) Reset() { @@ -172,8 +172,8 @@ type CodeGeneratorResponse struct { Error *string `protobuf:"bytes,1,opt,name=error" json:"error,omitempty"` File []*CodeGeneratorResponse_File `protobuf:"bytes,15,rep,name=file" json:"file,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *CodeGeneratorResponse) Reset() { @@ -266,10 +266,10 @@ type CodeGeneratorResponse_File struct { // If |insertion_point| is present, |name| must also be present. InsertionPoint *string `protobuf:"bytes,2,opt,name=insertion_point,json=insertionPoint" json:"insertion_point,omitempty"` // The file contents. - Content *string `protobuf:"bytes,15,opt,name=content" json:"content,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Content *string `protobuf:"bytes,15,opt,name=content" json:"content,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized protoimpl.UnknownFields `json:"-"` + XXX_sizecache protoimpl.SizeCache `json:"-"` } func (x *CodeGeneratorResponse_File) Reset() {