all: Update protobuf package 1.0.0 -> 1.2.0 (#5452)

Also adds a few file global options to keep the generated code similar
to what we already had.

vendor/github.com/gogo/protobuf/vanity/test/fast/gogovanity.pb.go

@@ -1,15 +1,6 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
 // source: gogovanity.proto
 
-/*
-	Package vanity is a generated protocol buffer package.
-
-	It is generated from these files:
-		gogovanity.proto
-
-	It has these top-level messages:
-		B
-*/
 package vanity
 
 import proto "github.com/gogo/protobuf/proto"
@@ -31,16 +22,46 @@ var _ = math.Inf
 const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
 
 type B struct {
-	String_          *string `protobuf:"bytes,1,opt,name=String" json:"String,omitempty"`
-	Int64            *int64  `protobuf:"varint,2,opt,name=Int64" json:"Int64,omitempty"`
-	Int32            *int32  `protobuf:"varint,3,opt,name=Int32,def=1234" json:"Int32,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
+	String_              *string  `protobuf:"bytes,1,opt,name=String" json:"String,omitempty"`
+	Int64                *int64   `protobuf:"varint,2,opt,name=Int64" json:"Int64,omitempty"`
+	Int32                *int32   `protobuf:"varint,3,opt,name=Int32,def=1234" json:"Int32,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *B) Reset()                    { *m = B{} }
-func (m *B) String() string            { return proto.CompactTextString(m) }
-func (*B) ProtoMessage()               {}
-func (*B) Descriptor() ([]byte, []int) { return fileDescriptorGogovanity, []int{0} }
+func (m *B) Reset()         { *m = B{} }
+func (m *B) String() string { return proto.CompactTextString(m) }
+func (*B) ProtoMessage()    {}
+func (*B) Descriptor() ([]byte, []int) {
+	return fileDescriptor_gogovanity_77d0a6938d93e1f7, []int{0}
+}
+func (m *B) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *B) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_B.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (dst *B) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_B.Merge(dst, src)
+}
+func (m *B) XXX_Size() int {
+	return m.Size()
+}
+func (m *B) XXX_DiscardUnknown() {
+	xxx_messageInfo_B.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_B proto.InternalMessageInfo
 
 const Default_B_Int32 int32 = 1234
 
@@ -115,6 +136,9 @@ func encodeVarintGogovanity(dAtA []byte, offset int, v uint64) int {
 	return offset + 1
 }
 func (m *B) Size() (n int) {
+	if m == nil {
+		return 0
+	}
 	var l int
 	_ = l
 	if m.String_ != nil {
@@ -372,9 +396,9 @@ var (
 	ErrIntOverflowGogovanity   = fmt.Errorf("proto: integer overflow")
 )
 
-func init() { proto.RegisterFile("gogovanity.proto", fileDescriptorGogovanity) }
+func init() { proto.RegisterFile("gogovanity.proto", fileDescriptor_gogovanity_77d0a6938d93e1f7) }
 
-var fileDescriptorGogovanity = []byte{
+var fileDescriptor_gogovanity_77d0a6938d93e1f7 = []byte{
 	// 157 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x48, 0xcf, 0x4f, 0xcf,
 	0x2f, 0x4b, 0xcc, 0xcb, 0x2c, 0xa9, 0xd4, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x83, 0xf0,

vendor/github.com/gogo/protobuf/vanity/test/fast/proto3.pb.go

@@ -1,15 +1,6 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
 // source: proto3.proto
 
-/*
-Package vanity is a generated protocol buffer package.
-
-It is generated from these files:
-	proto3.proto
-
-It has these top-level messages:
-	Aproto3
-*/
 package vanity
 
 import proto "github.com/gogo/protobuf/proto"
@@ -30,13 +21,44 @@ var _ = math.Inf
 const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
 
 type Aproto3 struct {
-	B string `protobuf:"bytes,1,opt,name=B,proto3" json:"B,omitempty"`
+	B                    string   `protobuf:"bytes,1,opt,name=B,proto3" json:"B,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Aproto3) Reset()                    { *m = Aproto3{} }
-func (m *Aproto3) String() string            { return proto.CompactTextString(m) }
-func (*Aproto3) ProtoMessage()               {}
-func (*Aproto3) Descriptor() ([]byte, []int) { return fileDescriptorProto3, []int{0} }
+func (m *Aproto3) Reset()         { *m = Aproto3{} }
+func (m *Aproto3) String() string { return proto.CompactTextString(m) }
+func (*Aproto3) ProtoMessage()    {}
+func (*Aproto3) Descriptor() ([]byte, []int) {
+	return fileDescriptor_proto3_7d4345ceecd7203e, []int{0}
+}
+func (m *Aproto3) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *Aproto3) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_Aproto3.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (dst *Aproto3) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Aproto3.Merge(dst, src)
+}
+func (m *Aproto3) XXX_Size() int {
+	return m.Size()
+}
+func (m *Aproto3) XXX_DiscardUnknown() {
+	xxx_messageInfo_Aproto3.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Aproto3 proto.InternalMessageInfo
 
 func (m *Aproto3) GetB() string {
 	if m != nil {
@@ -69,6 +91,9 @@ func (m *Aproto3) MarshalTo(dAtA []byte) (int, error) {
 		i = encodeVarintProto3(dAtA, i, uint64(len(m.B)))
 		i += copy(dAtA[i:], m.B)
 	}
+	if m.XXX_unrecognized != nil {
+		i += copy(dAtA[i:], m.XXX_unrecognized)
+	}
 	return i, nil
 }
 
@@ -82,12 +107,18 @@ func encodeVarintProto3(dAtA []byte, offset int, v uint64) int {
 	return offset + 1
 }
 func (m *Aproto3) Size() (n int) {
+	if m == nil {
+		return 0
+	}
 	var l int
 	_ = l
 	l = len(m.B)
 	if l > 0 {
 		n += 1 + l + sovProto3(uint64(l))
 	}
+	if m.XXX_unrecognized != nil {
+		n += len(m.XXX_unrecognized)
+	}
 	return n
 }
 
@@ -174,6 +205,7 @@ func (m *Aproto3) Unmarshal(dAtA []byte) error {
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
+			m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...)
 			iNdEx += skippy
 		}
 	}
@@ -288,9 +320,9 @@ var (
 	ErrIntOverflowProto3   = fmt.Errorf("proto: integer overflow")
 )
 
-func init() { proto.RegisterFile("proto3.proto", fileDescriptorProto3) }
+func init() { proto.RegisterFile("proto3.proto", fileDescriptor_proto3_7d4345ceecd7203e) }
 
-var fileDescriptorProto3 = []byte{
+var fileDescriptor_proto3_7d4345ceecd7203e = []byte{
 	// 82 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x29, 0x28, 0xca, 0x2f,
 	0xc9, 0x37, 0xd6, 0x03, 0x53, 0x42, 0x6c, 0x65, 0x89, 0x79, 0x99, 0x25, 0x95, 0x4a, 0xe2, 0x5c,

vendor/github.com/gogo/protobuf/vanity/test/fast/vanity.pb.go

@@ -1,21 +1,14 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
 // source: vanity.proto
 
-/*
-	Package vanity is a generated protocol buffer package.
-
-	It is generated from these files:
-		vanity.proto
-
-	It has these top-level messages:
-		A
-*/
 package vanity
 
 import proto "github.com/gogo/protobuf/proto"
 import fmt "fmt"
 import math "math"
 
+import github_com_gogo_protobuf_proto "github.com/gogo/protobuf/proto"
+
 import io "io"
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -30,15 +23,45 @@ var _ = math.Inf
 const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
 
 type A struct {
-	Strings          *string `protobuf:"bytes,1,opt,name=Strings" json:"Strings,omitempty"`
-	Int              *int64  `protobuf:"varint,2,req,name=Int" json:"Int,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
+	Strings              *string  `protobuf:"bytes,1,opt,name=Strings" json:"Strings,omitempty"`
+	Int                  *int64   `protobuf:"varint,2,req,name=Int" json:"Int,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *A) Reset()                    { *m = A{} }
-func (m *A) String() string            { return proto.CompactTextString(m) }
-func (*A) ProtoMessage()               {}
-func (*A) Descriptor() ([]byte, []int) { return fileDescriptorVanity, []int{0} }
+func (m *A) Reset()         { *m = A{} }
+func (m *A) String() string { return proto.CompactTextString(m) }
+func (*A) ProtoMessage()    {}
+func (*A) Descriptor() ([]byte, []int) {
+	return fileDescriptor_vanity_62f5a5ee00b3fc23, []int{0}
+}
+func (m *A) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *A) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_A.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (dst *A) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_A.Merge(dst, src)
+}
+func (m *A) XXX_Size() int {
+	return m.Size()
+}
+func (m *A) XXX_DiscardUnknown() {
+	xxx_messageInfo_A.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_A proto.InternalMessageInfo
 
 func (m *A) GetStrings() string {
 	if m != nil && m.Strings != nil {
@@ -79,7 +102,7 @@ func (m *A) MarshalTo(dAtA []byte) (int, error) {
 		i += copy(dAtA[i:], *m.Strings)
 	}
 	if m.Int == nil {
-		return 0, proto.NewRequiredNotSetError("Int")
+		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("Int")
 	} else {
 		dAtA[i] = 0x10
 		i++
@@ -101,6 +124,9 @@ func encodeVarintVanity(dAtA []byte, offset int, v uint64) int {
 	return offset + 1
 }
 func (m *A) Size() (n int) {
+	if m == nil {
+		return 0
+	}
 	var l int
 	_ = l
 	if m.Strings != nil {
@@ -227,7 +253,7 @@ func (m *A) Unmarshal(dAtA []byte) error {
 		}
 	}
 	if hasFields[0]&uint64(0x00000001) == 0 {
-		return proto.NewRequiredNotSetError("Int")
+		return github_com_gogo_protobuf_proto.NewRequiredNotSetError("Int")
 	}
 
 	if iNdEx > l {
@@ -340,9 +366,9 @@ var (
 	ErrIntOverflowVanity   = fmt.Errorf("proto: integer overflow")
 )
 
-func init() { proto.RegisterFile("vanity.proto", fileDescriptorVanity) }
+func init() { proto.RegisterFile("vanity.proto", fileDescriptor_vanity_62f5a5ee00b3fc23) }
 
-var fileDescriptorVanity = []byte{
+var fileDescriptor_vanity_62f5a5ee00b3fc23 = []byte{
 	// 97 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x29, 0x4b, 0xcc, 0xcb,
 	0x2c, 0xa9, 0xd4, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x83, 0xf0, 0x94, 0xf4, 0xb9, 0x18,

vendor/github.com/gogo/protobuf/vanity/test/faster/gogovanity.pb.go

@@ -1,15 +1,6 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
 // source: gogovanity.proto
 
-/*
-	Package vanity is a generated protocol buffer package.
-
-	It is generated from these files:
-		gogovanity.proto
-
-	It has these top-level messages:
-		B
-*/
 package vanity
 
 import proto "github.com/gogo/protobuf/proto"
@@ -36,10 +27,38 @@ type B struct {
 	Int32   *int32  `protobuf:"varint,3,opt,name=Int32,def=1234" json:"Int32,omitempty"`
 }
 
-func (m *B) Reset()                    { *m = B{} }
-func (m *B) String() string            { return proto.CompactTextString(m) }
-func (*B) ProtoMessage()               {}
-func (*B) Descriptor() ([]byte, []int) { return fileDescriptorGogovanity, []int{0} }
+func (m *B) Reset()         { *m = B{} }
+func (m *B) String() string { return proto.CompactTextString(m) }
+func (*B) ProtoMessage()    {}
+func (*B) Descriptor() ([]byte, []int) {
+	return fileDescriptor_gogovanity_5ec1359daac061c2, []int{0}
+}
+func (m *B) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *B) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_B.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (dst *B) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_B.Merge(dst, src)
+}
+func (m *B) XXX_Size() int {
+	return m.Size()
+}
+func (m *B) XXX_DiscardUnknown() {
+	xxx_messageInfo_B.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_B proto.InternalMessageInfo
 
 const Default_B_Int32 int32 = 1234
 
@@ -109,6 +128,9 @@ func encodeVarintGogovanity(dAtA []byte, offset int, v uint64) int {
 	return offset + 1
 }
 func (m *B) Size() (n int) {
+	if m == nil {
+		return 0
+	}
 	var l int
 	_ = l
 	if m.String_ != nil {
@@ -359,10 +381,10 @@ var (
 	ErrIntOverflowGogovanity   = fmt.Errorf("proto: integer overflow")
 )
 
-func init() { proto.RegisterFile("gogovanity.proto", fileDescriptorGogovanity) }
+func init() { proto.RegisterFile("gogovanity.proto", fileDescriptor_gogovanity_5ec1359daac061c2) }
 
-var fileDescriptorGogovanity = []byte{
-	// 163 bytes of a gzipped FileDescriptorProto
+var fileDescriptor_gogovanity_5ec1359daac061c2 = []byte{
+	// 171 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x48, 0xcf, 0x4f, 0xcf,
 	0x2f, 0x4b, 0xcc, 0xcb, 0x2c, 0xa9, 0xd4, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x83, 0xf0,
 	0xa4, 0x74, 0xd3, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0x41, 0x8a, 0xf4,
@@ -371,7 +393,7 @@ var fileDescriptorGogovanity = []byte{
 	0x70, 0x3a, 0xb1, 0x9c, 0xb8, 0x27, 0xcf, 0x18, 0x04, 0x15, 0x13, 0x92, 0xe2, 0x62, 0xf5, 0xcc,
 	0x2b, 0x31, 0x33, 0x91, 0x60, 0x52, 0x60, 0xd4, 0x60, 0x06, 0x4b, 0x32, 0x04, 0x41, 0x84, 0xa0,
 	0x72, 0xc6, 0x46, 0x12, 0xcc, 0x0a, 0x8c, 0x1a, 0xac, 0x56, 0x2c, 0x86, 0x46, 0xc6, 0x26, 0x41,
-	0x10, 0x21, 0x27, 0x81, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e,
-	0x71, 0xc2, 0x63, 0x39, 0x06, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0xfc, 0xde, 0x29, 0x72, 0xb6,
-	0x00, 0x00, 0x00,
+	0x10, 0x21, 0x27, 0x89, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e,
+	0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63, 0x00, 0x04, 0x00,
+	0x00, 0xff, 0xff, 0xbf, 0xbb, 0x2c, 0x28, 0xbe, 0x00, 0x00, 0x00,
 }

vendor/github.com/gogo/protobuf/vanity/test/faster/proto3.pb.go

@@ -1,15 +1,6 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
 // source: proto3.proto
 
-/*
-Package vanity is a generated protocol buffer package.
-
-It is generated from these files:
-	proto3.proto
-
-It has these top-level messages:
-	Aproto3
-*/
 package vanity
 
 import proto "github.com/gogo/protobuf/proto"
@@ -33,10 +24,38 @@ type Aproto3 struct {
 	B string `protobuf:"bytes,1,opt,name=B,proto3" json:"B,omitempty"`
 }
 
-func (m *Aproto3) Reset()                    { *m = Aproto3{} }
-func (m *Aproto3) String() string            { return proto.CompactTextString(m) }
-func (*Aproto3) ProtoMessage()               {}
-func (*Aproto3) Descriptor() ([]byte, []int) { return fileDescriptorProto3, []int{0} }
+func (m *Aproto3) Reset()         { *m = Aproto3{} }
+func (m *Aproto3) String() string { return proto.CompactTextString(m) }
+func (*Aproto3) ProtoMessage()    {}
+func (*Aproto3) Descriptor() ([]byte, []int) {
+	return fileDescriptor_proto3_b593ea763dc96224, []int{0}
+}
+func (m *Aproto3) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *Aproto3) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_Aproto3.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (dst *Aproto3) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Aproto3.Merge(dst, src)
+}
+func (m *Aproto3) XXX_Size() int {
+	return m.Size()
+}
+func (m *Aproto3) XXX_DiscardUnknown() {
+	xxx_messageInfo_Aproto3.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Aproto3 proto.InternalMessageInfo
 
 func (m *Aproto3) GetB() string {
 	if m != nil {
@@ -82,6 +101,9 @@ func encodeVarintProto3(dAtA []byte, offset int, v uint64) int {
 	return offset + 1
 }
 func (m *Aproto3) Size() (n int) {
+	if m == nil {
+		return 0
+	}
 	var l int
 	_ = l
 	l = len(m.B)
@@ -288,14 +310,14 @@ var (
 	ErrIntOverflowProto3   = fmt.Errorf("proto: integer overflow")
 )
 
-func init() { proto.RegisterFile("proto3.proto", fileDescriptorProto3) }
+func init() { proto.RegisterFile("proto3.proto", fileDescriptor_proto3_b593ea763dc96224) }
 
-var fileDescriptorProto3 = []byte{
-	// 87 bytes of a gzipped FileDescriptorProto
+var fileDescriptor_proto3_b593ea763dc96224 = []byte{
+	// 95 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x29, 0x28, 0xca, 0x2f,
 	0xc9, 0x37, 0xd6, 0x03, 0x53, 0x42, 0x6c, 0x65, 0x89, 0x79, 0x99, 0x25, 0x95, 0x4a, 0xe2, 0x5c,
 	0xec, 0x8e, 0x10, 0x09, 0x21, 0x1e, 0x2e, 0x46, 0x27, 0x09, 0x46, 0x05, 0x46, 0x0d, 0xce, 0x20,
-	0x46, 0x27, 0x27, 0x81, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e,
-	0x71, 0xc2, 0x63, 0x39, 0x86, 0x24, 0x36, 0x88, 0x3a, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x77,
-	0x21, 0xa3, 0xc0, 0x49, 0x00, 0x00, 0x00,
+	0x46, 0x27, 0x27, 0x89, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e,
+	0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63, 0x48, 0x62, 0x83,
+	0xa8, 0x07, 0x04, 0x00, 0x00, 0xff, 0xff, 0x73, 0xb1, 0xdb, 0xd2, 0x51, 0x00, 0x00, 0x00,
 }

vendor/github.com/gogo/protobuf/vanity/test/faster/vanity.pb.go

@@ -1,15 +1,6 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
 // source: vanity.proto
 
-/*
-	Package vanity is a generated protocol buffer package.
-
-	It is generated from these files:
-		vanity.proto
-
-	It has these top-level messages:
-		A
-*/
 package vanity
 
 import proto "github.com/gogo/protobuf/proto"
@@ -17,6 +8,7 @@ import fmt "fmt"
 import math "math"
 
 import io "io"
+import github_com_gogo_protobuf_proto "github.com/gogo/protobuf/proto"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -34,10 +26,38 @@ type A struct {
 	Int     int64  `protobuf:"varint,2,req,name=Int" json:"Int"`
 }
 
-func (m *A) Reset()                    { *m = A{} }
-func (m *A) String() string            { return proto.CompactTextString(m) }
-func (*A) ProtoMessage()               {}
-func (*A) Descriptor() ([]byte, []int) { return fileDescriptorVanity, []int{0} }
+func (m *A) Reset()         { *m = A{} }
+func (m *A) String() string { return proto.CompactTextString(m) }
+func (*A) ProtoMessage()    {}
+func (*A) Descriptor() ([]byte, []int) {
+	return fileDescriptor_vanity_c8a9a949a2e14347, []int{0}
+}
+func (m *A) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *A) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_A.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (dst *A) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_A.Merge(dst, src)
+}
+func (m *A) XXX_Size() int {
+	return m.Size()
+}
+func (m *A) XXX_DiscardUnknown() {
+	xxx_messageInfo_A.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_A proto.InternalMessageInfo
 
 func (m *A) GetStrings() string {
 	if m != nil {
@@ -91,6 +111,9 @@ func encodeVarintVanity(dAtA []byte, offset int, v uint64) int {
 	return offset + 1
 }
 func (m *A) Size() (n int) {
+	if m == nil {
+		return 0
+	}
 	var l int
 	_ = l
 	l = len(m.Strings)
@@ -207,7 +230,7 @@ func (m *A) Unmarshal(dAtA []byte) error {
 		}
 	}
 	if hasFields[0]&uint64(0x00000001) == 0 {
-		return proto.NewRequiredNotSetError("Int")
+		return github_com_gogo_protobuf_proto.NewRequiredNotSetError("Int")
 	}
 
 	if iNdEx > l {
@@ -320,15 +343,16 @@ var (
 	ErrIntOverflowVanity   = fmt.Errorf("proto: integer overflow")
 )
 
-func init() { proto.RegisterFile("vanity.proto", fileDescriptorVanity) }
+func init() { proto.RegisterFile("vanity.proto", fileDescriptor_vanity_c8a9a949a2e14347) }
 
-var fileDescriptorVanity = []byte{
-	// 109 bytes of a gzipped FileDescriptorProto
+var fileDescriptor_vanity_c8a9a949a2e14347 = []byte{
+	// 117 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x29, 0x4b, 0xcc, 0xcb,
 	0x2c, 0xa9, 0xd4, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x83, 0xf0, 0x94, 0xac, 0xb9, 0x18,
 	0x1d, 0x85, 0xe4, 0xb8, 0xd8, 0x83, 0x4b, 0x8a, 0x32, 0xf3, 0xd2, 0x8b, 0x25, 0x18, 0x15, 0x18,
 	0x35, 0x38, 0x9d, 0x58, 0x4e, 0xdc, 0x93, 0x67, 0x08, 0x82, 0x09, 0x0a, 0x89, 0x71, 0x31, 0x7b,
-	0xe6, 0x95, 0x48, 0x30, 0x29, 0x30, 0x69, 0x30, 0x43, 0xe5, 0x40, 0x02, 0x4e, 0x02, 0x27, 0x1e,
-	0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x84, 0xc7, 0x72, 0x0c, 0x80,
-	0x00, 0x00, 0x00, 0xff, 0xff, 0x56, 0x0d, 0x52, 0xbb, 0x65, 0x00, 0x00, 0x00,
+	0xe6, 0x95, 0x48, 0x30, 0x29, 0x30, 0x69, 0x30, 0x43, 0xe5, 0x40, 0x02, 0x4e, 0x12, 0x27, 0x1e,
+	0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x84, 0xc7, 0x72, 0x0c, 0x17,
+	0x1e, 0xcb, 0x31, 0xdc, 0x78, 0x2c, 0xc7, 0x00, 0x08, 0x00, 0x00, 0xff, 0xff, 0x8b, 0x2e, 0x6a,
+	0x0c, 0x6d, 0x00, 0x00, 0x00,
 }

vendor/github.com/gogo/protobuf/vanity/test/slick/gogovanity.pb.go

@@ -1,15 +1,6 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
 // source: gogovanity.proto
 
-/*
-	Package vanity is a generated protocol buffer package.
-
-	It is generated from these files:
-		gogovanity.proto
-
-	It has these top-level messages:
-		B
-*/
 package vanity
 
 import proto "github.com/gogo/protobuf/proto"
@@ -39,9 +30,37 @@ type B struct {
 	Int32   *int32  `protobuf:"varint,3,opt,name=Int32,def=1234" json:"Int32,omitempty"`
 }
 
-func (m *B) Reset()                    { *m = B{} }
-func (*B) ProtoMessage()               {}
-func (*B) Descriptor() ([]byte, []int) { return fileDescriptorGogovanity, []int{0} }
+func (m *B) Reset()      { *m = B{} }
+func (*B) ProtoMessage() {}
+func (*B) Descriptor() ([]byte, []int) {
+	return fileDescriptor_gogovanity_d28d049fcf27b277, []int{0}
+}
+func (m *B) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *B) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_B.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (dst *B) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_B.Merge(dst, src)
+}
+func (m *B) XXX_Size() int {
+	return m.Size()
+}
+func (m *B) XXX_DiscardUnknown() {
+	xxx_messageInfo_B.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_B proto.InternalMessageInfo
 
 const Default_B_Int32 int32 = 1234
 
@@ -177,6 +196,9 @@ func encodeVarintGogovanity(dAtA []byte, offset int, v uint64) int {
 	return offset + 1
 }
 func (m *B) Size() (n int) {
+	if m == nil {
+		return 0
+	}
 	var l int
 	_ = l
 	if m.String_ != nil {
@@ -447,10 +469,10 @@ var (
 	ErrIntOverflowGogovanity   = fmt.Errorf("proto: integer overflow")
 )
 
-func init() { proto.RegisterFile("gogovanity.proto", fileDescriptorGogovanity) }
+func init() { proto.RegisterFile("gogovanity.proto", fileDescriptor_gogovanity_d28d049fcf27b277) }
 
-var fileDescriptorGogovanity = []byte{
-	// 192 bytes of a gzipped FileDescriptorProto
+var fileDescriptor_gogovanity_d28d049fcf27b277 = []byte{
+	// 201 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x48, 0xcf, 0x4f, 0xcf,
 	0x2f, 0x4b, 0xcc, 0xcb, 0x2c, 0xa9, 0xd4, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x83, 0xf0,
 	0xa4, 0x74, 0xd3, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0x41, 0x8a, 0xf4,
@@ -459,8 +481,9 @@ var fileDescriptorGogovanity = []byte{
 	0x70, 0x3a, 0xb1, 0x9c, 0xb8, 0x27, 0xcf, 0x18, 0x04, 0x15, 0x13, 0x92, 0xe2, 0x62, 0xf5, 0xcc,
 	0x2b, 0x31, 0x33, 0x91, 0x60, 0x52, 0x60, 0xd4, 0x60, 0x06, 0x4b, 0x32, 0x04, 0x41, 0x84, 0xa0,
 	0x72, 0xc6, 0x46, 0x12, 0xcc, 0x0a, 0x8c, 0x1a, 0xac, 0x56, 0x2c, 0x86, 0x46, 0xc6, 0x26, 0x41,
-	0x10, 0x21, 0x27, 0x9d, 0x0b, 0x0f, 0xe5, 0x18, 0x6e, 0x3c, 0x94, 0x63, 0xf8, 0xf0, 0x50, 0x8e,
+	0x10, 0x21, 0x27, 0x93, 0x0b, 0x0f, 0xe5, 0x18, 0x6e, 0x3c, 0x94, 0x63, 0xf8, 0xf0, 0x50, 0x8e,
 	0xb1, 0xe1, 0x91, 0x1c, 0xe3, 0x8a, 0x47, 0x72, 0x8c, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24,
 	0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x8b, 0x47, 0x72, 0x0c, 0x1f, 0x1e, 0xc9, 0x31, 0x4e, 0x78,
-	0x2c, 0xc7, 0x00, 0x08, 0x00, 0x00, 0xff, 0xff, 0x0a, 0x7e, 0xee, 0xf2, 0xd2, 0x00, 0x00, 0x00,
+	0x2c, 0xc7, 0x70, 0xe1, 0xb1, 0x1c, 0xc3, 0x8d, 0xc7, 0x72, 0x0c, 0x80, 0x00, 0x00, 0x00, 0xff,
+	0xff, 0xab, 0xeb, 0xeb, 0x07, 0xda, 0x00, 0x00, 0x00,
 }

vendor/github.com/gogo/protobuf/vanity/test/slick/proto3.pb.go

@@ -1,15 +1,6 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
 // source: proto3.proto
 
-/*
-Package vanity is a generated protocol buffer package.
-
-It is generated from these files:
-	proto3.proto
-
-It has these top-level messages:
-	Aproto3
-*/
 package vanity
 
 import proto "github.com/gogo/protobuf/proto"
@@ -36,9 +27,37 @@ type Aproto3 struct {
 	B string `protobuf:"bytes,1,opt,name=B,proto3" json:"B,omitempty"`
 }
 
-func (m *Aproto3) Reset()                    { *m = Aproto3{} }
-func (*Aproto3) ProtoMessage()               {}
-func (*Aproto3) Descriptor() ([]byte, []int) { return fileDescriptorProto3, []int{0} }
+func (m *Aproto3) Reset()      { *m = Aproto3{} }
+func (*Aproto3) ProtoMessage() {}
+func (*Aproto3) Descriptor() ([]byte, []int) {
+	return fileDescriptor_proto3_1bf23e323c5dd138, []int{0}
+}
+func (m *Aproto3) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *Aproto3) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_Aproto3.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (dst *Aproto3) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Aproto3.Merge(dst, src)
+}
+func (m *Aproto3) XXX_Size() int {
+	return m.Size()
+}
+func (m *Aproto3) XXX_DiscardUnknown() {
+	xxx_messageInfo_Aproto3.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Aproto3 proto.InternalMessageInfo
 
 func (m *Aproto3) GetB() string {
 	if m != nil {
@@ -126,6 +145,9 @@ func encodeVarintProto3(dAtA []byte, offset int, v uint64) int {
 	return offset + 1
 }
 func (m *Aproto3) Size() (n int) {
+	if m == nil {
+		return 0
+	}
 	var l int
 	_ = l
 	l = len(m.B)
@@ -350,16 +372,16 @@ var (
 	ErrIntOverflowProto3   = fmt.Errorf("proto: integer overflow")
 )
 
-func init() { proto.RegisterFile("proto3.proto", fileDescriptorProto3) }
+func init() { proto.RegisterFile("proto3.proto", fileDescriptor_proto3_1bf23e323c5dd138) }
 
-var fileDescriptorProto3 = []byte{
-	// 116 bytes of a gzipped FileDescriptorProto
+var fileDescriptor_proto3_1bf23e323c5dd138 = []byte{
+	// 125 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x29, 0x28, 0xca, 0x2f,
 	0xc9, 0x37, 0xd6, 0x03, 0x53, 0x42, 0x6c, 0x65, 0x89, 0x79, 0x99, 0x25, 0x95, 0x4a, 0xe2, 0x5c,
 	0xec, 0x8e, 0x10, 0x09, 0x21, 0x1e, 0x2e, 0x46, 0x27, 0x09, 0x46, 0x05, 0x46, 0x0d, 0xce, 0x20,
-	0x46, 0x27, 0x27, 0x9d, 0x0b, 0x0f, 0xe5, 0x18, 0x6e, 0x3c, 0x94, 0x63, 0xf8, 0xf0, 0x50, 0x8e,
+	0x46, 0x27, 0x27, 0x93, 0x0b, 0x0f, 0xe5, 0x18, 0x6e, 0x3c, 0x94, 0x63, 0xf8, 0xf0, 0x50, 0x8e,
 	0xb1, 0xe1, 0x91, 0x1c, 0xe3, 0x8a, 0x47, 0x72, 0x8c, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24,
 	0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x8b, 0x47, 0x72, 0x0c, 0x1f, 0x1e, 0xc9, 0x31, 0x4e, 0x78,
-	0x2c, 0xc7, 0x90, 0xc4, 0x06, 0x31, 0x03, 0x10, 0x00, 0x00, 0xff, 0xff, 0xb1, 0xa0, 0x15, 0x6b,
-	0x65, 0x00, 0x00, 0x00,
+	0x2c, 0xc7, 0x70, 0xe1, 0xb1, 0x1c, 0xc3, 0x8d, 0xc7, 0x72, 0x0c, 0x49, 0x6c, 0x10, 0xb3, 0x00,
+	0x01, 0x00, 0x00, 0xff, 0xff, 0x3d, 0x6e, 0x6a, 0x0e, 0x6d, 0x00, 0x00, 0x00,
 }

vendor/github.com/gogo/protobuf/vanity/test/slick/vanity.pb.go

@@ -1,15 +1,6 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
 // source: vanity.proto
 
-/*
-	Package vanity is a generated protocol buffer package.
-
-	It is generated from these files:
-		vanity.proto
-
-	It has these top-level messages:
-		A
-*/
 package vanity
 
 import proto "github.com/gogo/protobuf/proto"
@@ -20,6 +11,7 @@ import strings "strings"
 import reflect "reflect"
 
 import io "io"
+import github_com_gogo_protobuf_proto "github.com/gogo/protobuf/proto"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -37,9 +29,37 @@ type A struct {
 	Int     int64  `protobuf:"varint,2,req,name=Int" json:"Int"`
 }
 
-func (m *A) Reset()                    { *m = A{} }
-func (*A) ProtoMessage()               {}
-func (*A) Descriptor() ([]byte, []int) { return fileDescriptorVanity, []int{0} }
+func (m *A) Reset()      { *m = A{} }
+func (*A) ProtoMessage() {}
+func (*A) Descriptor() ([]byte, []int) {
+	return fileDescriptor_vanity_0b672c3d48e40257, []int{0}
+}
+func (m *A) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *A) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_A.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (dst *A) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_A.Merge(dst, src)
+}
+func (m *A) XXX_Size() int {
+	return m.Size()
+}
+func (m *A) XXX_DiscardUnknown() {
+	xxx_messageInfo_A.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_A proto.InternalMessageInfo
 
 func (m *A) GetStrings() string {
 	if m != nil {
@@ -139,6 +159,9 @@ func encodeVarintVanity(dAtA []byte, offset int, v uint64) int {
 	return offset + 1
 }
 func (m *A) Size() (n int) {
+	if m == nil {
+		return 0
+	}
 	var l int
 	_ = l
 	l = len(m.Strings)
@@ -274,7 +297,7 @@ func (m *A) Unmarshal(dAtA []byte) error {
 		}
 	}
 	if hasFields[0]&uint64(0x00000001) == 0 {
-		return proto.NewRequiredNotSetError("Int")
+		return github_com_gogo_protobuf_proto.NewRequiredNotSetError("Int")
 	}
 
 	if iNdEx > l {
@@ -387,17 +410,18 @@ var (
 	ErrIntOverflowVanity   = fmt.Errorf("proto: integer overflow")
 )
 
-func init() { proto.RegisterFile("vanity.proto", fileDescriptorVanity) }
+func init() { proto.RegisterFile("vanity.proto", fileDescriptor_vanity_0b672c3d48e40257) }
 
-var fileDescriptorVanity = []byte{
-	// 138 bytes of a gzipped FileDescriptorProto
+var fileDescriptor_vanity_0b672c3d48e40257 = []byte{
+	// 147 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x29, 0x4b, 0xcc, 0xcb,
 	0x2c, 0xa9, 0xd4, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x83, 0xf0, 0x94, 0xac, 0xb9, 0x18,
 	0x1d, 0x85, 0xe4, 0xb8, 0xd8, 0x83, 0x4b, 0x8a, 0x32, 0xf3, 0xd2, 0x8b, 0x25, 0x18, 0x15, 0x18,
 	0x35, 0x38, 0x9d, 0x58, 0x4e, 0xdc, 0x93, 0x67, 0x08, 0x82, 0x09, 0x0a, 0x89, 0x71, 0x31, 0x7b,
-	0xe6, 0x95, 0x48, 0x30, 0x29, 0x30, 0x69, 0x30, 0x43, 0xe5, 0x40, 0x02, 0x4e, 0x3a, 0x17, 0x1e,
+	0xe6, 0x95, 0x48, 0x30, 0x29, 0x30, 0x69, 0x30, 0x43, 0xe5, 0x40, 0x02, 0x4e, 0x26, 0x17, 0x1e,
 	0xca, 0x31, 0xdc, 0x78, 0x28, 0xc7, 0xf0, 0xe1, 0xa1, 0x1c, 0x63, 0xc3, 0x23, 0x39, 0xc6, 0x15,
 	0x8f, 0xe4, 0x18, 0x4f, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6,
-	0x17, 0x8f, 0xe4, 0x18, 0x3e, 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, 0x8e, 0x01, 0x10, 0x00, 0x00,
-	0xff, 0xff, 0x4d, 0xd9, 0xba, 0x18, 0x81, 0x00, 0x00, 0x00,
+	0x17, 0x8f, 0xe4, 0x18, 0x3e, 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, 0x8e, 0xe1, 0xc2, 0x63, 0x39,
+	0x86, 0x1b, 0x8f, 0xe5, 0x18, 0x00, 0x01, 0x00, 0x00, 0xff, 0xff, 0x20, 0x58, 0xc4, 0x53, 0x89,
+	0x00, 0x00, 0x00,
 }