vendor: update gogo/protobuf dependency
Updates to the gogo/protobuf dependency are required to correctly generate time types. We also remove an unused windows dependency. Signed-off-by: Stephen J Day <stephen.day@docker.com>
This commit is contained in:
parent
3fdd1a688d
commit
4cb31d9615
21 changed files with 402 additions and 403 deletions
|
@ -984,7 +984,24 @@ func (m *User) Unmarshal(dAtA []byte) error {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
case 3:
|
case 3:
|
||||||
if wireType == 2 {
|
if wireType == 0 {
|
||||||
|
var v uint32
|
||||||
|
for shift := uint(0); ; shift += 7 {
|
||||||
|
if shift >= 64 {
|
||||||
|
return ErrIntOverflowContainer
|
||||||
|
}
|
||||||
|
if iNdEx >= l {
|
||||||
|
return io.ErrUnexpectedEOF
|
||||||
|
}
|
||||||
|
b := dAtA[iNdEx]
|
||||||
|
iNdEx++
|
||||||
|
v |= (uint32(b) & 0x7F) << shift
|
||||||
|
if b < 0x80 {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
m.AdditionalGids = append(m.AdditionalGids, v)
|
||||||
|
} else if wireType == 2 {
|
||||||
var packedLen int
|
var packedLen int
|
||||||
for shift := uint(0); ; shift += 7 {
|
for shift := uint(0); ; shift += 7 {
|
||||||
if shift >= 64 {
|
if shift >= 64 {
|
||||||
|
@ -1025,23 +1042,6 @@ func (m *User) Unmarshal(dAtA []byte) error {
|
||||||
}
|
}
|
||||||
m.AdditionalGids = append(m.AdditionalGids, v)
|
m.AdditionalGids = append(m.AdditionalGids, v)
|
||||||
}
|
}
|
||||||
} else if wireType == 0 {
|
|
||||||
var v uint32
|
|
||||||
for shift := uint(0); ; shift += 7 {
|
|
||||||
if shift >= 64 {
|
|
||||||
return ErrIntOverflowContainer
|
|
||||||
}
|
|
||||||
if iNdEx >= l {
|
|
||||||
return io.ErrUnexpectedEOF
|
|
||||||
}
|
|
||||||
b := dAtA[iNdEx]
|
|
||||||
iNdEx++
|
|
||||||
v |= (uint32(b) & 0x7F) << shift
|
|
||||||
if b < 0x80 {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
m.AdditionalGids = append(m.AdditionalGids, v)
|
|
||||||
} else {
|
} else {
|
||||||
return fmt.Errorf("proto: wrong wireType = %d for field AdditionalGids", wireType)
|
return fmt.Errorf("proto: wrong wireType = %d for field AdditionalGids", wireType)
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,8 +18,8 @@ github.com/beorn7/perks 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9
|
||||||
github.com/matttproud/golang_protobuf_extensions v1.0.0
|
github.com/matttproud/golang_protobuf_extensions v1.0.0
|
||||||
# go-units from Docker; latest release as of 12/16/2016
|
# go-units from Docker; latest release as of 12/16/2016
|
||||||
github.com/docker/go-units v0.3.1
|
github.com/docker/go-units v0.3.1
|
||||||
# gogo/protobuf - master as of 12/16/2016 (latest tagged release doesn't have needed change)
|
# gogo/protobuf - master as of 2/15/2016 (latest tagged release doesn't have needed change)
|
||||||
github.com/gogo/protobuf 06ec6c31ff1bac6ed4e205a547a3d72934813ef3
|
github.com/gogo/protobuf d2e1ade2d719b78fe5b061b4c18a9f7111b5bdc8
|
||||||
# golang support for protobufs - master as of 12/16/2016
|
# golang support for protobufs - master as of 12/16/2016
|
||||||
github.com/golang/protobuf 8ee79997227bf9b34611aee7946ae64735e6fd93
|
github.com/golang/protobuf 8ee79997227bf9b34611aee7946ae64735e6fd93
|
||||||
# runc, latest release as of 12/16/2016
|
# runc, latest release as of 12/16/2016
|
||||||
|
|
187
vendor/github.com/gogo/protobuf/gogoproto/gogo.pb.go
generated
vendored
187
vendor/github.com/gogo/protobuf/gogoproto/gogo.pb.go
generated
vendored
|
@ -64,6 +64,15 @@ var E_EnumCustomname = &proto.ExtensionDesc{
|
||||||
Filename: "gogo.proto",
|
Filename: "gogo.proto",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var E_Enumdecl = &proto.ExtensionDesc{
|
||||||
|
ExtendedType: (*google_protobuf.EnumOptions)(nil),
|
||||||
|
ExtensionType: (*bool)(nil),
|
||||||
|
Field: 62024,
|
||||||
|
Name: "gogoproto.enumdecl",
|
||||||
|
Tag: "varint,62024,opt,name=enumdecl",
|
||||||
|
Filename: "gogo.proto",
|
||||||
|
}
|
||||||
|
|
||||||
var E_EnumvalueCustomname = &proto.ExtensionDesc{
|
var E_EnumvalueCustomname = &proto.ExtensionDesc{
|
||||||
ExtendedType: (*google_protobuf.EnumValueOptions)(nil),
|
ExtendedType: (*google_protobuf.EnumValueOptions)(nil),
|
||||||
ExtensionType: (*string)(nil),
|
ExtensionType: (*string)(nil),
|
||||||
|
@ -307,6 +316,24 @@ var E_CompareAll = &proto.ExtensionDesc{
|
||||||
Filename: "gogo.proto",
|
Filename: "gogo.proto",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var E_TypedeclAll = &proto.ExtensionDesc{
|
||||||
|
ExtendedType: (*google_protobuf.FileOptions)(nil),
|
||||||
|
ExtensionType: (*bool)(nil),
|
||||||
|
Field: 63030,
|
||||||
|
Name: "gogoproto.typedecl_all",
|
||||||
|
Tag: "varint,63030,opt,name=typedecl_all,json=typedeclAll",
|
||||||
|
Filename: "gogo.proto",
|
||||||
|
}
|
||||||
|
|
||||||
|
var E_EnumdeclAll = &proto.ExtensionDesc{
|
||||||
|
ExtendedType: (*google_protobuf.FileOptions)(nil),
|
||||||
|
ExtensionType: (*bool)(nil),
|
||||||
|
Field: 63031,
|
||||||
|
Name: "gogoproto.enumdecl_all",
|
||||||
|
Tag: "varint,63031,opt,name=enumdecl_all,json=enumdeclAll",
|
||||||
|
Filename: "gogo.proto",
|
||||||
|
}
|
||||||
|
|
||||||
var E_GoprotoGetters = &proto.ExtensionDesc{
|
var E_GoprotoGetters = &proto.ExtensionDesc{
|
||||||
ExtendedType: (*google_protobuf.MessageOptions)(nil),
|
ExtendedType: (*google_protobuf.MessageOptions)(nil),
|
||||||
ExtensionType: (*bool)(nil),
|
ExtensionType: (*bool)(nil),
|
||||||
|
@ -505,6 +532,15 @@ var E_Compare = &proto.ExtensionDesc{
|
||||||
Filename: "gogo.proto",
|
Filename: "gogo.proto",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var E_Typedecl = &proto.ExtensionDesc{
|
||||||
|
ExtendedType: (*google_protobuf.MessageOptions)(nil),
|
||||||
|
ExtensionType: (*bool)(nil),
|
||||||
|
Field: 64030,
|
||||||
|
Name: "gogoproto.typedecl",
|
||||||
|
Tag: "varint,64030,opt,name=typedecl",
|
||||||
|
Filename: "gogo.proto",
|
||||||
|
}
|
||||||
|
|
||||||
var E_Nullable = &proto.ExtensionDesc{
|
var E_Nullable = &proto.ExtensionDesc{
|
||||||
ExtendedType: (*google_protobuf.FieldOptions)(nil),
|
ExtendedType: (*google_protobuf.FieldOptions)(nil),
|
||||||
ExtensionType: (*bool)(nil),
|
ExtensionType: (*bool)(nil),
|
||||||
|
@ -609,6 +645,7 @@ func init() {
|
||||||
proto.RegisterExtension(E_GoprotoEnumStringer)
|
proto.RegisterExtension(E_GoprotoEnumStringer)
|
||||||
proto.RegisterExtension(E_EnumStringer)
|
proto.RegisterExtension(E_EnumStringer)
|
||||||
proto.RegisterExtension(E_EnumCustomname)
|
proto.RegisterExtension(E_EnumCustomname)
|
||||||
|
proto.RegisterExtension(E_Enumdecl)
|
||||||
proto.RegisterExtension(E_EnumvalueCustomname)
|
proto.RegisterExtension(E_EnumvalueCustomname)
|
||||||
proto.RegisterExtension(E_GoprotoGettersAll)
|
proto.RegisterExtension(E_GoprotoGettersAll)
|
||||||
proto.RegisterExtension(E_GoprotoEnumPrefixAll)
|
proto.RegisterExtension(E_GoprotoEnumPrefixAll)
|
||||||
|
@ -636,6 +673,8 @@ func init() {
|
||||||
proto.RegisterExtension(E_GogoprotoImport)
|
proto.RegisterExtension(E_GogoprotoImport)
|
||||||
proto.RegisterExtension(E_ProtosizerAll)
|
proto.RegisterExtension(E_ProtosizerAll)
|
||||||
proto.RegisterExtension(E_CompareAll)
|
proto.RegisterExtension(E_CompareAll)
|
||||||
|
proto.RegisterExtension(E_TypedeclAll)
|
||||||
|
proto.RegisterExtension(E_EnumdeclAll)
|
||||||
proto.RegisterExtension(E_GoprotoGetters)
|
proto.RegisterExtension(E_GoprotoGetters)
|
||||||
proto.RegisterExtension(E_GoprotoStringer)
|
proto.RegisterExtension(E_GoprotoStringer)
|
||||||
proto.RegisterExtension(E_VerboseEqual)
|
proto.RegisterExtension(E_VerboseEqual)
|
||||||
|
@ -658,6 +697,7 @@ func init() {
|
||||||
proto.RegisterExtension(E_GoprotoUnrecognized)
|
proto.RegisterExtension(E_GoprotoUnrecognized)
|
||||||
proto.RegisterExtension(E_Protosizer)
|
proto.RegisterExtension(E_Protosizer)
|
||||||
proto.RegisterExtension(E_Compare)
|
proto.RegisterExtension(E_Compare)
|
||||||
|
proto.RegisterExtension(E_Typedecl)
|
||||||
proto.RegisterExtension(E_Nullable)
|
proto.RegisterExtension(E_Nullable)
|
||||||
proto.RegisterExtension(E_Embed)
|
proto.RegisterExtension(E_Embed)
|
||||||
proto.RegisterExtension(E_Customtype)
|
proto.RegisterExtension(E_Customtype)
|
||||||
|
@ -674,76 +714,79 @@ func init() {
|
||||||
func init() { proto.RegisterFile("gogo.proto", fileDescriptorGogo) }
|
func init() { proto.RegisterFile("gogo.proto", fileDescriptorGogo) }
|
||||||
|
|
||||||
var fileDescriptorGogo = []byte{
|
var fileDescriptorGogo = []byte{
|
||||||
// 1129 bytes of a gzipped FileDescriptorProto
|
// 1178 bytes of a gzipped FileDescriptorProto
|
||||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x94, 0x97, 0xc9, 0x6f, 0x1c, 0x45,
|
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x94, 0x98, 0x4b, 0x6f, 0x1c, 0x45,
|
||||||
0x14, 0x87, 0x85, 0x70, 0x64, 0xcf, 0xf3, 0x86, 0xc7, 0xc6, 0x84, 0x08, 0x44, 0x72, 0xe3, 0xe4,
|
0x10, 0x80, 0x85, 0x48, 0x64, 0x6f, 0xf9, 0x85, 0xd7, 0xc6, 0x84, 0x08, 0x44, 0x72, 0xe3, 0xe4,
|
||||||
0x9c, 0x22, 0x94, 0xb2, 0x22, 0xcb, 0xb1, 0x9c, 0x51, 0x10, 0x86, 0x91, 0x89, 0x03, 0x88, 0xc3,
|
0x9c, 0x22, 0x94, 0xb6, 0x22, 0xcb, 0xb1, 0x1c, 0x2b, 0x08, 0x83, 0x65, 0xe2, 0x00, 0xe2, 0xb0,
|
||||||
0xa8, 0x67, 0xa6, 0xdc, 0x69, 0xe8, 0xee, 0x6a, 0xba, 0xaa, 0xa3, 0x38, 0x37, 0x14, 0x16, 0x21,
|
0x1a, 0xef, 0xb6, 0x27, 0x0b, 0x33, 0xd3, 0xc3, 0x74, 0x4f, 0x14, 0xe7, 0x86, 0xc2, 0x43, 0x08,
|
||||||
0xc4, 0x8e, 0x04, 0x09, 0x09, 0xcb, 0x81, 0x7d, 0x0d, 0xcb, 0x9d, 0x0b, 0x70, 0xe6, 0x7f, 0xe0,
|
0xf1, 0x46, 0x82, 0x84, 0x24, 0xc0, 0x81, 0xf7, 0x33, 0x3c, 0xaf, 0x5c, 0x78, 0x5c, 0xf9, 0x0f,
|
||||||
0x02, 0x84, 0xdd, 0x37, 0x5f, 0x50, 0x75, 0xbf, 0xd7, 0x53, 0xdd, 0x1e, 0xa9, 0x6a, 0x6e, 0xe3,
|
0x5c, 0x00, 0xf3, 0xf6, 0xcd, 0x17, 0x54, 0x33, 0x55, 0xb3, 0xbd, 0xeb, 0x95, 0xba, 0xf7, 0x36,
|
||||||
0x71, 0x7d, 0xdf, 0x54, 0xbf, 0x37, 0xf5, 0x7e, 0x53, 0x00, 0xbe, 0xf0, 0xc5, 0x52, 0x92, 0x0a,
|
0xbb, 0xee, 0xef, 0xdb, 0x9a, 0xaa, 0xe9, 0xaa, 0x69, 0x03, 0x84, 0x2a, 0x54, 0xb3, 0x69, 0xa6,
|
||||||
0x25, 0x9a, 0x0d, 0xfd, 0x3a, 0x7f, 0x79, 0xe8, 0xb0, 0x2f, 0x84, 0x1f, 0xf2, 0xa3, 0xf9, 0x5f,
|
0x8c, 0xaa, 0xd7, 0xf0, 0xba, 0xb8, 0x3c, 0x78, 0x28, 0x54, 0x2a, 0x8c, 0xe4, 0x91, 0xe2, 0xd3,
|
||||||
0xdd, 0x6c, 0xfb, 0x68, 0x9f, 0xcb, 0x5e, 0x1a, 0x24, 0x4a, 0xa4, 0xc5, 0x62, 0x76, 0x3f, 0xcc,
|
0x46, 0xbe, 0x79, 0xa4, 0x25, 0x75, 0x33, 0x6b, 0xa7, 0x46, 0x65, 0xe5, 0x62, 0x71, 0x2f, 0x4c,
|
||||||
0xe3, 0xe2, 0x0e, 0x8f, 0xb3, 0xa8, 0x93, 0xa4, 0x7c, 0x3b, 0xb8, 0xd0, 0xbc, 0x63, 0xa9, 0x20,
|
0xd1, 0xe2, 0x86, 0x4c, 0xf2, 0xb8, 0x91, 0x66, 0x72, 0xb3, 0x7d, 0xbe, 0x7e, 0xdb, 0x6c, 0x49,
|
||||||
0x97, 0x88, 0x5c, 0x5a, 0x8f, 0xb3, 0xe8, 0x81, 0x44, 0x05, 0x22, 0x96, 0x07, 0xaf, 0xff, 0x72,
|
0xce, 0x32, 0x39, 0xbb, 0x94, 0xe4, 0xf1, 0x7d, 0xa9, 0x69, 0xab, 0x44, 0x1f, 0xb8, 0xfe, 0xcb,
|
||||||
0xf3, 0xe1, 0x9b, 0xee, 0x9e, 0xd8, 0x9c, 0x43, 0x54, 0xff, 0xaf, 0x9d, 0x83, 0x6c, 0x13, 0x6e,
|
0x8d, 0x87, 0x6e, 0xb8, 0x73, 0x78, 0x6d, 0x92, 0x50, 0xfc, 0xdb, 0x6a, 0x01, 0x8a, 0x35, 0xb8,
|
||||||
0xad, 0xf8, 0xa4, 0x4a, 0x83, 0xd8, 0xe7, 0xa9, 0xc5, 0xf8, 0x03, 0x1a, 0xe7, 0x0d, 0xe3, 0x83,
|
0xb9, 0xcb, 0xa7, 0x4d, 0xd6, 0x4e, 0x42, 0x99, 0x39, 0x8c, 0xdf, 0x93, 0x71, 0xca, 0x32, 0xde,
|
||||||
0x88, 0xb2, 0x35, 0x98, 0x1e, 0xc5, 0xf5, 0x23, 0xba, 0xa6, 0xb8, 0x29, 0x69, 0xc1, 0x6c, 0x2e,
|
0x4f, 0xa8, 0x58, 0x84, 0xb1, 0x41, 0x5c, 0x3f, 0x90, 0x6b, 0x54, 0xda, 0x92, 0x65, 0x98, 0x28,
|
||||||
0xe9, 0x65, 0x52, 0x89, 0x28, 0xf6, 0x22, 0x6e, 0xd1, 0xfc, 0x94, 0x6b, 0x1a, 0x9b, 0x33, 0x1a,
|
0x24, 0xcd, 0x5c, 0x1b, 0x15, 0x27, 0x41, 0x2c, 0x1d, 0x9a, 0x1f, 0x0b, 0x4d, 0x6d, 0x6d, 0x1c,
|
||||||
0x5b, 0x2b, 0x29, 0x76, 0x16, 0x16, 0xf4, 0x3b, 0xe7, 0xbd, 0x30, 0xe3, 0xa6, 0xed, 0xc8, 0x50,
|
0xb1, 0xc5, 0x8a, 0x12, 0x02, 0x86, 0xf1, 0x9b, 0x96, 0x6c, 0x46, 0x0e, 0xc3, 0x4f, 0x14, 0x48,
|
||||||
0xdb, 0x59, 0xbd, 0x8c, 0x94, 0x3f, 0x5f, 0x1a, 0xcb, 0x95, 0xf3, 0xa5, 0xc0, 0xf0, 0x1a, 0x9d,
|
0xb5, 0x5e, 0x9c, 0x81, 0x69, 0xbc, 0x3e, 0x17, 0x44, 0xb9, 0xb4, 0x23, 0x39, 0xdc, 0xd7, 0x73,
|
||||||
0xf0, 0xb9, 0x52, 0x3c, 0x95, 0x1d, 0x2f, 0x0c, 0x87, 0x6c, 0xf2, 0x54, 0x10, 0x96, 0xc6, 0xcb,
|
0x06, 0x97, 0xb1, 0xec, 0xe7, 0x8b, 0xfb, 0x8a, 0x70, 0xa6, 0x2a, 0x81, 0x15, 0x93, 0x55, 0xc5,
|
||||||
0x37, 0xaa, 0x9d, 0x68, 0x15, 0xe4, 0x6a, 0x18, 0xb2, 0x2d, 0xb8, 0x6d, 0x48, 0x67, 0x1d, 0x9c,
|
0x50, 0x1a, 0x23, 0x33, 0xdd, 0x08, 0xa2, 0x7e, 0xe1, 0x9d, 0x6c, 0x47, 0x95, 0xf1, 0xd2, 0x76,
|
||||||
0x57, 0xd0, 0xb9, 0xb0, 0xaf, 0xbb, 0x5a, 0xdb, 0x06, 0x7a, 0xbf, 0xec, 0x87, 0x83, 0xf3, 0x2d,
|
0x77, 0x15, 0x97, 0x4b, 0x72, 0x21, 0x8a, 0xc4, 0x3a, 0xdc, 0xd2, 0xe7, 0xa9, 0xf0, 0x70, 0x5e,
|
||||||
0x74, 0x36, 0x91, 0xa5, 0xb6, 0x68, 0xe3, 0xbd, 0x30, 0x77, 0x9e, 0xa7, 0x5d, 0x21, 0x79, 0x87,
|
0x26, 0xe7, 0xf4, 0x9e, 0x27, 0x03, 0xb5, 0xab, 0xc0, 0xdf, 0x57, 0xb5, 0xf4, 0x70, 0xbe, 0x41,
|
||||||
0x3f, 0x91, 0x79, 0xa1, 0x83, 0xee, 0x2a, 0xea, 0x66, 0x11, 0x5c, 0xd7, 0x9c, 0x76, 0x1d, 0x87,
|
0xce, 0x3a, 0xb1, 0x5c, 0x52, 0x34, 0xde, 0x0d, 0x93, 0xe7, 0x64, 0xb6, 0xa1, 0xb4, 0x6c, 0xc8,
|
||||||
0x89, 0x6d, 0xaf, 0xc7, 0x1d, 0x14, 0xd7, 0x50, 0x31, 0xae, 0xd7, 0x6b, 0x74, 0x15, 0xa6, 0x7c,
|
0xc7, 0xf2, 0x20, 0xf2, 0xd0, 0x5d, 0x21, 0xdd, 0x04, 0x81, 0x4b, 0xc8, 0xa1, 0xeb, 0x18, 0x0c,
|
||||||
0x51, 0x3c, 0x92, 0x03, 0xfe, 0x36, 0xe2, 0x93, 0xc4, 0xa0, 0x22, 0x11, 0x49, 0x16, 0x7a, 0xca,
|
0x6f, 0x06, 0x4d, 0xe9, 0xa1, 0xb8, 0x4a, 0x8a, 0x21, 0x5c, 0x8f, 0xe8, 0x02, 0x8c, 0x86, 0xaa,
|
||||||
0x65, 0x07, 0xef, 0x90, 0x82, 0x18, 0x54, 0x8c, 0x50, 0xd6, 0x77, 0x49, 0x21, 0x8d, 0x7a, 0xae,
|
0xbc, 0x25, 0x0f, 0xfc, 0x1a, 0xe1, 0x23, 0xcc, 0x90, 0x22, 0x55, 0x69, 0x1e, 0x05, 0xc6, 0x27,
|
||||||
0xc0, 0xa4, 0x88, 0xc3, 0x1d, 0x11, 0xbb, 0x6c, 0xe2, 0x3d, 0x34, 0x00, 0x22, 0x5a, 0xb0, 0x0c,
|
0x82, 0x37, 0x59, 0xc1, 0x0c, 0x29, 0x06, 0x48, 0xeb, 0x5b, 0xac, 0xd0, 0x56, 0x3e, 0xe7, 0x61,
|
||||||
0x0d, 0xd7, 0x46, 0xbc, 0x8f, 0xf8, 0x04, 0xa7, 0x0e, 0xb4, 0x60, 0x96, 0x86, 0x4c, 0x20, 0x62,
|
0x44, 0x25, 0xd1, 0x96, 0x4a, 0x7c, 0x82, 0x78, 0x9b, 0x0c, 0x40, 0x08, 0x0a, 0xe6, 0xa0, 0xe6,
|
||||||
0x07, 0xc5, 0x07, 0xa8, 0x98, 0x31, 0x30, 0x7c, 0x0c, 0xc5, 0xa5, 0xf2, 0xb9, 0x8b, 0xe4, 0x43,
|
0x5b, 0x88, 0x77, 0xb6, 0x79, 0x7b, 0x70, 0x05, 0x96, 0x61, 0x82, 0x1b, 0x54, 0x5b, 0x25, 0x1e,
|
||||||
0x7a, 0x0c, 0x44, 0xb0, 0x94, 0x5d, 0x1e, 0xf7, 0xce, 0xb9, 0x19, 0x3e, 0xa2, 0x52, 0x12, 0xa3,
|
0x8a, 0x77, 0x49, 0x31, 0x6e, 0x61, 0x74, 0x1b, 0x46, 0x6a, 0x13, 0x4a, 0x1f, 0xc9, 0x7b, 0x7c,
|
||||||
0x15, 0x6b, 0x30, 0x1d, 0x79, 0xa9, 0x3c, 0xe7, 0x85, 0x4e, 0xed, 0xf8, 0x18, 0x1d, 0x53, 0x25,
|
0x1b, 0x84, 0x50, 0x2a, 0x37, 0x64, 0xd2, 0x3c, 0xeb, 0x67, 0x78, 0x9f, 0x53, 0xc9, 0x0c, 0x2a,
|
||||||
0x84, 0x15, 0xc9, 0xe2, 0x51, 0x34, 0x9f, 0x50, 0x45, 0x0c, 0x0c, 0x8f, 0x9e, 0x54, 0x5e, 0x37,
|
0x16, 0x61, 0x2c, 0x0e, 0x32, 0x7d, 0x36, 0x88, 0xbc, 0xca, 0xf1, 0x01, 0x39, 0x46, 0x2b, 0x88,
|
||||||
0xe4, 0x9d, 0x51, 0x6c, 0x9f, 0xd2, 0xd1, 0x2b, 0xd8, 0x0d, 0xd3, 0xb8, 0x0c, 0x0d, 0x19, 0x5c,
|
0x32, 0x92, 0x27, 0x83, 0x68, 0x3e, 0xe4, 0x8c, 0x58, 0x18, 0x6d, 0x3d, 0x6d, 0x82, 0x8d, 0x48,
|
||||||
0x74, 0xd2, 0x7c, 0x46, 0x9d, 0xce, 0x01, 0x0d, 0x3f, 0x02, 0xb7, 0x0f, 0x1d, 0xf5, 0x0e, 0xb2,
|
0x36, 0x06, 0xb1, 0x7d, 0xc4, 0x5b, 0xaf, 0x64, 0x57, 0x6c, 0xe3, 0x1c, 0xd4, 0x74, 0xfb, 0x82,
|
||||||
0xcf, 0x51, 0xb6, 0x38, 0x64, 0xdc, 0xe3, 0x48, 0x18, 0x55, 0xf9, 0x05, 0x8d, 0x04, 0x5e, 0x73,
|
0x97, 0xe6, 0x63, 0xae, 0x74, 0x01, 0x20, 0xfc, 0x10, 0xdc, 0xda, 0x77, 0x4c, 0x78, 0xc8, 0x3e,
|
||||||
0xb5, 0x61, 0x21, 0x8b, 0xa5, 0xb7, 0x3d, 0x5a, 0xd5, 0xbe, 0xa4, 0xaa, 0x15, 0x6c, 0xa5, 0x6a,
|
0x21, 0xd9, 0x4c, 0x9f, 0x51, 0x41, 0x2d, 0x61, 0x50, 0xe5, 0xa7, 0xdc, 0x12, 0x64, 0x8f, 0x6b,
|
||||||
0x67, 0x60, 0x11, 0x8d, 0xa3, 0xf5, 0xf5, 0x2b, 0x1a, 0xac, 0x05, 0xbd, 0x55, 0xed, 0xee, 0xa3,
|
0x15, 0xa6, 0xf3, 0x44, 0x07, 0x9b, 0x83, 0x65, 0xed, 0x33, 0xce, 0x5a, 0xc9, 0x76, 0x65, 0xed,
|
||||||
0x70, 0xa8, 0x2c, 0xe7, 0x05, 0xc5, 0x63, 0xa9, 0x99, 0x4e, 0xe4, 0x25, 0x0e, 0xe6, 0xeb, 0x68,
|
0x34, 0xcc, 0x90, 0x71, 0xb0, 0xba, 0x7e, 0xce, 0x8d, 0xb5, 0xa4, 0xd7, 0xbb, 0xab, 0xfb, 0x30,
|
||||||
0xa6, 0x89, 0xbf, 0x5e, 0x0a, 0x36, 0xbc, 0x44, 0xcb, 0x1f, 0x86, 0x83, 0x24, 0xcf, 0xe2, 0x94,
|
0x1c, 0xac, 0xd2, 0x79, 0xde, 0xc8, 0x44, 0x23, 0xd3, 0x88, 0x83, 0xd4, 0xc3, 0x7c, 0x9d, 0xcc,
|
||||||
0xf7, 0x84, 0x1f, 0x07, 0x17, 0x79, 0xdf, 0x41, 0xfd, 0x75, 0xad, 0x55, 0x5b, 0x06, 0xae, 0xcd,
|
0xdc, 0xf1, 0x97, 0x2a, 0xc1, 0x4a, 0x90, 0xa2, 0xfc, 0x41, 0x38, 0xc0, 0xf2, 0x3c, 0xc9, 0x64,
|
||||||
0xa7, 0xe1, 0x96, 0xf2, 0xf7, 0x46, 0x27, 0x88, 0x12, 0x91, 0x2a, 0x8b, 0xf1, 0x1b, 0xea, 0x54,
|
0x53, 0x85, 0x49, 0xfb, 0x82, 0x6c, 0x79, 0xa8, 0xbf, 0xe8, 0x29, 0xd5, 0xba, 0x85, 0xa3, 0xf9,
|
||||||
0xc9, 0x9d, 0xce, 0x31, 0xb6, 0x0e, 0x33, 0xf9, 0x9f, 0xae, 0x5f, 0xc9, 0x6f, 0x51, 0x34, 0x3d,
|
0x14, 0xdc, 0x54, 0xbd, 0xab, 0x34, 0xda, 0x71, 0xaa, 0x32, 0xe3, 0x30, 0x7e, 0xc9, 0x95, 0xaa,
|
||||||
0xa0, 0x70, 0x70, 0xf4, 0x44, 0x94, 0x78, 0xa9, 0xcb, 0xfc, 0xfb, 0x8e, 0x06, 0x07, 0x22, 0xc5,
|
0xb8, 0x53, 0x05, 0x26, 0x96, 0x60, 0xbc, 0xf8, 0xe8, 0xfb, 0x48, 0x7e, 0x45, 0xa2, 0xb1, 0x0e,
|
||||||
0xb7, 0x6f, 0xb6, 0x96, 0xc4, 0xcd, 0xbb, 0xf6, 0x49, 0x36, 0xb8, 0x94, 0x9e, 0x5f, 0x7a, 0x9e,
|
0x45, 0x8d, 0xa3, 0xa9, 0xe2, 0x34, 0xc8, 0x7c, 0xfa, 0xdf, 0xd7, 0xdc, 0x38, 0x08, 0xa1, 0xc6,
|
||||||
0xdc, 0xc5, 0x33, 0x5b, 0x0d, 0x62, 0x76, 0x9f, 0x2e, 0x4f, 0x35, 0x2e, 0xed, 0xb2, 0x4b, 0xbb,
|
0x61, 0xb6, 0x52, 0x89, 0xd3, 0xde, 0xc3, 0xf0, 0x0d, 0x37, 0x0e, 0x66, 0x48, 0xc1, 0x2f, 0x0c,
|
||||||
0x65, 0x85, 0x2a, 0x69, 0xc9, 0x4e, 0xc1, 0x74, 0x25, 0x2a, 0xed, 0xaa, 0xa7, 0x50, 0x35, 0x65,
|
0x1e, 0x8a, 0x6f, 0x59, 0xc1, 0x4c, 0xb9, 0x07, 0x26, 0x7a, 0xde, 0x07, 0xea, 0x77, 0xec, 0xb1,
|
||||||
0x26, 0x25, 0x3b, 0x06, 0x63, 0x3a, 0xf6, 0xec, 0xf8, 0xd3, 0x88, 0xe7, 0xcb, 0xd9, 0x09, 0x98,
|
0xac, 0x48, 0xad, 0x83, 0xb0, 0x12, 0x3d, 0xbe, 0x43, 0x9d, 0xa3, 0xfb, 0x75, 0x40, 0xdc, 0x83,
|
||||||
0xa0, 0xb8, 0xb3, 0xa3, 0xcf, 0x20, 0x5a, 0x22, 0x1a, 0xa7, 0xa8, 0xb3, 0xe3, 0xcf, 0x12, 0x4e,
|
0x45, 0xea, 0x1e, 0xda, 0x6e, 0xd9, 0xc5, 0x9d, 0xaa, 0x4e, 0x5d, 0x33, 0x5b, 0x9c, 0x84, 0xb1,
|
||||||
0x88, 0xc6, 0xdd, 0x4b, 0xf8, 0xfd, 0xf3, 0x63, 0x38, 0xae, 0xa8, 0x76, 0xcb, 0x30, 0x8e, 0x19,
|
0xae, 0x81, 0xed, 0x56, 0x3d, 0x41, 0xaa, 0x51, 0x7b, 0x5e, 0x8b, 0xa3, 0xb0, 0x0f, 0x87, 0xaf,
|
||||||
0x67, 0xa7, 0x9f, 0xc3, 0x0f, 0x27, 0x82, 0xdd, 0x03, 0x07, 0x1c, 0x0b, 0xfe, 0x02, 0xa2, 0xc5,
|
0x1b, 0x7f, 0x92, 0xf0, 0x62, 0xb9, 0x38, 0x0e, 0xc3, 0x3c, 0x74, 0xdd, 0xe8, 0x53, 0x84, 0x56,
|
||||||
0x7a, 0xb6, 0x06, 0x93, 0x46, 0xae, 0xd9, 0xf1, 0x17, 0x11, 0x37, 0x29, 0xbd, 0x75, 0xcc, 0x35,
|
0x08, 0xe2, 0x3c, 0x70, 0xdd, 0xf8, 0xd3, 0x8c, 0x33, 0x82, 0xb8, 0x7f, 0x0a, 0xbf, 0x7b, 0x76,
|
||||||
0xbb, 0xe0, 0x25, 0xda, 0x3a, 0x12, 0xba, 0x6c, 0x14, 0x69, 0x76, 0xfa, 0x65, 0xaa, 0x3a, 0x21,
|
0x1f, 0x35, 0x4d, 0xce, 0xdd, 0x1c, 0x0c, 0xd1, 0xa4, 0x75, 0xd3, 0xcf, 0xd0, 0x8f, 0x33, 0x21,
|
||||||
0x6c, 0x05, 0x1a, 0xe5, 0x98, 0xb2, 0xf3, 0xaf, 0x20, 0x3f, 0x60, 0x74, 0x05, 0x8c, 0x31, 0x69,
|
0xee, 0x82, 0xfd, 0x9e, 0x09, 0x7f, 0x8e, 0xd0, 0x72, 0xbd, 0x58, 0x84, 0x11, 0x6b, 0xba, 0xba,
|
||||||
0x57, 0xbc, 0x4a, 0x15, 0x30, 0x28, 0x7d, 0x8c, 0xea, 0xd1, 0x67, 0x37, 0xbd, 0x46, 0xc7, 0xa8,
|
0xf1, 0xe7, 0x09, 0xb7, 0x29, 0x0c, 0x9d, 0xa6, 0xab, 0x5b, 0xf0, 0x02, 0x87, 0x4e, 0x04, 0xa6,
|
||||||
0x96, 0x7c, 0xba, 0x9b, 0xf9, 0xb4, 0xb0, 0x2b, 0x5e, 0xa7, 0x6e, 0xe6, 0xeb, 0xf5, 0x36, 0xea,
|
0x8d, 0x07, 0xab, 0x9b, 0x7e, 0x91, 0xb3, 0xce, 0x88, 0x98, 0x87, 0x5a, 0xd5, 0x2c, 0xdd, 0xfc,
|
||||||
0x59, 0x62, 0x77, 0xbc, 0x41, 0xdb, 0xa8, 0x45, 0x09, 0x6b, 0x43, 0x73, 0x7f, 0x8e, 0xd8, 0x7d,
|
0x4b, 0xc4, 0x77, 0x18, 0xcc, 0x80, 0xd5, 0xac, 0xdd, 0x8a, 0x97, 0x39, 0x03, 0x16, 0x85, 0xdb,
|
||||||
0x6f, 0xa2, 0x6f, 0x6e, 0x5f, 0x8c, 0xb0, 0x87, 0x60, 0x71, 0x78, 0x86, 0xd8, 0xad, 0x97, 0x77,
|
0xa8, 0x77, 0x00, 0xbb, 0x4d, 0xaf, 0xf0, 0x36, 0xea, 0x99, 0xbf, 0x58, 0xcd, 0xa2, 0x67, 0xb9,
|
||||||
0x6b, 0xbf, 0xfa, 0xcd, 0x08, 0x61, 0x67, 0x06, 0xbf, 0xfa, 0xcd, 0xfc, 0xb0, 0x6b, 0xaf, 0xec,
|
0x15, 0xaf, 0x72, 0x35, 0x8b, 0xf5, 0x18, 0x46, 0xef, 0x44, 0x73, 0x3b, 0x5e, 0xe3, 0x30, 0x7a,
|
||||||
0x56, 0x2f, 0x76, 0x66, 0x7c, 0xb0, 0x55, 0x80, 0xc1, 0xe8, 0xb6, 0xbb, 0xae, 0xa2, 0xcb, 0x80,
|
0x06, 0x9a, 0x58, 0x85, 0xfa, 0xde, 0x69, 0xe6, 0xf6, 0xbd, 0x4e, 0xbe, 0xc9, 0x3d, 0xc3, 0x4c,
|
||||||
0xf4, 0xd1, 0xc0, 0xc9, 0x6d, 0xe7, 0xaf, 0xd1, 0xd1, 0x40, 0x82, 0x2d, 0xc3, 0x44, 0x9c, 0x85,
|
0x3c, 0x00, 0x33, 0xfd, 0x27, 0x99, 0xdb, 0x7a, 0x69, 0xa7, 0xe7, 0xec, 0x61, 0x0f, 0x32, 0x71,
|
||||||
0xa1, 0xfe, 0x72, 0x34, 0xef, 0x1c, 0x12, 0x13, 0x3c, 0xec, 0x13, 0xfb, 0xeb, 0x1e, 0x1e, 0x0c,
|
0xba, 0x73, 0xf6, 0xb0, 0xa7, 0x98, 0x5b, 0x7b, 0x79, 0xa7, 0xfb, 0x68, 0x6a, 0x0f, 0x31, 0xb1,
|
||||||
0x02, 0xd8, 0x31, 0x38, 0xc0, 0xa3, 0x2e, 0xef, 0xdb, 0xc8, 0xdf, 0xf6, 0x68, 0x20, 0xe8, 0xd5,
|
0x00, 0xd0, 0x19, 0x20, 0x6e, 0xd7, 0x15, 0x72, 0x59, 0x10, 0x6e, 0x0d, 0x9a, 0x1f, 0x6e, 0xfe,
|
||||||
0x6c, 0x05, 0xa0, 0xb8, 0x34, 0xaa, 0x9d, 0xc4, 0xfa, 0xa9, 0xbf, 0xef, 0x15, 0x77, 0x50, 0x03,
|
0x2a, 0x6f, 0x0d, 0x22, 0x70, 0x6b, 0xf0, 0xe8, 0x70, 0xd3, 0xd7, 0x78, 0x6b, 0x30, 0x22, 0xe6,
|
||||||
0x19, 0x08, 0xf2, 0x5b, 0xa7, 0x45, 0x70, 0xa3, 0x2a, 0xc8, 0x2f, 0x9a, 0xc7, 0x61, 0xfc, 0x31,
|
0x60, 0x38, 0xc9, 0xa3, 0x08, 0x9f, 0xad, 0xfa, 0xed, 0x7d, 0xc6, 0x8c, 0x8c, 0x5a, 0x0c, 0xff,
|
||||||
0x29, 0x62, 0xe5, 0xf9, 0x36, 0xfa, 0x0f, 0xa4, 0x69, 0xbd, 0x2e, 0x58, 0x24, 0x52, 0xae, 0x3c,
|
0xba, 0x4b, 0x30, 0x03, 0xe2, 0x28, 0xec, 0x97, 0xf1, 0x86, 0x6c, 0xb9, 0xc8, 0xdf, 0x76, 0xb9,
|
||||||
0x5f, 0xda, 0xd8, 0x3f, 0x91, 0x2d, 0x01, 0x0d, 0xf7, 0x3c, 0xa9, 0x5c, 0x9e, 0xfb, 0x2f, 0x82,
|
0x9f, 0xe0, 0x6a, 0x31, 0x0f, 0x50, 0x9e, 0x7c, 0x31, 0x0a, 0x17, 0xfb, 0xfb, 0x6e, 0x79, 0x08,
|
||||||
0x09, 0xd0, 0x9b, 0xd6, 0xaf, 0x1f, 0xe7, 0x3b, 0x36, 0xf6, 0x6f, 0xda, 0x34, 0xae, 0x67, 0x27,
|
0xb7, 0x90, 0x8e, 0xa0, 0x38, 0x3a, 0x3b, 0x04, 0xdb, 0xdd, 0x82, 0xe2, 0xb4, 0x7c, 0x0c, 0x86,
|
||||||
0xa0, 0xa1, 0x5f, 0xe6, 0xf7, 0x6d, 0x1b, 0xfc, 0x0f, 0xc2, 0x03, 0x42, 0x7f, 0xb2, 0x54, 0x7d,
|
0x1e, 0xd1, 0x2a, 0x31, 0x41, 0xe8, 0xa2, 0xff, 0x20, 0x9a, 0xd7, 0x63, 0xc2, 0x62, 0x95, 0x49,
|
||||||
0x15, 0xd8, 0x8b, 0xfd, 0x2f, 0x76, 0x9a, 0xd6, 0xb3, 0x55, 0x98, 0x94, 0xaa, 0xdf, 0xcf, 0x52,
|
0x13, 0x84, 0xda, 0xc5, 0xfe, 0x49, 0x6c, 0x05, 0x20, 0xdc, 0x0c, 0xb4, 0xf1, 0xb9, 0xef, 0xbf,
|
||||||
0x2f, 0x1f, 0xfe, 0x16, 0xfc, 0xbf, 0xbd, 0xf2, 0x32, 0x57, 0x32, 0x27, 0x8f, 0xc0, 0x7c, 0x4f,
|
0x18, 0x66, 0x00, 0x83, 0xc6, 0xeb, 0x47, 0xe5, 0x96, 0x8b, 0xfd, 0x9b, 0x83, 0xa6, 0xf5, 0xe2,
|
||||||
0x44, 0x75, 0xf0, 0x24, 0xb4, 0x44, 0x4b, 0xb4, 0xf3, 0x63, 0xf0, 0x7f, 0x00, 0x00, 0x00, 0xff,
|
0x38, 0xd4, 0xf0, 0xb2, 0xf8, 0xa7, 0x81, 0x0b, 0xfe, 0x87, 0xe0, 0x0e, 0x81, 0xbf, 0xac, 0x4d,
|
||||||
0xff, 0x3f, 0x9b, 0x2b, 0x54, 0xfc, 0x11, 0x00, 0x00,
|
0xcb, 0xb4, 0xdd, 0xc9, 0xfe, 0x97, 0x2a, 0xcd, 0xeb, 0xc5, 0x02, 0x8c, 0x68, 0xd3, 0x6a, 0xe5,
|
||||||
|
0x59, 0x50, 0xcc, 0x0e, 0x07, 0xfe, 0xdf, 0x6e, 0x75, 0x22, 0xad, 0x98, 0x13, 0x87, 0x61, 0xaa,
|
||||||
|
0xa9, 0xe2, 0x5e, 0xf0, 0x04, 0x2c, 0xab, 0x65, 0xb5, 0x5a, 0xec, 0xa2, 0xff, 0x03, 0x00, 0x00,
|
||||||
|
0xff, 0xff, 0x06, 0x21, 0xec, 0x88, 0xfd, 0x12, 0x00, 0x00,
|
||||||
}
|
}
|
||||||
|
|
5
vendor/github.com/gogo/protobuf/gogoproto/gogo.proto
generated
vendored
5
vendor/github.com/gogo/protobuf/gogoproto/gogo.proto
generated
vendored
|
@ -39,6 +39,7 @@ extend google.protobuf.EnumOptions {
|
||||||
optional bool goproto_enum_stringer = 62021;
|
optional bool goproto_enum_stringer = 62021;
|
||||||
optional bool enum_stringer = 62022;
|
optional bool enum_stringer = 62022;
|
||||||
optional string enum_customname = 62023;
|
optional string enum_customname = 62023;
|
||||||
|
optional bool enumdecl = 62024;
|
||||||
}
|
}
|
||||||
|
|
||||||
extend google.protobuf.EnumValueOptions {
|
extend google.protobuf.EnumValueOptions {
|
||||||
|
@ -77,6 +78,8 @@ extend google.protobuf.FileOptions {
|
||||||
optional bool gogoproto_import = 63027;
|
optional bool gogoproto_import = 63027;
|
||||||
optional bool protosizer_all = 63028;
|
optional bool protosizer_all = 63028;
|
||||||
optional bool compare_all = 63029;
|
optional bool compare_all = 63029;
|
||||||
|
optional bool typedecl_all = 63030;
|
||||||
|
optional bool enumdecl_all = 63031;
|
||||||
}
|
}
|
||||||
|
|
||||||
extend google.protobuf.MessageOptions {
|
extend google.protobuf.MessageOptions {
|
||||||
|
@ -107,6 +110,8 @@ extend google.protobuf.MessageOptions {
|
||||||
|
|
||||||
optional bool protosizer = 64028;
|
optional bool protosizer = 64028;
|
||||||
optional bool compare = 64029;
|
optional bool compare = 64029;
|
||||||
|
|
||||||
|
optional bool typedecl = 64030;
|
||||||
}
|
}
|
||||||
|
|
||||||
extend google.protobuf.FieldOptions {
|
extend google.protobuf.FieldOptions {
|
||||||
|
|
8
vendor/github.com/gogo/protobuf/gogoproto/helper.go
generated
vendored
8
vendor/github.com/gogo/protobuf/gogoproto/helper.go
generated
vendored
|
@ -90,6 +90,14 @@ func IsCastValue(field *google_protobuf.FieldDescriptorProto) bool {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func HasEnumDecl(file *google_protobuf.FileDescriptorProto, enum *google_protobuf.EnumDescriptorProto) bool {
|
||||||
|
return proto.GetBoolExtension(enum.Options, E_Enumdecl, proto.GetBoolExtension(file.Options, E_EnumdeclAll, true))
|
||||||
|
}
|
||||||
|
|
||||||
|
func HasTypeDecl(file *google_protobuf.FileDescriptorProto, message *google_protobuf.DescriptorProto) bool {
|
||||||
|
return proto.GetBoolExtension(message.Options, E_Typedecl, proto.GetBoolExtension(file.Options, E_TypedeclAll, true))
|
||||||
|
}
|
||||||
|
|
||||||
func GetCustomType(field *google_protobuf.FieldDescriptorProto) string {
|
func GetCustomType(field *google_protobuf.FieldDescriptorProto) string {
|
||||||
if field == nil {
|
if field == nil {
|
||||||
return ""
|
return ""
|
||||||
|
|
13
vendor/github.com/gogo/protobuf/plugin/gostring/gostring.go
generated
vendored
13
vendor/github.com/gogo/protobuf/plugin/gostring/gostring.go
generated
vendored
|
@ -97,8 +97,10 @@ not print their values, while the generated GoString method will always print al
|
||||||
package gostring
|
package gostring
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"fmt"
|
||||||
"github.com/gogo/protobuf/gogoproto"
|
"github.com/gogo/protobuf/gogoproto"
|
||||||
"github.com/gogo/protobuf/protoc-gen-gogo/generator"
|
"github.com/gogo/protobuf/protoc-gen-gogo/generator"
|
||||||
|
"os"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
)
|
)
|
||||||
|
@ -145,6 +147,7 @@ func (p *gostring) Generate(file *generator.FileDescriptor) {
|
||||||
reflectPkg := p.NewImport("reflect")
|
reflectPkg := p.NewImport("reflect")
|
||||||
sortKeysPkg := p.NewImport("github.com/gogo/protobuf/sortkeys")
|
sortKeysPkg := p.NewImport("github.com/gogo/protobuf/sortkeys")
|
||||||
|
|
||||||
|
extensionToGoStringUsed := false
|
||||||
for _, message := range file.Messages() {
|
for _, message := range file.Messages() {
|
||||||
if !p.overwrite && !gogoproto.HasGoString(file.FileDescriptorProto, message.DescriptorProto) {
|
if !p.overwrite && !gogoproto.HasGoString(file.FileDescriptorProto, message.DescriptorProto) {
|
||||||
continue
|
continue
|
||||||
|
@ -221,7 +224,7 @@ func (p *gostring) Generate(file *generator.FileDescriptor) {
|
||||||
p.P(`s = append(s, "`, fieldname, `: " + `, mapName, `+ ",\n")`)
|
p.P(`s = append(s, "`, fieldname, `: " + `, mapName, `+ ",\n")`)
|
||||||
p.Out()
|
p.Out()
|
||||||
p.P(`}`)
|
p.P(`}`)
|
||||||
} else if field.IsMessage() || p.IsGroup(field) {
|
} else if (field.IsMessage() && !gogoproto.IsCustomType(field) && !gogoproto.IsStdTime(field) && !gogoproto.IsStdDuration(field)) || p.IsGroup(field) {
|
||||||
if nullable || repeated {
|
if nullable || repeated {
|
||||||
p.P(`if this.`, fieldname, ` != nil {`)
|
p.P(`if this.`, fieldname, ` != nil {`)
|
||||||
p.In()
|
p.In()
|
||||||
|
@ -264,6 +267,7 @@ func (p *gostring) Generate(file *generator.FileDescriptor) {
|
||||||
if message.DescriptorProto.HasExtension() {
|
if message.DescriptorProto.HasExtension() {
|
||||||
if gogoproto.HasExtensionsMap(file.FileDescriptorProto, message.DescriptorProto) {
|
if gogoproto.HasExtensionsMap(file.FileDescriptorProto, message.DescriptorProto) {
|
||||||
p.P(`s = append(s, "XXX_InternalExtensions: " + extensionToGoString`, p.localName, `(this) + ",\n")`)
|
p.P(`s = append(s, "XXX_InternalExtensions: " + extensionToGoString`, p.localName, `(this) + ",\n")`)
|
||||||
|
extensionToGoStringUsed = true
|
||||||
} else {
|
} else {
|
||||||
p.P(`if this.XXX_extensions != nil {`)
|
p.P(`if this.XXX_extensions != nil {`)
|
||||||
p.In()
|
p.In()
|
||||||
|
@ -338,6 +342,11 @@ func (p *gostring) Generate(file *generator.FileDescriptor) {
|
||||||
p.Out()
|
p.Out()
|
||||||
p.P(`}`)
|
p.P(`}`)
|
||||||
|
|
||||||
|
if extensionToGoStringUsed {
|
||||||
|
if !gogoproto.ImportsGoGoProto(file.FileDescriptorProto) {
|
||||||
|
fmt.Fprintf(os.Stderr, "The GoString plugin for messages with extensions requires importing gogoprotobuf. Please see file %s", file.GetName())
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
p.P(`func extensionToGoString`, p.localName, `(m `, protoPkg.Use(), `.Message) string {`)
|
p.P(`func extensionToGoString`, p.localName, `(m `, protoPkg.Use(), `.Message) string {`)
|
||||||
p.In()
|
p.In()
|
||||||
p.P(`e := `, protoPkg.Use(), `.GetUnsafeExtensionsMap(m)`)
|
p.P(`e := `, protoPkg.Use(), `.GetUnsafeExtensionsMap(m)`)
|
||||||
|
@ -360,7 +369,7 @@ func (p *gostring) Generate(file *generator.FileDescriptor) {
|
||||||
p.P(`return s`)
|
p.P(`return s`)
|
||||||
p.Out()
|
p.Out()
|
||||||
p.P(`}`)
|
p.P(`}`)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
|
|
2
vendor/github.com/gogo/protobuf/plugin/marshalto/marshalto.go
generated
vendored
2
vendor/github.com/gogo/protobuf/plugin/marshalto/marshalto.go
generated
vendored
|
@ -420,7 +420,7 @@ func (p *marshalto) generateField(proto3 bool, numGen NumGen, file *generator.Fi
|
||||||
p.P(`if m.`, fieldname, ` != nil {`)
|
p.P(`if m.`, fieldname, ` != nil {`)
|
||||||
p.In()
|
p.In()
|
||||||
}
|
}
|
||||||
packed := field.IsPacked() || (proto3 && field.IsRepeated() && generator.IsScalar(field))
|
packed := field.IsPacked() || (proto3 && field.IsPacked3())
|
||||||
wireType := field.WireType()
|
wireType := field.WireType()
|
||||||
fieldNumber := field.GetNumber()
|
fieldNumber := field.GetNumber()
|
||||||
if packed {
|
if packed {
|
||||||
|
|
35
vendor/github.com/gogo/protobuf/plugin/populate/populate.go
generated
vendored
35
vendor/github.com/gogo/protobuf/plugin/populate/populate.go
generated
vendored
|
@ -194,7 +194,6 @@ func (p *plugin) getFuncName(goTypName string) string {
|
||||||
case "time.NewPopulatedTime":
|
case "time.NewPopulatedTime":
|
||||||
funcName = p.typesPkg.Use() + ".NewPopulatedStdTime"
|
funcName = p.typesPkg.Use() + ".NewPopulatedStdTime"
|
||||||
case "time.NewPopulatedDuration":
|
case "time.NewPopulatedDuration":
|
||||||
p.typesPkg.Use()
|
|
||||||
funcName = p.typesPkg.Use() + ".NewPopulatedStdDuration"
|
funcName = p.typesPkg.Use() + ".NewPopulatedStdDuration"
|
||||||
}
|
}
|
||||||
return funcName
|
return funcName
|
||||||
|
@ -305,6 +304,23 @@ func (p *plugin) GenerateField(file *generator.FileDescriptor, message *generato
|
||||||
}
|
}
|
||||||
p.Out()
|
p.Out()
|
||||||
p.P(`}`)
|
p.P(`}`)
|
||||||
|
} else if gogoproto.IsCustomType(field) {
|
||||||
|
funcCall := p.getCustomFuncCall(goTypName)
|
||||||
|
if field.IsRepeated() {
|
||||||
|
p.P(p.varGen.Next(), ` := r.Intn(10)`)
|
||||||
|
p.P(`this.`, fieldname, ` = make(`, goTyp, `, `, p.varGen.Current(), `)`)
|
||||||
|
p.P(`for i := 0; i < `, p.varGen.Current(), `; i++ {`)
|
||||||
|
p.In()
|
||||||
|
p.P(p.varGen.Next(), `:= `, funcCall)
|
||||||
|
p.P(`this.`, fieldname, `[i] = *`, p.varGen.Current())
|
||||||
|
p.Out()
|
||||||
|
p.P(`}`)
|
||||||
|
} else if gogoproto.IsNullable(field) {
|
||||||
|
p.P(`this.`, fieldname, ` = `, funcCall)
|
||||||
|
} else {
|
||||||
|
p.P(p.varGen.Next(), `:= `, funcCall)
|
||||||
|
p.P(`this.`, fieldname, ` = *`, p.varGen.Current())
|
||||||
|
}
|
||||||
} else if field.IsMessage() || p.IsGroup(field) {
|
} else if field.IsMessage() || p.IsGroup(field) {
|
||||||
funcCall := p.getFuncCall(goTypName)
|
funcCall := p.getFuncCall(goTypName)
|
||||||
if field.IsRepeated() {
|
if field.IsRepeated() {
|
||||||
|
@ -345,23 +361,6 @@ func (p *plugin) GenerateField(file *generator.FileDescriptor, message *generato
|
||||||
p.P(p.varGen.Next(), ` := `, val)
|
p.P(p.varGen.Next(), ` := `, val)
|
||||||
p.P(`this.`, fieldname, ` = &`, p.varGen.Current())
|
p.P(`this.`, fieldname, ` = &`, p.varGen.Current())
|
||||||
}
|
}
|
||||||
} else if gogoproto.IsCustomType(field) {
|
|
||||||
funcCall := p.getCustomFuncCall(goTypName)
|
|
||||||
if field.IsRepeated() {
|
|
||||||
p.P(p.varGen.Next(), ` := r.Intn(10)`)
|
|
||||||
p.P(`this.`, fieldname, ` = make(`, goTyp, `, `, p.varGen.Current(), `)`)
|
|
||||||
p.P(`for i := 0; i < `, p.varGen.Current(), `; i++ {`)
|
|
||||||
p.In()
|
|
||||||
p.P(p.varGen.Next(), `:= `, funcCall)
|
|
||||||
p.P(`this.`, fieldname, `[i] = *`, p.varGen.Current())
|
|
||||||
p.Out()
|
|
||||||
p.P(`}`)
|
|
||||||
} else if gogoproto.IsNullable(field) {
|
|
||||||
p.P(`this.`, fieldname, ` = `, funcCall)
|
|
||||||
} else {
|
|
||||||
p.P(p.varGen.Next(), `:= `, funcCall)
|
|
||||||
p.P(`this.`, fieldname, ` = *`, p.varGen.Current())
|
|
||||||
}
|
|
||||||
} else if field.IsBytes() {
|
} else if field.IsBytes() {
|
||||||
if field.IsRepeated() {
|
if field.IsRepeated() {
|
||||||
p.P(p.varGen.Next(), ` := r.Intn(10)`)
|
p.P(p.varGen.Next(), ` := r.Intn(10)`)
|
||||||
|
|
2
vendor/github.com/gogo/protobuf/plugin/size/size.go
generated
vendored
2
vendor/github.com/gogo/protobuf/plugin/size/size.go
generated
vendored
|
@ -230,7 +230,7 @@ func (p *size) generateField(proto3 bool, file *generator.FileDescriptor, messag
|
||||||
p.P(`if m.`, fieldname, ` != nil {`)
|
p.P(`if m.`, fieldname, ` != nil {`)
|
||||||
p.In()
|
p.In()
|
||||||
}
|
}
|
||||||
packed := field.IsPacked() || (proto3 && field.IsRepeated() && generator.IsScalar(field))
|
packed := field.IsPacked() || (proto3 && field.IsPacked3())
|
||||||
_, wire := p.GoType(message, field)
|
_, wire := p.GoType(message, field)
|
||||||
wireType := wireToType(wire)
|
wireType := wireToType(wire)
|
||||||
fieldNumber := field.GetNumber()
|
fieldNumber := field.GetNumber()
|
||||||
|
|
2
vendor/github.com/gogo/protobuf/plugin/stringer/stringer.go
generated
vendored
2
vendor/github.com/gogo/protobuf/plugin/stringer/stringer.go
generated
vendored
|
@ -203,7 +203,7 @@ func (p *stringer) Generate(file *generator.FileDescriptor) {
|
||||||
} else if p.IsMap(field) {
|
} else if p.IsMap(field) {
|
||||||
mapName := `mapStringFor` + fieldname
|
mapName := `mapStringFor` + fieldname
|
||||||
p.P("`", fieldname, ":`", ` + `, mapName, " + `,", "`,")
|
p.P("`", fieldname, ":`", ` + `, mapName, " + `,", "`,")
|
||||||
} else if field.IsMessage() || p.IsGroup(field) {
|
} else if (field.IsMessage() && !gogoproto.IsCustomType(field)) || p.IsGroup(field) {
|
||||||
desc := p.ObjectNamed(field.GetTypeName())
|
desc := p.ObjectNamed(field.GetTypeName())
|
||||||
msgname := p.TypeName(desc)
|
msgname := p.TypeName(desc)
|
||||||
msgnames := strings.Split(msgname, ".")
|
msgnames := strings.Split(msgname, ".")
|
||||||
|
|
26
vendor/github.com/gogo/protobuf/plugin/unmarshal/unmarshal.go
generated
vendored
26
vendor/github.com/gogo/protobuf/plugin/unmarshal/unmarshal.go
generated
vendored
|
@ -806,10 +806,13 @@ func (p *unmarshal) field(file *generator.FileDescriptor, msg *generator.Descrip
|
||||||
} else {
|
} else {
|
||||||
p.P(`m.`, fieldname, ` = append(m.`, fieldname, `, time.Duration(0))`)
|
p.P(`m.`, fieldname, ` = append(m.`, fieldname, `, time.Duration(0))`)
|
||||||
}
|
}
|
||||||
} else if nullable {
|
} else if nullable && !gogoproto.IsCustomType(field) {
|
||||||
p.P(`m.`, fieldname, ` = append(m.`, fieldname, `, &`, msgname, `{})`)
|
p.P(`m.`, fieldname, ` = append(m.`, fieldname, `, &`, msgname, `{})`)
|
||||||
} else {
|
} else {
|
||||||
p.P(`m.`, fieldname, ` = append(m.`, fieldname, `, `, msgname, `{})`)
|
goType, _ := p.GoType(nil, field)
|
||||||
|
// remove the slice from the type, i.e. []*T -> *T
|
||||||
|
goType = goType[2:]
|
||||||
|
p.P(`m.`, fieldname, ` = append(m.`, fieldname, `, `, goType, `{})`)
|
||||||
}
|
}
|
||||||
varName := `m.` + fieldname + `[len(m.` + fieldname + `)-1]`
|
varName := `m.` + fieldname + `[len(m.` + fieldname + `)-1]`
|
||||||
buf := `dAtA[iNdEx:postIndex]`
|
buf := `dAtA[iNdEx:postIndex]`
|
||||||
|
@ -840,7 +843,9 @@ func (p *unmarshal) field(file *generator.FileDescriptor, msg *generator.Descrip
|
||||||
} else if gogoproto.IsStdDuration(field) {
|
} else if gogoproto.IsStdDuration(field) {
|
||||||
p.P(`m.`, fieldname, ` = new(time.Duration)`)
|
p.P(`m.`, fieldname, ` = new(time.Duration)`)
|
||||||
} else {
|
} else {
|
||||||
p.P(`m.`, fieldname, ` = &`, msgname, `{}`)
|
goType, _ := p.GoType(nil, field)
|
||||||
|
// remove the star from the type
|
||||||
|
p.P(`m.`, fieldname, ` = &`, goType[1:], `{}`)
|
||||||
}
|
}
|
||||||
p.Out()
|
p.Out()
|
||||||
p.P(`}`)
|
p.P(`}`)
|
||||||
|
@ -869,6 +874,7 @@ func (p *unmarshal) field(file *generator.FileDescriptor, msg *generator.Descrip
|
||||||
p.P(`}`)
|
p.P(`}`)
|
||||||
}
|
}
|
||||||
p.P(`iNdEx = postIndex`)
|
p.P(`iNdEx = postIndex`)
|
||||||
|
|
||||||
case descriptor.FieldDescriptorProto_TYPE_BYTES:
|
case descriptor.FieldDescriptorProto_TYPE_BYTES:
|
||||||
p.P(`var byteLen int`)
|
p.P(`var byteLen int`)
|
||||||
p.decodeVarint("byteLen", "int")
|
p.decodeVarint("byteLen", "int")
|
||||||
|
@ -1164,12 +1170,16 @@ func (p *unmarshal) Generate(file *generator.FileDescriptor) {
|
||||||
if field.OneofIndex != nil {
|
if field.OneofIndex != nil {
|
||||||
errFieldname = p.GetOneOfFieldName(message, field)
|
errFieldname = p.GetOneOfFieldName(message, field)
|
||||||
}
|
}
|
||||||
packed := field.IsPacked() || (proto3 && field.IsRepeated() && generator.IsScalar(field))
|
possiblyPacked := field.IsScalar() && field.IsRepeated()
|
||||||
p.P(`case `, strconv.Itoa(int(field.GetNumber())), `:`)
|
p.P(`case `, strconv.Itoa(int(field.GetNumber())), `:`)
|
||||||
p.In()
|
p.In()
|
||||||
wireType := field.WireType()
|
wireType := field.WireType()
|
||||||
if packed {
|
if possiblyPacked {
|
||||||
p.P(`if wireType == `, strconv.Itoa(proto.WireBytes), `{`)
|
p.P(`if wireType == `, strconv.Itoa(wireType), `{`)
|
||||||
|
p.In()
|
||||||
|
p.field(file, message, field, fieldname, false)
|
||||||
|
p.Out()
|
||||||
|
p.P(`} else if wireType == `, strconv.Itoa(proto.WireBytes), `{`)
|
||||||
p.In()
|
p.In()
|
||||||
p.P(`var packedLen int`)
|
p.P(`var packedLen int`)
|
||||||
p.decodeVarint("packedLen", "int")
|
p.decodeVarint("packedLen", "int")
|
||||||
|
@ -1190,10 +1200,6 @@ func (p *unmarshal) Generate(file *generator.FileDescriptor) {
|
||||||
p.Out()
|
p.Out()
|
||||||
p.P(`}`)
|
p.P(`}`)
|
||||||
p.Out()
|
p.Out()
|
||||||
p.P(`} else if wireType == `, strconv.Itoa(wireType), `{`)
|
|
||||||
p.In()
|
|
||||||
p.field(file, message, field, fieldname, false)
|
|
||||||
p.Out()
|
|
||||||
p.P(`} else {`)
|
p.P(`} else {`)
|
||||||
p.In()
|
p.In()
|
||||||
p.P(`return ` + fmtPkg.Use() + `.Errorf("proto: wrong wireType = %d for field ` + errFieldname + `", wireType)`)
|
p.P(`return ` + fmtPkg.Use() + `.Errorf("proto: wrong wireType = %d for field ` + errFieldname + `", wireType)`)
|
||||||
|
|
26
vendor/github.com/gogo/protobuf/protoc-gen-gogo/descriptor/descriptor.go
generated
vendored
26
vendor/github.com/gogo/protobuf/protoc-gen-gogo/descriptor/descriptor.go
generated
vendored
|
@ -90,3 +90,29 @@ func ForMessage(msg Message) (fd *FileDescriptorProto, md *DescriptorProto) {
|
||||||
}
|
}
|
||||||
return fd, md
|
return fd, md
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Is this field a scalar numeric type?
|
||||||
|
func (field *FieldDescriptorProto) IsScalar() bool {
|
||||||
|
if field.Type == nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
switch *field.Type {
|
||||||
|
case FieldDescriptorProto_TYPE_DOUBLE,
|
||||||
|
FieldDescriptorProto_TYPE_FLOAT,
|
||||||
|
FieldDescriptorProto_TYPE_INT64,
|
||||||
|
FieldDescriptorProto_TYPE_UINT64,
|
||||||
|
FieldDescriptorProto_TYPE_INT32,
|
||||||
|
FieldDescriptorProto_TYPE_FIXED64,
|
||||||
|
FieldDescriptorProto_TYPE_FIXED32,
|
||||||
|
FieldDescriptorProto_TYPE_BOOL,
|
||||||
|
FieldDescriptorProto_TYPE_UINT32,
|
||||||
|
FieldDescriptorProto_TYPE_ENUM,
|
||||||
|
FieldDescriptorProto_TYPE_SFIXED32,
|
||||||
|
FieldDescriptorProto_TYPE_SFIXED64,
|
||||||
|
FieldDescriptorProto_TYPE_SINT32,
|
||||||
|
FieldDescriptorProto_TYPE_SINT64:
|
||||||
|
return true
|
||||||
|
default:
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
33
vendor/github.com/gogo/protobuf/protoc-gen-gogo/descriptor/helper.go
generated
vendored
33
vendor/github.com/gogo/protobuf/protoc-gen-gogo/descriptor/helper.go
generated
vendored
|
@ -99,6 +99,17 @@ func (field *FieldDescriptorProto) GetKeyUint64() (x uint64) {
|
||||||
return x
|
return x
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (field *FieldDescriptorProto) GetKey3Uint64() (x uint64) {
|
||||||
|
packed := field.IsPacked3()
|
||||||
|
wireType := field.WireType()
|
||||||
|
fieldNumber := field.GetNumber()
|
||||||
|
if packed {
|
||||||
|
wireType = 2
|
||||||
|
}
|
||||||
|
x = uint64(uint32(fieldNumber)<<3 | uint32(wireType))
|
||||||
|
return x
|
||||||
|
}
|
||||||
|
|
||||||
func (field *FieldDescriptorProto) GetKey() []byte {
|
func (field *FieldDescriptorProto) GetKey() []byte {
|
||||||
x := field.GetKeyUint64()
|
x := field.GetKeyUint64()
|
||||||
i := 0
|
i := 0
|
||||||
|
@ -111,6 +122,18 @@ func (field *FieldDescriptorProto) GetKey() []byte {
|
||||||
return keybuf
|
return keybuf
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (field *FieldDescriptorProto) GetKey3() []byte {
|
||||||
|
x := field.GetKey3Uint64()
|
||||||
|
i := 0
|
||||||
|
keybuf := make([]byte, 0)
|
||||||
|
for i = 0; x > 127; i++ {
|
||||||
|
keybuf = append(keybuf, 0x80|uint8(x&0x7F))
|
||||||
|
x >>= 7
|
||||||
|
}
|
||||||
|
keybuf = append(keybuf, uint8(x))
|
||||||
|
return keybuf
|
||||||
|
}
|
||||||
|
|
||||||
func (desc *FileDescriptorSet) GetField(packageName, messageName, fieldName string) *FieldDescriptorProto {
|
func (desc *FileDescriptorSet) GetField(packageName, messageName, fieldName string) *FieldDescriptorProto {
|
||||||
msg := desc.GetMessage(packageName, messageName)
|
msg := desc.GetMessage(packageName, messageName)
|
||||||
if msg == nil {
|
if msg == nil {
|
||||||
|
@ -352,6 +375,16 @@ func (f *FieldDescriptorProto) IsPacked() bool {
|
||||||
return f.Options != nil && f.GetOptions().GetPacked()
|
return f.Options != nil && f.GetOptions().GetPacked()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (f *FieldDescriptorProto) IsPacked3() bool {
|
||||||
|
if f.IsRepeated() && f.IsScalar() {
|
||||||
|
if f.Options == nil || f.GetOptions().Packed == nil {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return f.Options != nil && f.GetOptions().GetPacked()
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
func (m *DescriptorProto) HasExtension() bool {
|
func (m *DescriptorProto) HasExtension() bool {
|
||||||
return len(m.ExtensionRange) > 0
|
return len(m.ExtensionRange) > 0
|
||||||
}
|
}
|
||||||
|
|
32
vendor/github.com/gogo/protobuf/protoc-gen-gogo/generator/generator.go
generated
vendored
32
vendor/github.com/gogo/protobuf/protoc-gen-gogo/generator/generator.go
generated
vendored
|
@ -1465,6 +1465,12 @@ func (g *Generator) generateImports() {
|
||||||
g.P("var _ = ", g.Pkg["proto"], ".Marshal")
|
g.P("var _ = ", g.Pkg["proto"], ".Marshal")
|
||||||
g.P("var _ = ", g.Pkg["fmt"], ".Errorf")
|
g.P("var _ = ", g.Pkg["fmt"], ".Errorf")
|
||||||
g.P("var _ = ", g.Pkg["math"], ".Inf")
|
g.P("var _ = ", g.Pkg["math"], ".Inf")
|
||||||
|
for _, cimport := range g.customImports {
|
||||||
|
if cimport == "time" {
|
||||||
|
g.P("var _ = time.Kitchen")
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
g.P()
|
g.P()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1506,6 +1512,8 @@ func (g *Generator) generateEnum(enum *EnumDescriptor) {
|
||||||
if !gogoproto.EnabledGoEnumPrefix(enum.file, enum.EnumDescriptorProto) {
|
if !gogoproto.EnabledGoEnumPrefix(enum.file, enum.EnumDescriptorProto) {
|
||||||
ccPrefix = ""
|
ccPrefix = ""
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if gogoproto.HasEnumDecl(enum.file, enum.EnumDescriptorProto) {
|
||||||
g.P("type ", ccTypeName, " int32")
|
g.P("type ", ccTypeName, " int32")
|
||||||
g.file.addExport(enum, enumSymbol{ccTypeName, enum.proto3()})
|
g.file.addExport(enum, enumSymbol{ccTypeName, enum.proto3()})
|
||||||
g.P("const (")
|
g.P("const (")
|
||||||
|
@ -1523,6 +1531,8 @@ func (g *Generator) generateEnum(enum *EnumDescriptor) {
|
||||||
}
|
}
|
||||||
g.Out()
|
g.Out()
|
||||||
g.P(")")
|
g.P(")")
|
||||||
|
}
|
||||||
|
|
||||||
g.P("var ", ccTypeName, "_name = map[int32]string{")
|
g.P("var ", ccTypeName, "_name = map[int32]string{")
|
||||||
g.In()
|
g.In()
|
||||||
generated := make(map[int32]bool) // avoid duplicate values
|
generated := make(map[int32]bool) // avoid duplicate values
|
||||||
|
@ -1769,7 +1779,7 @@ func (g *Generator) goTag(message *Descriptor, field *descriptor.FieldDescriptor
|
||||||
|
|
||||||
func needsStar(field *descriptor.FieldDescriptorProto, proto3 bool, allowOneOf bool) bool {
|
func needsStar(field *descriptor.FieldDescriptorProto, proto3 bool, allowOneOf bool) bool {
|
||||||
if isRepeated(field) &&
|
if isRepeated(field) &&
|
||||||
(*field.Type != descriptor.FieldDescriptorProto_TYPE_MESSAGE) &&
|
(*field.Type != descriptor.FieldDescriptorProto_TYPE_MESSAGE || gogoproto.IsCustomType(field)) &&
|
||||||
(*field.Type != descriptor.FieldDescriptorProto_TYPE_GROUP) {
|
(*field.Type != descriptor.FieldDescriptorProto_TYPE_GROUP) {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
@ -2046,10 +2056,6 @@ func (g *Generator) generateMessage(message *Descriptor) {
|
||||||
oneofTypeName := make(map[*descriptor.FieldDescriptorProto]string) // without star
|
oneofTypeName := make(map[*descriptor.FieldDescriptorProto]string) // without star
|
||||||
oneofInsertPoints := make(map[int32]int) // oneof_index => offset of g.Buffer
|
oneofInsertPoints := make(map[int32]int) // oneof_index => offset of g.Buffer
|
||||||
|
|
||||||
g.PrintComments(message.path)
|
|
||||||
g.P("type ", ccTypeName, " struct {")
|
|
||||||
g.In()
|
|
||||||
|
|
||||||
// allocNames finds a conflict-free variation of the given strings,
|
// allocNames finds a conflict-free variation of the given strings,
|
||||||
// consistently mutating their suffixes.
|
// consistently mutating their suffixes.
|
||||||
// It returns the same number of strings.
|
// It returns the same number of strings.
|
||||||
|
@ -2071,7 +2077,7 @@ func (g *Generator) generateMessage(message *Descriptor) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for i, field := range message.Field {
|
for _, field := range message.Field {
|
||||||
// Allocate the getter and the field at the same time so name
|
// Allocate the getter and the field at the same time so name
|
||||||
// collisions create field/method consistent names.
|
// collisions create field/method consistent names.
|
||||||
// TODO: This allocation occurs based on the order of the fields
|
// TODO: This allocation occurs based on the order of the fields
|
||||||
|
@ -2083,6 +2089,17 @@ func (g *Generator) generateMessage(message *Descriptor) {
|
||||||
}
|
}
|
||||||
ns := allocNames(base, "Get"+base)
|
ns := allocNames(base, "Get"+base)
|
||||||
fieldName, fieldGetterName := ns[0], ns[1]
|
fieldName, fieldGetterName := ns[0], ns[1]
|
||||||
|
fieldNames[field] = fieldName
|
||||||
|
fieldGetterNames[field] = fieldGetterName
|
||||||
|
}
|
||||||
|
|
||||||
|
if gogoproto.HasTypeDecl(message.file, message.DescriptorProto) {
|
||||||
|
g.PrintComments(message.path)
|
||||||
|
g.P("type ", ccTypeName, " struct {")
|
||||||
|
g.In()
|
||||||
|
|
||||||
|
for i, field := range message.Field {
|
||||||
|
fieldName := fieldNames[field]
|
||||||
typename, wiretype := g.GoType(message, field)
|
typename, wiretype := g.GoType(message, field)
|
||||||
jsonName := *field.Name
|
jsonName := *field.Name
|
||||||
jsonTag := jsonName + ",omitempty"
|
jsonTag := jsonName + ",omitempty"
|
||||||
|
@ -2100,8 +2117,6 @@ func (g *Generator) generateMessage(message *Descriptor) {
|
||||||
moreTags = " " + *gogoMoreTags
|
moreTags = " " + *gogoMoreTags
|
||||||
}
|
}
|
||||||
tag := fmt.Sprintf("protobuf:%s json:%q%s", g.goTag(message, field, wiretype), jsonTag, moreTags)
|
tag := fmt.Sprintf("protobuf:%s json:%q%s", g.goTag(message, field, wiretype), jsonTag, moreTags)
|
||||||
fieldNames[field] = fieldName
|
|
||||||
fieldGetterNames[field] = fieldGetterName
|
|
||||||
if *field.Type == descriptor.FieldDescriptorProto_TYPE_MESSAGE && gogoproto.IsEmbed(field) {
|
if *field.Type == descriptor.FieldDescriptorProto_TYPE_MESSAGE && gogoproto.IsEmbed(field) {
|
||||||
fieldName = ""
|
fieldName = ""
|
||||||
}
|
}
|
||||||
|
@ -2189,6 +2204,7 @@ func (g *Generator) generateMessage(message *Descriptor) {
|
||||||
}
|
}
|
||||||
g.Out()
|
g.Out()
|
||||||
g.P("}")
|
g.P("}")
|
||||||
|
}
|
||||||
|
|
||||||
// Update g.Buffer to list valid oneof types.
|
// Update g.Buffer to list valid oneof types.
|
||||||
// We do this down here, after we've disambiguated the oneof type names.
|
// We do this down here, after we've disambiguated the oneof type names.
|
||||||
|
|
21
vendor/github.com/gogo/protobuf/types/any.pb.go
generated
vendored
21
vendor/github.com/gogo/protobuf/types/any.pb.go
generated
vendored
|
@ -20,9 +20,6 @@ import math "math"
|
||||||
import bytes "bytes"
|
import bytes "bytes"
|
||||||
|
|
||||||
import strings "strings"
|
import strings "strings"
|
||||||
import github_com_gogo_protobuf_proto "github.com/gogo/protobuf/proto"
|
|
||||||
import sort "sort"
|
|
||||||
import strconv "strconv"
|
|
||||||
import reflect "reflect"
|
import reflect "reflect"
|
||||||
|
|
||||||
import io "io"
|
import io "io"
|
||||||
|
@ -246,24 +243,6 @@ func valueToGoStringAny(v interface{}, typ string) string {
|
||||||
pv := reflect.Indirect(rv).Interface()
|
pv := reflect.Indirect(rv).Interface()
|
||||||
return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv)
|
return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv)
|
||||||
}
|
}
|
||||||
func extensionToGoStringAny(m github_com_gogo_protobuf_proto.Message) string {
|
|
||||||
e := github_com_gogo_protobuf_proto.GetUnsafeExtensionsMap(m)
|
|
||||||
if e == nil {
|
|
||||||
return "nil"
|
|
||||||
}
|
|
||||||
s := "proto.NewUnsafeXXX_InternalExtensions(map[int32]proto.Extension{"
|
|
||||||
keys := make([]int, 0, len(e))
|
|
||||||
for k := range e {
|
|
||||||
keys = append(keys, int(k))
|
|
||||||
}
|
|
||||||
sort.Ints(keys)
|
|
||||||
ss := []string{}
|
|
||||||
for _, k := range keys {
|
|
||||||
ss = append(ss, strconv.Itoa(k)+": "+e[int32(k)].GoString())
|
|
||||||
}
|
|
||||||
s += strings.Join(ss, ",") + "})"
|
|
||||||
return s
|
|
||||||
}
|
|
||||||
func (m *Any) Marshal() (dAtA []byte, err error) {
|
func (m *Any) Marshal() (dAtA []byte, err error) {
|
||||||
size := m.Size()
|
size := m.Size()
|
||||||
dAtA = make([]byte, size)
|
dAtA = make([]byte, size)
|
||||||
|
|
21
vendor/github.com/gogo/protobuf/types/duration.pb.go
generated
vendored
21
vendor/github.com/gogo/protobuf/types/duration.pb.go
generated
vendored
|
@ -18,9 +18,6 @@ import fmt "fmt"
|
||||||
import math "math"
|
import math "math"
|
||||||
|
|
||||||
import strings "strings"
|
import strings "strings"
|
||||||
import github_com_gogo_protobuf_proto "github.com/gogo/protobuf/proto"
|
|
||||||
import sort "sort"
|
|
||||||
import strconv "strconv"
|
|
||||||
import reflect "reflect"
|
import reflect "reflect"
|
||||||
|
|
||||||
import io "io"
|
import io "io"
|
||||||
|
@ -204,24 +201,6 @@ func valueToGoStringDuration(v interface{}, typ string) string {
|
||||||
pv := reflect.Indirect(rv).Interface()
|
pv := reflect.Indirect(rv).Interface()
|
||||||
return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv)
|
return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv)
|
||||||
}
|
}
|
||||||
func extensionToGoStringDuration(m github_com_gogo_protobuf_proto.Message) string {
|
|
||||||
e := github_com_gogo_protobuf_proto.GetUnsafeExtensionsMap(m)
|
|
||||||
if e == nil {
|
|
||||||
return "nil"
|
|
||||||
}
|
|
||||||
s := "proto.NewUnsafeXXX_InternalExtensions(map[int32]proto.Extension{"
|
|
||||||
keys := make([]int, 0, len(e))
|
|
||||||
for k := range e {
|
|
||||||
keys = append(keys, int(k))
|
|
||||||
}
|
|
||||||
sort.Ints(keys)
|
|
||||||
ss := []string{}
|
|
||||||
for _, k := range keys {
|
|
||||||
ss = append(ss, strconv.Itoa(k)+": "+e[int32(k)].GoString())
|
|
||||||
}
|
|
||||||
s += strings.Join(ss, ",") + "})"
|
|
||||||
return s
|
|
||||||
}
|
|
||||||
func (m *Duration) Marshal() (dAtA []byte, err error) {
|
func (m *Duration) Marshal() (dAtA []byte, err error) {
|
||||||
size := m.Size()
|
size := m.Size()
|
||||||
dAtA = make([]byte, size)
|
dAtA = make([]byte, size)
|
||||||
|
|
21
vendor/github.com/gogo/protobuf/types/empty.pb.go
generated
vendored
21
vendor/github.com/gogo/protobuf/types/empty.pb.go
generated
vendored
|
@ -18,9 +18,6 @@ import fmt "fmt"
|
||||||
import math "math"
|
import math "math"
|
||||||
|
|
||||||
import strings "strings"
|
import strings "strings"
|
||||||
import github_com_gogo_protobuf_proto "github.com/gogo/protobuf/proto"
|
|
||||||
import sort "sort"
|
|
||||||
import strconv "strconv"
|
|
||||||
import reflect "reflect"
|
import reflect "reflect"
|
||||||
|
|
||||||
import io "io"
|
import io "io"
|
||||||
|
@ -127,24 +124,6 @@ func valueToGoStringEmpty(v interface{}, typ string) string {
|
||||||
pv := reflect.Indirect(rv).Interface()
|
pv := reflect.Indirect(rv).Interface()
|
||||||
return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv)
|
return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv)
|
||||||
}
|
}
|
||||||
func extensionToGoStringEmpty(m github_com_gogo_protobuf_proto.Message) string {
|
|
||||||
e := github_com_gogo_protobuf_proto.GetUnsafeExtensionsMap(m)
|
|
||||||
if e == nil {
|
|
||||||
return "nil"
|
|
||||||
}
|
|
||||||
s := "proto.NewUnsafeXXX_InternalExtensions(map[int32]proto.Extension{"
|
|
||||||
keys := make([]int, 0, len(e))
|
|
||||||
for k := range e {
|
|
||||||
keys = append(keys, int(k))
|
|
||||||
}
|
|
||||||
sort.Ints(keys)
|
|
||||||
ss := []string{}
|
|
||||||
for _, k := range keys {
|
|
||||||
ss = append(ss, strconv.Itoa(k)+": "+e[int32(k)].GoString())
|
|
||||||
}
|
|
||||||
s += strings.Join(ss, ",") + "})"
|
|
||||||
return s
|
|
||||||
}
|
|
||||||
func (m *Empty) Marshal() (dAtA []byte, err error) {
|
func (m *Empty) Marshal() (dAtA []byte, err error) {
|
||||||
size := m.Size()
|
size := m.Size()
|
||||||
dAtA = make([]byte, size)
|
dAtA = make([]byte, size)
|
||||||
|
|
21
vendor/github.com/gogo/protobuf/types/field_mask.pb.go
generated
vendored
21
vendor/github.com/gogo/protobuf/types/field_mask.pb.go
generated
vendored
|
@ -18,9 +18,6 @@ import fmt "fmt"
|
||||||
import math "math"
|
import math "math"
|
||||||
|
|
||||||
import strings "strings"
|
import strings "strings"
|
||||||
import github_com_gogo_protobuf_proto "github.com/gogo/protobuf/proto"
|
|
||||||
import sort "sort"
|
|
||||||
import strconv "strconv"
|
|
||||||
import reflect "reflect"
|
import reflect "reflect"
|
||||||
|
|
||||||
import io "io"
|
import io "io"
|
||||||
|
@ -350,24 +347,6 @@ func valueToGoStringFieldMask(v interface{}, typ string) string {
|
||||||
pv := reflect.Indirect(rv).Interface()
|
pv := reflect.Indirect(rv).Interface()
|
||||||
return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv)
|
return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv)
|
||||||
}
|
}
|
||||||
func extensionToGoStringFieldMask(m github_com_gogo_protobuf_proto.Message) string {
|
|
||||||
e := github_com_gogo_protobuf_proto.GetUnsafeExtensionsMap(m)
|
|
||||||
if e == nil {
|
|
||||||
return "nil"
|
|
||||||
}
|
|
||||||
s := "proto.NewUnsafeXXX_InternalExtensions(map[int32]proto.Extension{"
|
|
||||||
keys := make([]int, 0, len(e))
|
|
||||||
for k := range e {
|
|
||||||
keys = append(keys, int(k))
|
|
||||||
}
|
|
||||||
sort.Ints(keys)
|
|
||||||
ss := []string{}
|
|
||||||
for _, k := range keys {
|
|
||||||
ss = append(ss, strconv.Itoa(k)+": "+e[int32(k)].GoString())
|
|
||||||
}
|
|
||||||
s += strings.Join(ss, ",") + "})"
|
|
||||||
return s
|
|
||||||
}
|
|
||||||
func (m *FieldMask) Marshal() (dAtA []byte, err error) {
|
func (m *FieldMask) Marshal() (dAtA []byte, err error) {
|
||||||
size := m.Size()
|
size := m.Size()
|
||||||
dAtA = make([]byte, size)
|
dAtA = make([]byte, size)
|
||||||
|
|
20
vendor/github.com/gogo/protobuf/types/struct.pb.go
generated
vendored
20
vendor/github.com/gogo/protobuf/types/struct.pb.go
generated
vendored
|
@ -22,8 +22,6 @@ import math "math"
|
||||||
import strconv "strconv"
|
import strconv "strconv"
|
||||||
|
|
||||||
import strings "strings"
|
import strings "strings"
|
||||||
import github_com_gogo_protobuf_proto "github.com/gogo/protobuf/proto"
|
|
||||||
import sort "sort"
|
|
||||||
import reflect "reflect"
|
import reflect "reflect"
|
||||||
import github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
|
import github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
|
||||||
|
|
||||||
|
@ -748,24 +746,6 @@ func valueToGoStringStruct(v interface{}, typ string) string {
|
||||||
pv := reflect.Indirect(rv).Interface()
|
pv := reflect.Indirect(rv).Interface()
|
||||||
return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv)
|
return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv)
|
||||||
}
|
}
|
||||||
func extensionToGoStringStruct(m github_com_gogo_protobuf_proto.Message) string {
|
|
||||||
e := github_com_gogo_protobuf_proto.GetUnsafeExtensionsMap(m)
|
|
||||||
if e == nil {
|
|
||||||
return "nil"
|
|
||||||
}
|
|
||||||
s := "proto.NewUnsafeXXX_InternalExtensions(map[int32]proto.Extension{"
|
|
||||||
keys := make([]int, 0, len(e))
|
|
||||||
for k := range e {
|
|
||||||
keys = append(keys, int(k))
|
|
||||||
}
|
|
||||||
sort.Ints(keys)
|
|
||||||
ss := []string{}
|
|
||||||
for _, k := range keys {
|
|
||||||
ss = append(ss, strconv.Itoa(k)+": "+e[int32(k)].GoString())
|
|
||||||
}
|
|
||||||
s += strings.Join(ss, ",") + "})"
|
|
||||||
return s
|
|
||||||
}
|
|
||||||
func (m *Struct) Marshal() (dAtA []byte, err error) {
|
func (m *Struct) Marshal() (dAtA []byte, err error) {
|
||||||
size := m.Size()
|
size := m.Size()
|
||||||
dAtA = make([]byte, size)
|
dAtA = make([]byte, size)
|
||||||
|
|
21
vendor/github.com/gogo/protobuf/types/timestamp.pb.go
generated
vendored
21
vendor/github.com/gogo/protobuf/types/timestamp.pb.go
generated
vendored
|
@ -18,9 +18,6 @@ import fmt "fmt"
|
||||||
import math "math"
|
import math "math"
|
||||||
|
|
||||||
import strings "strings"
|
import strings "strings"
|
||||||
import github_com_gogo_protobuf_proto "github.com/gogo/protobuf/proto"
|
|
||||||
import sort "sort"
|
|
||||||
import strconv "strconv"
|
|
||||||
import reflect "reflect"
|
import reflect "reflect"
|
||||||
|
|
||||||
import io "io"
|
import io "io"
|
||||||
|
@ -216,24 +213,6 @@ func valueToGoStringTimestamp(v interface{}, typ string) string {
|
||||||
pv := reflect.Indirect(rv).Interface()
|
pv := reflect.Indirect(rv).Interface()
|
||||||
return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv)
|
return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv)
|
||||||
}
|
}
|
||||||
func extensionToGoStringTimestamp(m github_com_gogo_protobuf_proto.Message) string {
|
|
||||||
e := github_com_gogo_protobuf_proto.GetUnsafeExtensionsMap(m)
|
|
||||||
if e == nil {
|
|
||||||
return "nil"
|
|
||||||
}
|
|
||||||
s := "proto.NewUnsafeXXX_InternalExtensions(map[int32]proto.Extension{"
|
|
||||||
keys := make([]int, 0, len(e))
|
|
||||||
for k := range e {
|
|
||||||
keys = append(keys, int(k))
|
|
||||||
}
|
|
||||||
sort.Ints(keys)
|
|
||||||
ss := []string{}
|
|
||||||
for _, k := range keys {
|
|
||||||
ss = append(ss, strconv.Itoa(k)+": "+e[int32(k)].GoString())
|
|
||||||
}
|
|
||||||
s += strings.Join(ss, ",") + "})"
|
|
||||||
return s
|
|
||||||
}
|
|
||||||
func (m *Timestamp) Marshal() (dAtA []byte, err error) {
|
func (m *Timestamp) Marshal() (dAtA []byte, err error) {
|
||||||
size := m.Size()
|
size := m.Size()
|
||||||
dAtA = make([]byte, size)
|
dAtA = make([]byte, size)
|
||||||
|
|
21
vendor/github.com/gogo/protobuf/types/wrappers.pb.go
generated
vendored
21
vendor/github.com/gogo/protobuf/types/wrappers.pb.go
generated
vendored
|
@ -28,9 +28,6 @@ import math "math"
|
||||||
import bytes "bytes"
|
import bytes "bytes"
|
||||||
|
|
||||||
import strings "strings"
|
import strings "strings"
|
||||||
import github_com_gogo_protobuf_proto "github.com/gogo/protobuf/proto"
|
|
||||||
import sort "sort"
|
|
||||||
import strconv "strconv"
|
|
||||||
import reflect "reflect"
|
import reflect "reflect"
|
||||||
|
|
||||||
import io "io"
|
import io "io"
|
||||||
|
@ -899,24 +896,6 @@ func valueToGoStringWrappers(v interface{}, typ string) string {
|
||||||
pv := reflect.Indirect(rv).Interface()
|
pv := reflect.Indirect(rv).Interface()
|
||||||
return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv)
|
return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv)
|
||||||
}
|
}
|
||||||
func extensionToGoStringWrappers(m github_com_gogo_protobuf_proto.Message) string {
|
|
||||||
e := github_com_gogo_protobuf_proto.GetUnsafeExtensionsMap(m)
|
|
||||||
if e == nil {
|
|
||||||
return "nil"
|
|
||||||
}
|
|
||||||
s := "proto.NewUnsafeXXX_InternalExtensions(map[int32]proto.Extension{"
|
|
||||||
keys := make([]int, 0, len(e))
|
|
||||||
for k := range e {
|
|
||||||
keys = append(keys, int(k))
|
|
||||||
}
|
|
||||||
sort.Ints(keys)
|
|
||||||
ss := []string{}
|
|
||||||
for _, k := range keys {
|
|
||||||
ss = append(ss, strconv.Itoa(k)+": "+e[int32(k)].GoString())
|
|
||||||
}
|
|
||||||
s += strings.Join(ss, ",") + "})"
|
|
||||||
return s
|
|
||||||
}
|
|
||||||
func (m *DoubleValue) Marshal() (dAtA []byte, err error) {
|
func (m *DoubleValue) Marshal() (dAtA []byte, err error) {
|
||||||
size := m.Size()
|
size := m.Size()
|
||||||
dAtA = make([]byte, size)
|
dAtA = make([]byte, size)
|
||||||
|
|
Loading…
Reference in a new issue