Forráskód Böngészése

cmd/protoc-gen-go: format default float values as float32

Printing default float values as float64 results in e.g., "3.14"
becoming "3.140000104904175".

Change-Id: I5b21a1f94084b6d9c7b015b34d911972c4a2a1b2
Reviewed-on: https://go-review.googlesource.com/138516
Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
Damien Neil 7 éve
szülő
commit
982684b22e

+ 2 - 2
cmd/protoc-gen-go/internal_gengo/main.go

@@ -495,7 +495,7 @@ func genMessage(gen *protogen.Plugin, g *protogen.GeneratedFile, f *fileInfo, me
 			case math.IsNaN(f):
 				g.P("var ", defVarName, " ", goType, " = ", funcCall("NaN", "()"))
 			default:
-				g.P("const ", defVarName, " ", goType, " = ", f)
+				g.P("const ", defVarName, " ", goType, " = ", field.Desc.Default().Interface())
 			}
 		default:
 			goType, _ := fieldGoType(g, field)
@@ -662,7 +662,7 @@ func fieldProtobufTag(field *protogen.Field) string {
 			case math.IsNaN(f):
 				def = "nan"
 			default:
-				def = fmt.Sprint(f)
+				def = fmt.Sprint(field.Desc.Default().Interface())
 			}
 		default:
 			def = fmt.Sprint(field.Desc.Default().Interface())

+ 120 - 120
cmd/protoc-gen-go/testdata/proto2/fields.pb.go

