cmd/protoc-gen-go: group default consts and vars in blocks
Group the default constant and variable declarations together in a block
for better readability in godoc.
Change-Id: I6b62f5374f0302d0f7cb224cbe34102359c8c51d
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189057
Reviewed-by: Damien Neil <dneil@google.com>
diff --git a/internal/testprotos/benchmarks/datasets/google_message1/proto2/benchmark_message1_proto2.pb.go b/internal/testprotos/benchmarks/datasets/google_message1/proto2/benchmark_message1_proto2.pb.go
index 41d2a0c..0d206e9 100644
--- a/internal/testprotos/benchmarks/datasets/google_message1/proto2/benchmark_message1_proto2.pb.go
+++ b/internal/testprotos/benchmarks/datasets/google_message1/proto2/benchmark_message1_proto2.pb.go
@@ -64,30 +64,33 @@
Field131 *int32 `protobuf:"varint,131,opt,name=field131,def=0" json:"field131,omitempty"`
}
-const Default_GoogleMessage1_Field80 bool = false
-const Default_GoogleMessage1_Field81 bool = true
-const Default_GoogleMessage1_Field6 int32 = 0
-const Default_GoogleMessage1_Field59 bool = false
-const Default_GoogleMessage1_Field130 int32 = 0
-const Default_GoogleMessage1_Field12 bool = true
-const Default_GoogleMessage1_Field17 bool = true
-const Default_GoogleMessage1_Field13 bool = true
-const Default_GoogleMessage1_Field14 bool = true
-const Default_GoogleMessage1_Field104 int32 = 0
-const Default_GoogleMessage1_Field100 int32 = 0
-const Default_GoogleMessage1_Field101 int32 = 0
-const Default_GoogleMessage1_Field29 int32 = 0
-const Default_GoogleMessage1_Field30 bool = false
-const Default_GoogleMessage1_Field60 int32 = -1
-const Default_GoogleMessage1_Field271 int32 = -1
-const Default_GoogleMessage1_Field272 int32 = -1
-const Default_GoogleMessage1_Field23 int32 = 0
-const Default_GoogleMessage1_Field24 bool = false
-const Default_GoogleMessage1_Field25 int32 = 0
-const Default_GoogleMessage1_Field67 int32 = 0
-const Default_GoogleMessage1_Field128 int32 = 0
-const Default_GoogleMessage1_Field129 string = "xxxxxxxxxxxxxxxxxxxxx"
-const Default_GoogleMessage1_Field131 int32 = 0
+// Default values for GoogleMessage1 fields.
+const (
+ Default_GoogleMessage1_Field80 = bool(false)
+ Default_GoogleMessage1_Field81 = bool(true)
+ Default_GoogleMessage1_Field6 = int32(0)
+ Default_GoogleMessage1_Field59 = bool(false)
+ Default_GoogleMessage1_Field130 = int32(0)
+ Default_GoogleMessage1_Field12 = bool(true)
+ Default_GoogleMessage1_Field17 = bool(true)
+ Default_GoogleMessage1_Field13 = bool(true)
+ Default_GoogleMessage1_Field14 = bool(true)
+ Default_GoogleMessage1_Field104 = int32(0)
+ Default_GoogleMessage1_Field100 = int32(0)
+ Default_GoogleMessage1_Field101 = int32(0)
+ Default_GoogleMessage1_Field29 = int32(0)
+ Default_GoogleMessage1_Field30 = bool(false)
+ Default_GoogleMessage1_Field60 = int32(-1)
+ Default_GoogleMessage1_Field271 = int32(-1)
+ Default_GoogleMessage1_Field272 = int32(-1)
+ Default_GoogleMessage1_Field23 = int32(0)
+ Default_GoogleMessage1_Field24 = bool(false)
+ Default_GoogleMessage1_Field25 = int32(0)
+ Default_GoogleMessage1_Field67 = int32(0)
+ Default_GoogleMessage1_Field128 = int32(0)
+ Default_GoogleMessage1_Field129 = string("xxxxxxxxxxxxxxxxxxxxx")
+ Default_GoogleMessage1_Field131 = int32(0)
+)
func (x *GoogleMessage1) Reset() {
*x = GoogleMessage1{}
@@ -429,15 +432,18 @@
Field300 *uint64 `protobuf:"varint,300,opt,name=field300" json:"field300,omitempty"`
}
-const Default_GoogleMessage1SubMessage_Field1 int32 = 0
-const Default_GoogleMessage1SubMessage_Field2 int32 = 0
-const Default_GoogleMessage1SubMessage_Field3 int32 = 0
-const Default_GoogleMessage1SubMessage_Field12 bool = true
-const Default_GoogleMessage1SubMessage_Field19 int32 = 2
-const Default_GoogleMessage1SubMessage_Field20 bool = true
-const Default_GoogleMessage1SubMessage_Field28 bool = true
-const Default_GoogleMessage1SubMessage_Field23 bool = false
-const Default_GoogleMessage1SubMessage_Field206 bool = false
+// Default values for GoogleMessage1SubMessage fields.
+const (
+ Default_GoogleMessage1SubMessage_Field1 = int32(0)
+ Default_GoogleMessage1SubMessage_Field2 = int32(0)
+ Default_GoogleMessage1SubMessage_Field3 = int32(0)
+ Default_GoogleMessage1SubMessage_Field12 = bool(true)
+ Default_GoogleMessage1SubMessage_Field19 = int32(2)
+ Default_GoogleMessage1SubMessage_Field20 = bool(true)
+ Default_GoogleMessage1SubMessage_Field28 = bool(true)
+ Default_GoogleMessage1SubMessage_Field23 = bool(false)
+ Default_GoogleMessage1SubMessage_Field206 = bool(false)
+)
func (x *GoogleMessage1SubMessage) Reset() {
*x = GoogleMessage1SubMessage{}
diff --git a/internal/testprotos/benchmarks/datasets/google_message2/benchmark_message2.pb.go b/internal/testprotos/benchmarks/datasets/google_message2/benchmark_message2.pb.go
index 9d0e509..01e668d 100644
--- a/internal/testprotos/benchmarks/datasets/google_message2/benchmark_message2.pb.go
+++ b/internal/testprotos/benchmarks/datasets/google_message2/benchmark_message2.pb.go
@@ -53,21 +53,24 @@
Field206 *bool `protobuf:"varint,206,opt,name=field206,def=0" json:"field206,omitempty"`
}
-const Default_GoogleMessage2_Field75 bool = false
-const Default_GoogleMessage2_Field21 int32 = 0
-const Default_GoogleMessage2_Field109 int32 = 0
-const Default_GoogleMessage2_Field210 int32 = 0
-const Default_GoogleMessage2_Field211 int32 = 0
-const Default_GoogleMessage2_Field212 int32 = 0
-const Default_GoogleMessage2_Field213 int32 = 0
-const Default_GoogleMessage2_Field216 int32 = 0
-const Default_GoogleMessage2_Field217 int32 = 0
-const Default_GoogleMessage2_Field218 int32 = 0
-const Default_GoogleMessage2_Field220 int32 = 0
-const Default_GoogleMessage2_Field221 int32 = 0
-const Default_GoogleMessage2_Field222 float32 = 0
-const Default_GoogleMessage2_Field205 bool = false
-const Default_GoogleMessage2_Field206 bool = false
+// Default values for GoogleMessage2 fields.
+const (
+ Default_GoogleMessage2_Field75 = bool(false)
+ Default_GoogleMessage2_Field21 = int32(0)
+ Default_GoogleMessage2_Field109 = int32(0)
+ Default_GoogleMessage2_Field210 = int32(0)
+ Default_GoogleMessage2_Field211 = int32(0)
+ Default_GoogleMessage2_Field212 = int32(0)
+ Default_GoogleMessage2_Field213 = int32(0)
+ Default_GoogleMessage2_Field216 = int32(0)
+ Default_GoogleMessage2_Field217 = int32(0)
+ Default_GoogleMessage2_Field218 = int32(0)
+ Default_GoogleMessage2_Field220 = int32(0)
+ Default_GoogleMessage2_Field221 = int32(0)
+ Default_GoogleMessage2_Field222 = float32(0)
+ Default_GoogleMessage2_Field205 = bool(false)
+ Default_GoogleMessage2_Field206 = bool(false)
+)
func (x *GoogleMessage2) Reset() {
*x = GoogleMessage2{}
@@ -323,9 +326,12 @@
Field11 *int64 `protobuf:"varint,11,opt,name=field11" json:"field11,omitempty"`
}
-const Default_GoogleMessage2GroupedMessage_Field3 float32 = 0
-const Default_GoogleMessage2GroupedMessage_Field6 bool = true
-const Default_GoogleMessage2GroupedMessage_Field7 bool = false
+// Default values for GoogleMessage2GroupedMessage fields.
+const (
+ Default_GoogleMessage2GroupedMessage_Field3 = float32(0)
+ Default_GoogleMessage2GroupedMessage_Field6 = bool(true)
+ Default_GoogleMessage2GroupedMessage_Field7 = bool(false)
+)
func (x *GoogleMessage2GroupedMessage) Reset() {
*x = GoogleMessage2GroupedMessage{}
@@ -453,7 +459,10 @@
Field31 *GoogleMessage2GroupedMessage `protobuf:"bytes,31,opt,name=field31" json:"field31,omitempty"`
}
-const Default_GoogleMessage2_Group1_Field20 int32 = 0
+// Default values for GoogleMessage2_Group1 fields.
+const (
+ Default_GoogleMessage2_Group1_Field20 = int32(0)
+)
func (x *GoogleMessage2_Group1) Reset() {
*x = GoogleMessage2_Group1{}
diff --git a/internal/testprotos/test/test.pb.go b/internal/testprotos/test/test.pb.go
index 139c71e..80fc920 100644
--- a/internal/testprotos/test/test.pb.go
+++ b/internal/testprotos/test/test.pb.go
@@ -333,25 +333,30 @@
OneofField isTestAllTypes_OneofField `protobuf_oneof:"oneof_field"`
}
-const Default_TestAllTypes_DefaultInt32 int32 = 81
-const Default_TestAllTypes_DefaultInt64 int64 = 82
-const Default_TestAllTypes_DefaultUint32 uint32 = 83
-const Default_TestAllTypes_DefaultUint64 uint64 = 84
-const Default_TestAllTypes_DefaultSint32 int32 = -85
-const Default_TestAllTypes_DefaultSint64 int64 = 86
-const Default_TestAllTypes_DefaultFixed32 uint32 = 87
-const Default_TestAllTypes_DefaultFixed64 uint64 = 88
-const Default_TestAllTypes_DefaultSfixed32 int32 = 89
-const Default_TestAllTypes_DefaultSfixed64 int64 = -90
-const Default_TestAllTypes_DefaultFloat float32 = 91.5
-const Default_TestAllTypes_DefaultDouble float64 = 92000
-const Default_TestAllTypes_DefaultBool bool = true
-const Default_TestAllTypes_DefaultString string = "hello"
+// Default values for TestAllTypes fields.
+const (
+ Default_TestAllTypes_DefaultInt32 = int32(81)
+ Default_TestAllTypes_DefaultInt64 = int64(82)
+ Default_TestAllTypes_DefaultUint32 = uint32(83)
+ Default_TestAllTypes_DefaultUint64 = uint64(84)
+ Default_TestAllTypes_DefaultSint32 = int32(-85)
+ Default_TestAllTypes_DefaultSint64 = int64(86)
+ Default_TestAllTypes_DefaultFixed32 = uint32(87)
+ Default_TestAllTypes_DefaultFixed64 = uint64(88)
+ Default_TestAllTypes_DefaultSfixed32 = int32(89)
+ Default_TestAllTypes_DefaultSfixed64 = int64(-90)
+ Default_TestAllTypes_DefaultFloat = float32(91.5)
+ Default_TestAllTypes_DefaultDouble = float64(92000)
+ Default_TestAllTypes_DefaultBool = bool(true)
+ Default_TestAllTypes_DefaultString = string("hello")
+ Default_TestAllTypes_DefaultNestedEnum = TestAllTypes_BAR
+ Default_TestAllTypes_DefaultForeignEnum = ForeignEnum_FOREIGN_BAR
+)
-var Default_TestAllTypes_DefaultBytes []byte = []byte("world")
-
-const Default_TestAllTypes_DefaultNestedEnum TestAllTypes_NestedEnum = TestAllTypes_BAR
-const Default_TestAllTypes_DefaultForeignEnum ForeignEnum = ForeignEnum_FOREIGN_BAR
+// Default values for TestAllTypes fields.
+var (
+ Default_TestAllTypes_DefaultBytes = []byte("world")
+)
func (x *TestAllTypes) Reset() {
*x = TestAllTypes{}