@@ -125,10 +125,10 @@ type FieldTestMessage struct {
 	DefaultUint64       *uint64                              `protobuf:"varint,308,opt,name=default_uint64,json=defaultUint64,def=1" json:"default_uint64,omitempty"`
 	DefaultSfixed32     *int32                               `protobuf:"fixed32,309,opt,name=default_sfixed32,json=defaultSfixed32,def=1" json:"default_sfixed32,omitempty"`
 	DefaultFixed32      *uint32                              `protobuf:"fixed32,310,opt,name=default_fixed32,json=defaultFixed32,def=1" json:"default_fixed32,omitempty"`
-	DefaultFloat        *float32                             `protobuf:"fixed32,311,opt,name=default_float,json=defaultFloat,def=1.5" json:"default_float,omitempty"`
+	DefaultFloat        *float32                             `protobuf:"fixed32,311,opt,name=default_float,json=defaultFloat,def=3.14" json:"default_float,omitempty"`
 	DefaultSfixed64     *int64                               `protobuf:"fixed64,312,opt,name=default_sfixed64,json=defaultSfixed64,def=1" json:"default_sfixed64,omitempty"`
 	DefaultFixed64      *uint64                              `protobuf:"fixed64,313,opt,name=default_fixed64,json=defaultFixed64,def=1" json:"default_fixed64,omitempty"`
-	DefaultDouble       *float64                             `protobuf:"fixed64,314,opt,name=default_double,json=defaultDouble,def=1.5" json:"default_double,omitempty"`
+	DefaultDouble       *float64                             `protobuf:"fixed64,314,opt,name=default_double,json=defaultDouble,def=3.1415" json:"default_double,omitempty"`
 	DefaultString       *string                              `protobuf:"bytes,315,opt,name=default_string,json=defaultString,def=x,y" json:"default_string,omitempty"`
 	DefaultBytes        []byte                               `protobuf:"bytes,316,opt,name=default_bytes,json=defaultBytes,def=x,y" json:"default_bytes,omitempty"`
 	DefaultFloatNeginf  *float32                             `protobuf:"fixed32,400,opt,name=default_float_neginf,json=defaultFloatNeginf,def=-inf" json:"default_float_neginf,omitempty"`
@@ -204,10 +204,10 @@ const Default_FieldTestMessage_DefaultSint64 int64 = 1
 const Default_FieldTestMessage_DefaultUint64 uint64 = 1
 const Default_FieldTestMessage_DefaultSfixed32 int32 = 1
 const Default_FieldTestMessage_DefaultFixed32 uint32 = 1
-const Default_FieldTestMessage_DefaultFloat float32 = 1.5
+const Default_FieldTestMessage_DefaultFloat float32 = 3.14
 const Default_FieldTestMessage_DefaultSfixed64 int64 = 1
 const Default_FieldTestMessage_DefaultFixed64 uint64 = 1
-const Default_FieldTestMessage_DefaultDouble float64 = 1.5
+const Default_FieldTestMessage_DefaultDouble float64 = 3.1415
 const Default_FieldTestMessage_DefaultString string = "x,y"
 
 var Default_FieldTestMessage_DefaultBytes []byte = []byte("x,y")
@@ -1600,120 +1600,120 @@ func init() {
 func init() { proto.RegisterFile("proto2/fields.proto", fileDescriptor_fd8a9d72b841fd68) }
 
 var fileDescriptor_fd8a9d72b841fd68 = []byte{
-	// 1831 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x98, 0x59, 0x73, 0x13, 0xcb,
-	0x15, 0xc7, 0x3d, 0x33, 0x92, 0x6d, 0xb5, 0x25, 0x4b, 0x1e, 0x43, 0x55, 0x87, 0xa7, 0x0e, 0x21,
-	0x61, 0x08, 0xd8, 0x8e, 0xc5, 0x30, 0x80, 0x53, 0xa9, 0x24, 0xae, 0xd8, 0x71, 0x1e, 0x02, 0xc9,
-	0x04, 0x57, 0xaa, 0x20, 0x55, 0xae, 0xb1, 0x3d, 0x12, 0x0a, 0xd2, 0x8c, 0x90, 0x46, 0x80, 0xbf,
-	0x45, 0xd6, 0x8f, 0x91, 0x7d, 0x27, 0xe4, 0x03, 0x24, 0xb9, 0xfb, 0x0e, 0xdc, 0x7d, 0x5f, 0x5e,
-	0xef, 0xbd, 0xcf, 0xb7, 0x4e, 0x9f, 0xee, 0x9e, 0xee, 0x91, 0x1f, 0x6c, 0x3f, 0x61, 0x1d, 0xfd,
-	0xfb, 0xfc, 0xcf, 0x69, 0xfa, 0x77, 0xd4, 0x33, 0x64, 0xbe, 0x3f, 0x48, 0xb3, 0xb4, 0xb9, 0xd4,
-	0xea, 0xc4, 0xdd, 0xdd, 0xe1, 0x22, 0xff, 0xe4, 0x1e, 0x6f, 0xa7, 0xfc, 0x0f, 0xfc, 0xb8, 0x83,
-	0xff, 0x34, 0x4f, 0xde, 0x3f, 0x4b, 0x1a, 0xeb, 0xa0, 0xbb, 0x16, 0x0f, 0xb3, 0x1f, 0xc6, 0xc3,
-	0x61, 0xd4, 0x8e, 0xdd, 0xaf, 0x90, 0x5a, 0xda, 0xcf, 0x3a, 0x69, 0x12, 0x75, 0xb7, 0xb6, 0xd3,
-	0xb4, 0x4b, 0x2d, 0x66, 0x79, 0xd3, 0x61, 0x55, 0x06, 0x57, 0xd3, 0xb4, 0xeb, 0xfe, 0x58, 0x13,
-	0xc5, 0xc9, 0xa8, 0x47, 0x6d, 0x66, 0x79, 0xb3, 0xcd, 0x73, 0x8b, 0xfb, 0x1a, 0x2d, 0x16, 0x4d,
-	0x16, 0xd7, 0x92, 0x51, 0x2f, 0x4f, 0x09, 0x9f, 0xdc, 0xaf, 0x92, 0x59, 0x95, 0xb2, 0x93, 0x64,
-	0xe7, 0x9b, 0xd4, 0x61, 0x96, 0x57, 0x0e, 0x95, 0xd1, 0x0f, 0x20, 0xe8, 0x9e, 0x26, 0x75, 0x25,
-	0x1b, 0xa2, 0xae, 0xc4, 0x2c, 0x6f, 0x2e, 0x54, 0xab, 0x7f, 0xd2, 0x19, 0x13, 0x8e, 0x50, 0x58,
-	0x66, 0x96, 0x57, 0xcb, 0x85, 0x9b, 0x28, 0x2c, 0x18, 0x07, 0x3e, 0x9d, 0x64, 0x96, 0xe7, 0x18,
-	0xc6, 0x81, 0x3f, 0x66, 0x1c, 0xf8, 0x74, 0x8a, 0x59, 0x9e, 0x6b, 0x1a, 0x17, 0x84, 0x23, 0x14,
-	0x4e, 0x33, 0xcb, 0x2b, 0x99, 0xc6, 0x81, 0xef, 0x9e, 0x25, 0x73, 0x79, 0xc6, 0x56, 0xe7, 0x5e,
-	0xbc, 0x7b, 0xbe, 0x49, 0x2b, 0xcc, 0xf2, 0xea, 0x61, 0x43, 0xe5, 0x14, 0x71, 0xf7, 0x0c, 0x51,
-	0xb1, 0x2d, 0xa9, 0x25, 0xcc, 0xf2, 0xa6, 0x42, 0xe5, 0xb6, 0x2e, 0xa4, 0x7a, 0x43, 0xad, 0x6e,
-	0x1a, 0x65, 0x74, 0x86, 0x59, 0x9e, 0x9d, 0x37, 0xb4, 0x0e, 0xc1, 0x7d, 0xec, 0x03, 0x9f, 0x56,
-	0x99, 0xe5, 0x35, 0x8a, 0xf6, 0x81, 0x3f, 0x6e, 0x1f, 0xf8, 0xb4, 0xc6, 0x2c, 0x6f, 0xb2, 0x60,
-	0x5f, 0xe8, 0x7f, 0x37, 0x1d, 0x6d, 0x77, 0x63, 0x3a, 0xcb, 0x2c, 0xcf, 0xca, 0xfb, 0xff, 0x1e,
-	0x8f, 0x9a, 0x3b, 0x9a, 0x0d, 0x3a, 0x49, 0x9b, 0xd6, 0x99, 0xe5, 0x55, 0xb4, 0x1d, 0xe5, 0x51,
-	0xa3, 0xa1, 0xed, 0xbd, 0x2c, 0x1e, 0xd2, 0x06, 0xb3, 0xbc, 0x6a, 0xde, 0xd0, 0x2a, 0x04, 0xdd,
-	0xeb, 0x5a, 0x8d, 0xe2, 0xa0, 0xd1, 0x39, 0x66, 0x79, 0x33, 0xcd, 0xa5, 0x83, 0x9e, 0x4b, 0xf1,
-	0x6f, 0xde, 0x94, 0xa4, 0xe2, 0x46, 0x7e, 0xe0, 0xdb, 0x83, 0x74, 0xd4, 0xa7, 0x2e, 0xb3, 0x3c,
-	0xd2, 0xbc, 0x70, 0xd0, 0xc4, 0x57, 0xc5, 0xe2, 0xef, 0xc3, 0xe2, 0xd0, 0xcc, 0x05, 0xc8, 0x0d,
-	0xe2, 0xdb, 0xa3, 0xce, 0x20, 0xde, 0x45, 0xe4, 0x62, 0x66, 0x03, 0x72, 0x32, 0x28, 0x91, 0x53,
-	0x22, 0x8e, 0x5c, 0x8b, 0xd9, 0x87, 0x47, 0x4e, 0xa6, 0x90, 0xc8, 0xa9, 0x94, 0x48, 0x48, 0x9b,
-	0xd9, 0x80, 0x9c, 0x8c, 0x2a, 0xe4, 0x94, 0x4c, 0x20, 0x77, 0x93, 0xd9, 0x80, 0x9c, 0x0c, 0xe7,
-	0xc8, 0x29, 0xa1, 0x40, 0xae, 0xc3, 0x6c, 0x40, 0x4e, 0x86, 0x73, 0xe4, 0x74, 0xe3, 0xc0, 0xa7,
-	0x3f, 0x67, 0x36, 0x20, 0xa7, 0x19, 0xe3, 0x49, 0x32, 0x8c, 0x03, 0x9f, 0xde, 0x62, 0x36, 0x20,
-	0xa7, 0x1b, 0x17, 0x84, 0x02, 0xb9, 0x2e, 0xb3, 0x01, 0x39, 0xdd, 0x18, 0x91, 0xcb, 0x33, 0x4a,
-	0x8c, 0x7a, 0xcc, 0x06, 0xe4, 0x54, 0x4e, 0x0d, 0x39, 0x25, 0x96, 0xda, 0x84, 0xd9, 0x80, 0x9c,
-	0x8c, 0x6b, 0xc8, 0xe5, 0x52, 0x8e, 0x5c, 0xca, 0x6c, 0x40, 0x4e, 0x09, 0x25, 0x72, 0x05, 0xfb,
-	0xc0, 0xa7, 0x7d, 0x66, 0x03, 0x72, 0xa6, 0x3d, 0x22, 0x67, 0xda, 0x07, 0x3e, 0xbd, 0xcd, 0x6c,
-	0x40, 0xce, 0xb0, 0x2f, 0xf4, 0x2f, 0x90, 0x1b, 0x30, 0x1b, 0x90, 0x93, 0xe1, 0x1c, 0xb9, 0xbc,
-	0x00, 0x44, 0x6e, 0xc8, 0x6c, 0x40, 0x4e, 0xd9, 0x2b, 0xe4, 0xf2, 0x23, 0xc9, 0x91, 0xcb, 0x98,
-	0x0d, 0xc8, 0xa9, 0x33, 0x29, 0x91, 0x53, 0x32, 0x89, 0xdc, 0x88, 0xd9, 0x47, 0x42, 0x4e, 0x26,
-	0xd2, 0x90, 0x93, 0x21, 0x44, 0xee, 0x0e, 0xb3, 0x0f, 0x83, 0x5c, 0x28, 0x16, 0x0b, 0xe4, 0x8c,
-	0x5c, 0xee, 0x29, 0x48, 0xde, 0x8f, 0xa3, 0x4c, 0x22, 0xf7, 0x5f, 0x8b, 0x39, 0xc8, 0x1c, 0x46,
-	0x39, 0x73, 0xa1, 0xa6, 0xe2, 0xcc, 0xfd, 0x0f, 0x54, 0x47, 0x80, 0x0e, 0x73, 0x70, 0xe8, 0xbe,
-	0x06, 0x3b, 0x2b, 0x72, 0x22, 0x23, 0xff, 0x87, 0xa4, 0x9c, 0x3a, 0x0c, 0x23, 0x75, 0x1e, 0xfc,
-	0x57, 0x09, 0x9d, 0xa0, 0xee, 0x09, 0x10, 0x72, 0xec, 0x30, 0x2e, 0xb0, 0xd3, 0x95, 0x02, 0xbb,
-	0x27, 0x41, 0x59, 0xcb, 0x95, 0x82, 0xbb, 0x82, 0x77, 0xe0, 0xd3, 0xa7, 0x40, 0xe8, 0x18, 0xde,
-	0x81, 0x3f, 0xe6, 0x1d, 0xf8, 0xf4, 0x69, 0x10, 0xba, 0xa6, 0x77, 0x41, 0x29, 0xc8, 0x7b, 0x06,
-	0x94, 0x25, 0xd3, 0x3b, 0xf0, 0xdd, 0x73, 0x70, 0xf6, 0x65, 0x4e, 0x89, 0xd3, 0xb3, 0xa0, 0xe5,
-	0xec, 0x89, 0xac, 0x92, 0xbd, 0xaf, 0x13, 0x15, 0x53, 0xec, 0x3d, 0x07, 0x62, 0x0e, 0x1f, 0x7e,
-	0x21, 0xe1, 0xd3, 0xbb, 0x42, 0xf8, 0x9e, 0x07, 0xa5, 0x9d, 0x77, 0x85, 0xf4, 0x8d, 0x57, 0x10,
-	0xf8, 0xf4, 0x05, 0x90, 0x36, 0x8a, 0x15, 0x04, 0xfe, 0x78, 0x05, 0x81, 0x4f, 0x5f, 0x04, 0xf1,
-	0x64, 0xa1, 0x82, 0xc2, 0x2e, 0x08, 0xfe, 0x5e, 0x02, 0xa9, 0x95, 0xef, 0x82, 0x00, 0xd0, 0xd8,
-	0x59, 0x04, 0xf0, 0x65, 0x50, 0x56, 0xb4, 0x9d, 0x45, 0x02, 0xf5, 0xae, 0x90, 0xc0, 0x57, 0x40,
-	0x58, 0xcd, 0xbb, 0x42, 0x04, 0x6f, 0x68, 0x75, 0x4a, 0x04, 0x1f, 0x82, 0xf2, 0x68, 0x0c, 0x62,
-	0x26, 0xc9, 0xe0, 0xcf, 0x72, 0x00, 0x90, 0xc1, 0x47, 0x90, 0xf9, 0x50, 0x10, 0xe2, 0x6a, 0x05,
-	0xa1, 0x96, 0xcc, 0xf5, 0x48, 0x75, 0x37, 0x6e, 0x45, 0xa3, 0x6e, 0x86, 0x0c, 0xfe, 0x0e, 0x6e,
-	0x91, 0xd3, 0x2b, 0xa5, 0x6c, 0x30, 0x8a, 0xc3, 0x19, 0xf1, 0x15, 0x07, 0x71, 0x33, 0x57, 0x72,
-	0x0e, 0x7f, 0x7f, 0x84, 0xfb, 0xe6, 0x8a, 0x73, 0xf5, 0xca, 0x9a, 0x4a, 0xcb, 0x59, 0x3c, 0x4d,
-	0x6a, 0x32, 0x2d, 0x72, 0xf3, 0x07, 0xc8, 0x5b, 0x5e, 0xb1, 0x96, 0x43, 0xe9, 0x87, 0x30, 0x9e,
-	0x21, 0xb3, 0x52, 0x28, 0x58, 0xfc, 0x23, 0x28, 0xe7, 0x40, 0x29, 0x53, 0x08, 0x1a, 0x35, 0xa9,
-	0x80, 0xf1, 0x4f, 0x20, 0xad, 0xe9, 0xd2, 0x4d, 0xf9, 0x7b, 0xa9, 0xdb, 0x07, 0x3e, 0xfd, 0x33,
-	0x28, 0x9d, 0x82, 0x3d, 0xff, 0x29, 0x30, 0xec, 0x03, 0x9f, 0xfe, 0x05, 0x94, 0x6e, 0xd1, 0xde,
-	0x94, 0x0a, 0x1e, 0xff, 0x0a, 0xd2, 0x52, 0xd1, 0x3e, 0xf0, 0xdd, 0x05, 0xd2, 0x50, 0x59, 0x25,
-	0x63, 0x7f, 0x03, 0x71, 0x1d, 0xc4, 0x75, 0x99, 0x57, 0x22, 0x79, 0x96, 0xc8, 0x90, 0x22, 0xf2,
-	0xef, 0xa0, 0x9e, 0x02, 0xb5, 0x34, 0x5d, 0x57, 0xbf, 0x9d, 0xaa, 0x35, 0x44, 0xf2, 0x1f, 0x20,
-	0xb5, 0x57, 0x9c, 0xe5, 0xc5, 0x0b, 0xaa, 0x39, 0xc4, 0x72, 0xac, 0x8c, 0xc0, 0xa7, 0xff, 0x04,
-	0x75, 0x63, 0xbc, 0x0c, 0xfe, 0x13, 0x6e, 0x96, 0x11, 0xf8, 0xf4, 0x5f, 0xa0, 0x9e, 0x1c, 0x2b,
-	0x83, 0x8b, 0xd5, 0x6e, 0x08, 0x2e, 0xef, 0x83, 0xd6, 0xc2, 0x3a, 0x64, 0x89, 0x82, 0x4d, 0x4d,
-	0x2c, 0xd0, 0xfc, 0x37, 0x88, 0x2b, 0x2b, 0xce, 0xbd, 0x73, 0x7b, 0xf9, 0x3e, 0x23, 0x9e, 0x5a,
-	0x83, 0x48, 0xe7, 0x03, 0xd0, 0x56, 0x51, 0x2b, 0x1b, 0x44, 0x42, 0x2f, 0x92, 0x63, 0xc6, 0x5e,
-	0x6c, 0x25, 0x71, 0xbb, 0x93, 0xb4, 0xe8, 0x2f, 0x1c, 0xbe, 0x25, 0xa5, 0x85, 0x4e, 0xd2, 0x0a,
-	0x5d, 0x7d, 0x4f, 0xae, 0x70, 0x81, 0x1b, 0x14, 0x17, 0xf6, 0xd3, 0x21, 0x2c, 0xfc, 0x25, 0x2e,
-	0x74, 0xc6, 0xd6, 0xfd, 0x88, 0x7f, 0xef, 0x7e, 0x83, 0xcc, 0x15, 0x0c, 0xa3, 0x84, 0xfe, 0x4a,
-	0x2c, 0x4a, 0xa2, 0x44, 0x6d, 0x2a, 0x9a, 0x45, 0x89, 0x7b, 0x99, 0x1c, 0x37, 0xf7, 0x49, 0xd6,
-	0xf8, 0x6b, 0x87, 0x6f, 0x17, 0xd6, 0x38, 0x6f, 0xec, 0x97, 0x28, 0xf2, 0xd2, 0xd8, 0x52, 0x51,
-	0xe5, 0x6f, 0x70, 0xa9, 0x33, 0xbe, 0x52, 0x94, 0xd9, 0x24, 0x6e, 0xd1, 0x34, 0x4a, 0xe8, 0x6f,
-	0xc5, 0x32, 0xa8, 0xb3, 0x61, 0x1a, 0x46, 0x89, 0xbb, 0x43, 0xea, 0xbd, 0xa8, 0x8f, 0xb4, 0x0a,
-	0x68, 0x3e, 0x75, 0xf8, 0xb0, 0x5b, 0x39, 0xf0, 0xb0, 0x8b, 0xfa, 0x1c, 0x6a, 0x8e, 0xd6, 0x5a,
-	0x92, 0x0d, 0xf6, 0xc2, 0x5a, 0x4f, 0x8f, 0xb9, 0x5d, 0xe2, 0x82, 0x09, 0x1e, 0x82, 0xad, 0x9e,
-	0x18, 0xaa, 0x9f, 0xa1, 0xcf, 0xb7, 0x0e, 0xe1, 0x83, 0x67, 0x45, 0x04, 0xd0, 0xaa, 0xd1, 0x2b,
-	0x84, 0xdd, 0x16, 0x81, 0x98, 0x3c, 0xcc, 0x38, 0xdf, 0x3e, 0x47, 0xaf, 0x6f, 0x1e, 0xc2, 0x4b,
-	0x1c, 0x79, 0x98, 0x6b, 0xe8, 0x34, 0xdb, 0x33, 0x82, 0x2e, 0x23, 0x24, 0x4d, 0xe2, 0xb4, 0x85,
-	0xb3, 0xf6, 0x21, 0x3c, 0x35, 0x4f, 0x6f, 0x4c, 0x84, 0x15, 0x1e, 0xe4, 0x53, 0xf6, 0x8a, 0x54,
-	0xf0, 0x1a, 0x1e, 0x95, 0x0e, 0x3f, 0x63, 0x55, 0x3e, 0xee, 0x78, 0x92, 0xcc, 0x60, 0x3e, 0x9c,
-	0x83, 0x8f, 0x21, 0x61, 0x79, 0x63, 0x22, 0x44, 0x17, 0x9c, 0xac, 0xa7, 0x48, 0x15, 0x35, 0x62,
-	0xae, 0xbe, 0xca, 0x9f, 0xe6, 0x37, 0x26, 0x42, 0x5c, 0x2a, 0x86, 0xaa, 0x52, 0x89, 0x91, 0xfa,
-	0x1a, 0xa8, 0x6a, 0x4a, 0x25, 0xe6, 0xa9, 0xee, 0x17, 0xf8, 0xf4, 0x75, 0x10, 0x39, 0xba, 0x5f,
-	0xe0, 0x9b, 0x7e, 0x81, 0x4f, 0xdf, 0x00, 0x91, 0x6b, 0xf8, 0xe9, 0x2a, 0x31, 0x43, 0xdf, 0x04,
-	0x55, 0xc9, 0xf0, 0xe3, 0x3f, 0xfb, 0xb3, 0x22, 0x97, 0x1c, 0x88, 0x6f, 0x81, 0xae, 0xbe, 0x31,
-	0x11, 0xd6, 0x30, 0x5b, 0x4b, 0x5d, 0x51, 0x30, 0xa0, 0x26, 0xe7, 0xdb, 0x20, 0x9c, 0xda, 0x98,
-	0x08, 0xd1, 0x47, 0x8e, 0x4d, 0xd5, 0x01, 0x0e, 0xcd, 0x77, 0x40, 0x65, 0xab, 0x0e, 0x70, 0x5e,
-	0x16, 0x5c, 0x03, 0x9f, 0xbe, 0x0b, 0xb2, 0x46, 0xc1, 0x35, 0xf0, 0x0b, 0xae, 0x81, 0x4f, 0xdf,
-	0x03, 0xe1, 0xa4, 0xe9, 0xaa, 0x77, 0x2b, 0x66, 0xe4, 0xfb, 0x20, 0xb3, 0x54, 0xb7, 0x62, 0x3c,
-	0xe6, 0x3b, 0x87, 0xc3, 0xf1, 0x03, 0x50, 0x55, 0xf2, 0x9d, 0xc3, 0xb9, 0xa8, 0x3a, 0xc0, 0xa9,
-	0xf8, 0x21, 0x88, 0xaa, 0xaa, 0x03, 0x1c, 0x88, 0x3f, 0x95, 0x75, 0xc9, 0xfb, 0xca, 0x47, 0xa5,
-	0x23, 0x3d, 0xa6, 0xab, 0x46, 0x24, 0x4a, 0x9b, 0xe2, 0x00, 0xe3, 0x5d, 0xe5, 0xe3, 0x12, 0x7f,
-	0x46, 0x6f, 0x1e, 0xf8, 0x19, 0x1d, 0x96, 0xf2, 0x8b, 0x8a, 0xaa, 0x17, 0xef, 0x29, 0x5f, 0x96,
-	0x3d, 0x65, 0x77, 0xd3, 0xad, 0x65, 0xfa, 0xa0, 0xcc, 0xcf, 0xb1, 0x25, 0x8e, 0xfa, 0xb5, 0xbb,
-	0xe9, 0xb2, 0x29, 0x69, 0xd2, 0xff, 0x94, 0xf9, 0xd1, 0xd3, 0x24, 0xcd, 0x13, 0x01, 0xa9, 0x19,
-	0x6f, 0x01, 0x8c, 0xd7, 0x1a, 0x58, 0xf1, 0x3c, 0x7f, 0xfd, 0xa1, 0xde, 0x0e, 0x70, 0x19, 0xac,
-	0x33, 0x1e, 0x65, 0x8c, 0x67, 0x33, 0x5c, 0x77, 0x97, 0x3f, 0xc3, 0xa9, 0x47, 0x1c, 0x5c, 0x77,
-	0x11, 0xd6, 0x69, 0xb7, 0x2f, 0xe3, 0x46, 0x89, 0xeb, 0x1e, 0xe3, 0xd5, 0x53, 0x5d, 0xcb, 0x70,
-	0xe1, 0x77, 0x88, 0x3b, 0x3e, 0x23, 0xdd, 0x06, 0x71, 0x6e, 0xc5, 0x7b, 0xfc, 0x6d, 0x60, 0x39,
-	0x84, 0x3f, 0xdd, 0x63, 0xa4, 0x7c, 0x27, 0xea, 0x8e, 0x62, 0xfe, 0xf2, 0xcf, 0x09, 0xf1, 0xc3,
-	0x8a, 0x7d, 0xc9, 0x3a, 0x91, 0x91, 0xe3, 0xfb, 0x4e, 0x3f, 0x3d, 0x49, 0x05, 0x93, 0xac, 0xe9,
-	0x49, 0x8e, 0x70, 0x65, 0xd5, 0x5c, 0x53, 0x32, 0xbf, 0xcf, 0x1c, 0xd4, 0x3d, 0x27, 0xd1, 0x73,
-	0x55, 0xf7, 0x3c, 0xec, 0xd3, 0x9c, 0x66, 0x78, 0x99, 0x90, 0xfc, 0xcc, 0xf0, 0xf7, 0x69, 0xfc,
-	0x08, 0xf0, 0xbd, 0xdd, 0xe2, 0x2f, 0x60, 0xe9, 0x27, 0x1c, 0x92, 0xb0, 0x9e, 0x2a, 0x1d, 0xcf,
-	0x7a, 0xa2, 0x42, 0xa6, 0x44, 0xd6, 0x93, 0x5f, 0x22, 0x25, 0x3e, 0x2d, 0xa7, 0x49, 0xe9, 0xfa,
-	0x5a, 0x78, 0xb5, 0x31, 0xe1, 0x4e, 0x11, 0xb8, 0xaa, 0x36, 0xac, 0xd5, 0x9a, 0x1a, 0x07, 0xb0,
-	0x68, 0x75, 0x86, 0x54, 0xd4, 0x21, 0x5b, 0xfd, 0xee, 0xf5, 0x6f, 0xb7, 0x3b, 0xd9, 0xcd, 0xd1,
-	0xf6, 0xe2, 0x4e, 0xda, 0x5b, 0x6a, 0xa7, 0xdd, 0x28, 0x69, 0x2f, 0xf1, 0xca, 0xb7, 0x47, 0xad,
-	0xa5, 0x3b, 0xcd, 0xa5, 0x9d, 0xde, 0x2e, 0x7e, 0xde, 0x59, 0x68, 0xc7, 0xc9, 0x42, 0x3b, 0x5d,
-	0xca, 0xe2, 0x61, 0xb6, 0x1b, 0x65, 0x11, 0x86, 0x9b, 0x5f, 0x04, 0x00, 0x00, 0xff, 0xff, 0xc5,
-	0xb1, 0xdf, 0x80, 0x2c, 0x16, 0x00, 0x00,
+	// 1840 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x98, 0x5b, 0x73, 0x1b, 0x49,
+	0x15, 0xc7, 0x3d, 0x23, 0xc9, 0xb6, 0xda, 0x92, 0x25, 0xb7, 0x37, 0x55, 0x4d, 0x9e, 0x9a, 0xb0,
+	0xb0, 0x13, 0x1c, 0xdb, 0x58, 0x99, 0xed, 0xdd, 0x15, 0x45, 0x01, 0x2e, 0x6c, 0xcc, 0x03, 0x09,
+	0x0c, 0xeb, 0xa2, 0x2a, 0x4b, 0x95, 0x6b, 0x6c, 0x8f, 0xb4, 0x62, 0xa5, 0x19, 0xad, 0x34, 0x4a,
+	0xd6, 0xdf, 0x82, 0xeb, 0xc7, 0xe0, 0x7e, 0x87, 0xc0, 0x3b, 0xf7, 0xfb, 0x25, 0x09, 0xf7, 0xfb,
+	0xe5, 0x15, 0x78, 0xde, 0x3a, 0x7d, 0xba, 0x7b, 0xba, 0x47, 0x7e, 0xb0, 0xfd, 0x14, 0xeb, 0xe8,
+	0xdf, 0xe7, 0x7f, 0x4e, 0xa7, 0x7f, 0x47, 0x3d, 0x43, 0xd6, 0xc7, 0x93, 0x2c, 0xcf, 0x3a, 0xdb,
+	0xbd, 0x41, 0x32, 0x3c, 0x9d, 0x6e, 0xc9, 0x4f, 0xf4, 0x5a, 0x3f, 0x93, 0x7f, 0xe0, 0xc7, 0x13,
+	0xfc, 0xa7, 0x73, 0xe3, 0x3b, 0x1b, 0xa4, 0xbd, 0x0f, 0xba, 0x17, 0x93, 0x69, 0xfe, 0xfe, 0x64,
+	0x3a, 0x8d, 0xfb, 0x09, 0x7d, 0x13, 0x69, 0x66, 0xe3, 0x7c, 0x90, 0xa5, 0xf1, 0xf0, 0xe8, 0x38,
+	0xcb, 0x86, 0xcc, 0xe3, 0x5e, 0xb0, 0x1c, 0x35, 0x74, 0x70, 0x37, 0xcb, 0x86, 0xf4, 0x83, 0x96,
+	0x28, 0x49, 0x67, 0x23, 0xe6, 0x73, 0x2f, 0x58, 0xed, 0xdc, 0xda, 0x3a, 0xd7, 0x68, 0xab, 0x6c,
+	0xb2, 0xb5, 0x97, 0xce, 0x46, 0x45, 0x4a, 0xf8, 0x44, 0xdf, 0x4c, 0x56, 0x4d, 0xca, 0x41, 0x9a,
+	0xdf, 0xee, 0xb0, 0x0a, 0xf7, 0x82, 0x5a, 0x64, 0x8c, 0xde, 0x07, 0x41, 0xfa, 0x0c, 0x69, 0x19,
+	0xd9, 0x14, 0x75, 0x55, 0xee, 0x05, 0x6b, 0x91, 0x59, 0xfd, 0xa1, 0xc1, 0x9c, 0x70, 0x86, 0xc2,
+	0x1a, 0xf7, 0x82, 0x66, 0x21, 0x3c, 0x44, 0x61, 0xc9, 0x58, 0x84, 0x6c, 0x91, 0x7b, 0x41, 0xc5,
+	0x31, 0x16, 0xe1, 0x9c, 0xb1, 0x08, 0xd9, 0x12, 0xf7, 0x02, 0xea, 0x1a, 0x97, 0x84, 0x33, 0x14,
+	0x2e, 0x73, 0x2f, 0xa8, 0xba, 0xc6, 0x22, 0xa4, 0x1b, 0x64, 0xad, 0xc8, 0xd8, 0x1b, 0xbc, 0x96,
+	0x9c, 0xde, 0xee, 0xb0, 0x3a, 0xf7, 0x82, 0x56, 0xd4, 0x36, 0x39, 0x55, 0x9c, 0xde, 0x24, 0x26,
+	0x76, 0xa4, 0xb5, 0x84, 0x7b, 0xc1, 0x52, 0x64, 0xdc, 0xf6, 0x95, 0xd4, 0x6e, 0xa8, 0x37, 0xcc,
+	0xe2, 0x9c, 0xad, 0x70, 0x2f, 0xf0, 0x8b, 0x86, 0xf6, 0x21, 0x78, 0x8e, 0xbd, 0x08, 0x59, 0x83,
+	0x7b, 0x41, 0xbb, 0x6c, 0x2f, 0xc2, 0x79, 0x7b, 0x11, 0xb2, 0x26, 0xf7, 0x82, 0xc5, 0x92, 0x7d,
+	0xa9, 0xff, 0xd3, 0x6c, 0x76, 0x3c, 0x4c, 0xd8, 0x2a, 0xf7, 0x02, 0xaf, 0xe8, 0xff, 0x3d, 0x32,
+	0xea, 0xee, 0x68, 0x3e, 0x19, 0xa4, 0x7d, 0xd6, 0xe2, 0x5e, 0x50, 0xb7, 0x76, 0x54, 0x46, 0x9d,
+	0x86, 0x8e, 0xcf, 0xf2, 0x64, 0xca, 0xda, 0xdc, 0x0b, 0x1a, 0x45, 0x43, 0xbb, 0x10, 0xa4, 0xf7,
+	0xac, 0x1a, 0xd5, 0x41, 0x63, 0x6b, 0xdc, 0x0b, 0x56, 0x3a, 0xdb, 0x17, 0x3d, 0x97, 0xea, 0xdf,
+	0xa2, 0x29, 0x4d, 0xc5, 0x4b, 0xc5, 0x81, 0xef, 0x4f, 0xb2, 0xd9, 0x98, 0x51, 0xee, 0x05, 0xa4,
+	0xf3, 0xec, 0x45, 0x13, 0xdf, 0x55, 0x8b, 0xdf, 0x0b, 0x8b, 0x23, 0x37, 0x17, 0x20, 0x37, 0x49,
+	0x5e, 0x9d, 0x0d, 0x26, 0xc9, 0x29, 0x22, 0x97, 0x70, 0x1f, 0x90, 0xd3, 0x41, 0x8d, 0x9c, 0x11,
+	0x49, 0xe4, 0x7a, 0xdc, 0xbf, 0x3c, 0x72, 0x3a, 0x85, 0x46, 0xce, 0xa4, 0x44, 0x42, 0xfa, 0xdc,
+	0x07, 0xe4, 0x74, 0xd4, 0x20, 0x67, 0x64, 0x0a, 0xb9, 0x97, 0xb9, 0x0f, 0xc8, 0xe9, 0x70, 0x81,
+	0x9c, 0x11, 0x2a, 0xe4, 0x06, 0xdc, 0x07, 0xe4, 0x74, 0xb8, 0x40, 0xce, 0x36, 0x16, 0x21, 0xfb,
+	0x28, 0xf7, 0x01, 0x39, 0xcb, 0x18, 0x4f, 0x92, 0x63, 0x2c, 0x42, 0xf6, 0x0a, 0xf7, 0x01, 0x39,
+	0xdb, 0xb8, 0x24, 0x54, 0xc8, 0x0d, 0xb9, 0x0f, 0xc8, 0xd9, 0xc6, 0x88, 0x5c, 0x91, 0x51, 0x63,
+	0x34, 0xe2, 0x3e, 0x20, 0x67, 0x72, 0x5a, 0xc8, 0x19, 0xb1, 0xd6, 0xa6, 0xdc, 0x07, 0xe4, 0x74,
+	0xdc, 0x42, 0xae, 0x90, 0x4a, 0xe4, 0x32, 0xee, 0x03, 0x72, 0x46, 0xa8, 0x91, 0x2b, 0xd9, 0x8b,
+	0x90, 0x8d, 0xb9, 0x0f, 0xc8, 0xb9, 0xf6, 0x88, 0x9c, 0x6b, 0x2f, 0x42, 0xf6, 0x2a, 0xf7, 0x01,
+	0x39, 0xc7, 0xbe, 0xd4, 0xbf, 0x42, 0x6e, 0xc2, 0x7d, 0x40, 0x4e, 0x87, 0x0b, 0xe4, 0x8a, 0x02,
+	0x10, 0xb9, 0x29, 0xf7, 0x01, 0x39, 0x63, 0x6f, 0x90, 0x2b, 0x8e, 0xa4, 0x44, 0x2e, 0xe7, 0x3e,
+	0x20, 0x67, 0xce, 0xa4, 0x46, 0xce, 0xc8, 0x34, 0x72, 0x33, 0xee, 0x5f, 0x09, 0x39, 0x9d, 0xc8,
+	0x42, 0x4e, 0x87, 0x10, 0xb9, 0xfb, 0xdc, 0xbf, 0x0c, 0x72, 0x91, 0x5a, 0xac, 0x90, 0x73, 0x72,
+	0xd1, 0xa7, 0x21, 0xf9, 0x38, 0x89, 0x73, 0x8d, 0xdc, 0x77, 0x3d, 0x5e, 0x41, 0xe6, 0x30, 0x2a,
+	0x99, 0x8b, 0x2c, 0x95, 0x64, 0xee, 0x7b, 0xa0, 0xba, 0x02, 0x74, 0x98, 0x43, 0x42, 0xf7, 0x16,
+	0xd8, 0x59, 0x95, 0x13, 0x19, 0xf9, 0x3e, 0x24, 0x95, 0xd4, 0x61, 0x18, 0xa9, 0x0b, 0xe0, 0xbf,
+	0x4a, 0xe9, 0x14, 0x75, 0x3f, 0x00, 0xa1, 0xc4, 0x0e, 0xe3, 0x0a, 0x3b, 0x5b, 0xa9, 0xb0, 0xfb,
+	0x21, 0x28, 0x9b, 0x85, 0x52, 0x71, 0x57, 0xf2, 0x16, 0x21, 0xfb, 0x11, 0x08, 0x2b, 0x8e, 0xb7,
+	0x08, 0xe7, 0xbc, 0x45, 0xc8, 0x7e, 0x0c, 0x42, 0xea, 0x7a, 0x97, 0x94, 0x8a, 0xbc, 0x9f, 0x80,
+	0xb2, 0xea, 0x7a, 0x8b, 0x90, 0xde, 0x82, 0xb3, 0xaf, 0x73, 0x6a, 0x9c, 0x7e, 0x0a, 0x5a, 0xc9,
+	0x9e, 0xca, 0xaa, 0xd9, 0x7b, 0x2b, 0x31, 0x31, 0xc3, 0xde, 0xcf, 0x40, 0x2c, 0xe1, 0xc3, 0x2f,
+	0x34, 0x7c, 0x76, 0x57, 0x08, 0xdf, 0xcf, 0x41, 0xe9, 0x17, 0x5d, 0x21, 0x7d, 0xf3, 0x15, 0x88,
+	0x90, 0xfd, 0x02, 0xa4, 0xed, 0x72, 0x05, 0x22, 0x9c, 0xaf, 0x40, 0x84, 0xec, 0x97, 0x20, 0x5e,
+	0x2c, 0x55, 0x50, 0xda, 0x05, 0xc5, 0xdf, 0xaf, 0x40, 0xea, 0x15, 0xbb, 0xa0, 0x00, 0x74, 0x76,
+	0x16, 0x01, 0xfc, 0x35, 0x28, 0xeb, 0xd6, 0xce, 0x22, 0x81, 0x76, 0x57, 0x48, 0xe0, 0x6f, 0x40,
+	0xd8, 0x28, 0xba, 0x42, 0x04, 0x5f, 0xb2, 0xea, 0xd4, 0x08, 0x3e, 0x02, 0xe5, 0xd5, 0x18, 0xc4,
+	0x4c, 0x9a, 0xc1, 0x8f, 0x14, 0x00, 0x20, 0x83, 0x8f, 0x21, 0xf3, 0xa5, 0x20, 0xc4, 0xd5, 0x06,
+	0x42, 0x2b, 0x19, 0x0d, 0x48, 0xe3, 0x34, 0xe9, 0xc5, 0xb3, 0x61, 0x8e, 0x0c, 0x7e, 0x06, 0x6e,
+	0x91, 0xcb, 0xdd, 0x6a, 0x3e, 0x99, 0x25, 0xd1, 0x8a, 0xfa, 0x4a, 0x82, 0x78, 0x58, 0x28, 0x25,
+	0x87, 0x9f, 0xbd, 0xc2, 0x7d, 0xb3, 0x5b, 0xb9, 0x7b, 0x67, 0xcf, 0xa4, 0x95, 0x2c, 0x3e, 0x43,
+	0x9a, 0x3a, 0x2d, 0x72, 0xf3, 0x39, 0xc8, 0x5b, 0xeb, 0x7a, 0x3b, 0x91, 0xf6, 0x43, 0x18, 0x6f,
+	0x92, 0x55, 0x2d, 0x54, 0x2c, 0x7e, 0x1e, 0x94, 0x6b, 0xa0, 0xd4, 0x29, 0x14, 0x8d, 0x96, 0x54,
+	0xc1, 0xf8, 0x05, 0x90, 0x36, 0x6d, 0xe9, 0xa1, 0xfe, 0xbd, 0xb4, 0xed, 0x45, 0xc8, 0xbe, 0x08,
+	0xca, 0x4a, 0xc9, 0x5e, 0xfe, 0x14, 0x38, 0xf6, 0x22, 0x64, 0x5f, 0x02, 0x25, 0x2d, 0xdb, 0xbb,
+	0x52, 0xc5, 0xe3, 0x97, 0x41, 0x5a, 0x2d, 0xdb, 0x8b, 0x90, 0x6e, 0x92, 0xb6, 0xc9, 0xaa, 0x19,
+	0xfb, 0x0a, 0x88, 0x5b, 0x20, 0x6e, 0xe9, 0xbc, 0x1a, 0xc9, 0x0d, 0xa2, 0x43, 0x86, 0xc8, 0xaf,
+	0x82, 0x7a, 0x09, 0xd4, 0xda, 0x74, 0xdf, 0xf0, 0x6b, 0x5a, 0x43, 0x24, 0xbf, 0x06, 0x52, 0xbf,
+	0x5b, 0xbd, 0xbd, 0xb5, 0x13, 0x9a, 0xee, 0x90, 0xcb, 0xb9, 0x3a, 0x44, 0xc8, 0xbe, 0x0e, 0xf2,
+	0xf6, 0x7c, 0x1d, 0xf2, 0x37, 0xdc, 0xad, 0x43, 0x84, 0xec, 0x1b, 0xa0, 0x5e, 0x9c, 0xab, 0x43,
+	0x84, 0x74, 0xab, 0xd8, 0x0e, 0x05, 0xe6, 0x37, 0x41, 0xeb, 0x75, 0x17, 0xa1, 0x90, 0x9d, 0x67,
+	0xcd, 0x9e, 0x28, 0x3e, 0x37, 0xac, 0x9d, 0x46, 0x3c, 0xbf, 0x05, 0xfa, 0x7a, 0xb7, 0xf2, 0xda,
+	0xad, 0xb3, 0x62, 0xaf, 0x11, 0xd1, 0x9b, 0x45, 0x93, 0x48, 0xe8, 0x43, 0xd0, 0x36, 0x50, 0xab,
+	0x7b, 0x44, 0x4a, 0x9f, 0x23, 0x4f, 0x39, 0xfb, 0x71, 0x94, 0x26, 0xfd, 0x41, 0xda, 0x63, 0x1f,
+	0xab, 0xe0, 0xb6, 0x6c, 0x0e, 0xd2, 0x5e, 0x44, 0xed, 0x6d, 0xb9, 0x23, 0x05, 0x54, 0x94, 0x17,
+	0x8e, 0xb3, 0x29, 0x2c, 0xfc, 0x38, 0x2e, 0xac, 0xcc, 0xad, 0xfb, 0x80, 0xfc, 0x9e, 0xbe, 0x8d,
+	0xac, 0x95, 0x0c, 0xe3, 0x94, 0x7d, 0x42, 0x2d, 0x4a, 0xe3, 0xd4, 0xec, 0x2b, 0x9a, 0xc5, 0x29,
+	0x7d, 0x81, 0x5c, 0x73, 0xb7, 0x4a, 0xd7, 0xf8, 0xc9, 0x8a, 0xdc, 0x31, 0xac, 0x71, 0xdd, 0xd9,
+	0x2f, 0x55, 0xe4, 0xf3, 0x73, 0x4b, 0x55, 0x95, 0x9f, 0xc2, 0xa5, 0x95, 0xf9, 0x95, 0xaa, 0xcc,
+	0x0e, 0xa1, 0x65, 0xd3, 0x38, 0x65, 0x9f, 0x56, 0xcb, 0xa0, 0xce, 0xb6, 0x6b, 0x18, 0xa7, 0xf4,
+	0x84, 0xb4, 0x46, 0xf1, 0x18, 0x89, 0x55, 0xe0, 0xfc, 0xb7, 0x22, 0x07, 0x5e, 0xf7, 0xc2, 0x03,
+	0x2f, 0x1e, 0x4b, 0xb0, 0x25, 0x5e, 0x7b, 0x69, 0x3e, 0x39, 0x8b, 0x9a, 0x23, 0x3b, 0x46, 0x87,
+	0x84, 0x82, 0x09, 0x1e, 0x82, 0xa3, 0x91, 0x1a, 0xac, 0xff, 0x43, 0x9f, 0x77, 0x5c, 0xc2, 0x07,
+	0xcf, 0x8a, 0x0a, 0xa0, 0x55, 0x7b, 0x54, 0x0a, 0xd3, 0x1e, 0x81, 0x98, 0x3e, 0xcf, 0x38, 0xe3,
+	0xfe, 0x8f, 0x5e, 0x6f, 0xbf, 0x84, 0x97, 0x3a, 0xf5, 0x30, 0xdb, 0xd0, 0x69, 0x75, 0xe4, 0x04,
+	0x29, 0x27, 0x24, 0x4b, 0x93, 0xac, 0x87, 0xf3, 0xf6, 0x11, 0x3c, 0x39, 0x2f, 0x1f, 0x2c, 0x44,
+	0x75, 0x19, 0x94, 0x93, 0xf6, 0x8e, 0x56, 0xc8, 0x1a, 0x1e, 0x57, 0x2f, 0x3f, 0x67, 0x4d, 0x3e,
+	0xe9, 0x78, 0x83, 0xac, 0x60, 0x3e, 0x9c, 0x85, 0x4f, 0x20, 0x61, 0xed, 0x60, 0x21, 0x42, 0x17,
+	0x9c, 0xae, 0x4f, 0x93, 0x06, 0x6a, 0xd4, 0x6c, 0xfd, 0xad, 0x7c, 0xa2, 0x3f, 0x58, 0x88, 0x70,
+	0xa9, 0x1a, 0xac, 0x46, 0xa5, 0xc6, 0xea, 0xef, 0x40, 0xd5, 0x34, 0x2a, 0x35, 0x53, 0x6d, 0x3f,
+	0x11, 0xb2, 0xdf, 0x83, 0xa8, 0x62, 0xfb, 0x89, 0xd0, 0xf5, 0x13, 0x21, 0xfb, 0x03, 0x88, 0xa8,
+	0xe3, 0x67, 0xab, 0xd4, 0x1c, 0xfd, 0x23, 0xa8, 0xaa, 0x8e, 0x9f, 0xfc, 0xe9, 0x5f, 0x55, 0xb9,
+	0xf4, 0x50, 0xfc, 0x13, 0xe8, 0x5a, 0x07, 0x0b, 0x51, 0x13, 0xb3, 0xf5, 0xcc, 0x35, 0x05, 0x03,
+	0x66, 0x7a, 0xfe, 0x19, 0x84, 0x4b, 0x07, 0x0b, 0x11, 0xfa, 0xe8, 0xd1, 0x69, 0x3a, 0xc0, 0xc1,
+	0xf9, 0x17, 0x50, 0xf9, 0xa6, 0x03, 0x1c, 0x99, 0x25, 0x57, 0x11, 0xb2, 0xbf, 0x82, 0xac, 0x5d,
+	0x72, 0x15, 0x61, 0xc9, 0x55, 0x84, 0xec, 0x6f, 0x20, 0x5c, 0x74, 0x5d, 0xed, 0x6e, 0xd5, 0x98,
+	0xfc, 0x3b, 0xc8, 0x3c, 0xd3, 0xad, 0x1a, 0x8f, 0xc5, 0xce, 0xe1, 0x70, 0xfc, 0x07, 0xa8, 0xea,
+	0xc5, 0xce, 0xe1, 0x5c, 0x34, 0x1d, 0xe0, 0x54, 0xfc, 0x27, 0x88, 0x1a, 0xa6, 0x03, 0x1c, 0x88,
+	0x1f, 0xd6, 0x75, 0xe9, 0x3b, 0xcb, 0xbf, 0xaa, 0x57, 0x7a, 0x54, 0x37, 0x8d, 0x68, 0x94, 0x0e,
+	0xd5, 0x01, 0xc6, 0xfb, 0xca, 0xbf, 0xab, 0xf2, 0x39, 0xbd, 0x73, 0xe1, 0xe7, 0x74, 0x58, 0x2a,
+	0x2f, 0x2b, 0xa6, 0x5e, 0xbc, 0xab, 0xbc, 0x51, 0xf7, 0x94, 0x3f, 0xc8, 0x8e, 0x76, 0xd8, 0xc3,
+	0x9a, 0x3c, 0xc7, 0x9e, 0x3a, 0xea, 0x2f, 0x3e, 0xc8, 0x76, 0x5c, 0x49, 0x87, 0x7d, 0xbb, 0x26,
+	0x8f, 0x9e, 0x25, 0xe9, 0x5c, 0x17, 0xa4, 0xe9, 0xbc, 0x09, 0x70, 0x5e, 0x6d, 0x60, 0xc5, 0xeb,
+	0xf2, 0x15, 0x88, 0x79, 0x43, 0x20, 0x65, 0xb0, 0xce, 0x79, 0x9c, 0x71, 0x9e, 0xcf, 0x70, 0xdd,
+	0x03, 0xf9, 0x1c, 0x67, 0x1e, 0x73, 0x70, 0xdd, 0x73, 0xb0, 0xce, 0xba, 0x81, 0x39, 0xb7, 0x4a,
+	0x5c, 0xf7, 0x04, 0xaf, 0x9f, 0xe6, 0x6a, 0x86, 0x0b, 0xdf, 0x45, 0xe8, 0xfc, 0x8c, 0xa4, 0x6d,
+	0x52, 0x79, 0x25, 0x39, 0x93, 0x6f, 0x04, 0x6b, 0x11, 0xfc, 0x49, 0x9f, 0x22, 0xb5, 0xfb, 0xf1,
+	0x70, 0x96, 0xc8, 0x17, 0x80, 0x95, 0x08, 0x3f, 0x74, 0xfd, 0xe7, 0xbd, 0xeb, 0x39, 0xb9, 0x76,
+	0xee, 0xf4, 0xb3, 0x93, 0xd4, 0x31, 0xc9, 0x9e, 0x9d, 0xe4, 0x0a, 0xd7, 0x56, 0xcb, 0x35, 0x23,
+	0xeb, 0xe7, 0xcc, 0x41, 0xdb, 0x73, 0x11, 0x3d, 0x77, 0x6d, 0xcf, 0xcb, 0x3e, 0xd1, 0x59, 0x86,
+	0x2f, 0x10, 0x52, 0x9c, 0x19, 0xf9, 0x4e, 0x4d, 0x1e, 0x01, 0xb9, 0xb7, 0x47, 0xf2, 0x25, 0x2c,
+	0xfb, 0x8f, 0x84, 0x24, 0x6a, 0x65, 0x46, 0x27, 0xb3, 0x5e, 0xaf, 0x93, 0x25, 0x95, 0xf5, 0xc6,
+	0x1b, 0x48, 0x55, 0x4e, 0xcb, 0x65, 0x52, 0xbd, 0xb7, 0x17, 0xdd, 0x6d, 0x2f, 0xd0, 0x25, 0x02,
+	0xd7, 0xd5, 0xb6, 0xb7, 0xdb, 0x34, 0xe3, 0x00, 0x16, 0xed, 0xae, 0x90, 0xba, 0x39, 0x64, 0xbb,
+	0xef, 0xbe, 0xf7, 0xce, 0xfe, 0x20, 0x7f, 0x79, 0x76, 0xbc, 0x75, 0x92, 0x8d, 0xb6, 0xfb, 0xd9,
+	0x30, 0x4e, 0xfb, 0xdb, 0xb2, 0xf2, 0xe3, 0x59, 0x6f, 0xfb, 0x7e, 0x67, 0xfb, 0x64, 0x74, 0x8a,
+	0x9f, 0x4f, 0x36, 0xfb, 0x49, 0xba, 0xd9, 0xcf, 0xb6, 0xf3, 0x64, 0x9a, 0x9f, 0xc6, 0x79, 0x8c,
+	0xe1, 0xce, 0xeb, 0x01, 0x00, 0x00, 0xff, 0xff, 0x32, 0x7f, 0xcf, 0x06, 0x30, 0x16, 0x00, 0x00,
 }

+ 2 - 2
cmd/protoc-gen-go/testdata/proto2/fields.proto

@@ -82,10 +82,10 @@ message FieldTestMessage {
   optional uint64   default_uint64   = 308 [default=1];
   optional sfixed32 default_sfixed32 = 309 [default=1];
   optional fixed32  default_fixed32  = 310 [default=1];
-  optional float    default_float    = 311 [default=1.5];
+  optional float    default_float    = 311 [default=3.14];
   optional sfixed64 default_sfixed64 = 312 [default=1];
   optional fixed64  default_fixed64  = 313 [default=1];
-  optional double   default_double   = 314 [default=1.5];
+  optional double   default_double   = 314 [default=3.1415];
   optional string   default_string   = 315 [default="x,y"];
   optional bytes    default_bytes    = 316 [default="x,y"];