cmd/protoc-gen-go: remove MessageSet hackery
The encoding/prototext and encoding/protojson are implemented entirely
in terms of protobuf reflection, which side-steps this information.
Remove the hacks in the generator to special-case MessageSet.
Change-Id: I708c4636b77672545a103b7ab686f103b9dfc514
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185240
Reviewed-by: Herbie Ong <herbie@google.com>
diff --git a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3.pb.go b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3.pb.go
index 087607c..39433b3 100644
--- a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3.pb.go
+++ b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3.pb.go
@@ -1908,7 +1908,7 @@
Field16541 []string `protobuf:"bytes,41,rep,name=field16541" json:"field16541,omitempty"`
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- extensionFields protoimpl.ExtensionFields ``
+ extensionFields protoimpl.ExtensionFields
}
func (x *Message16507) Reset() {
diff --git a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_1.pb.go b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_1.pb.go
index 104c791..b233fad 100644
--- a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_1.pb.go
+++ b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_1.pb.go
@@ -2756,7 +2756,7 @@
Field16805 *UnusedEmptyMessage `protobuf:"bytes,25,opt,name=field16805" json:"field16805,omitempty"`
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- extensionFields protoimpl.ExtensionFields ``
+ extensionFields protoimpl.ExtensionFields
}
func (x *Message16727) Reset() {
@@ -3409,7 +3409,7 @@
Field17024 []string `protobuf:"bytes,274,rep,name=field17024" json:"field17024,omitempty"`
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- extensionFields protoimpl.ExtensionFields ``
+ extensionFields protoimpl.ExtensionFields
}
func (x *Message16945) Reset() {
diff --git a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_2.pb.go b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_2.pb.go
index 0269ec7..bafecc7 100644
--- a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_2.pb.go
+++ b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_2.pb.go
@@ -1560,7 +1560,7 @@
Field11891 *bool `protobuf:"varint,7,opt,name=field11891" json:"field11891,omitempty"`
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- extensionFields protoimpl.ExtensionFields ``
+ extensionFields protoimpl.ExtensionFields
}
func (x *Message11874) Reset() {
@@ -2204,7 +2204,7 @@
Field18581 *bool `protobuf:"varint,193,opt,name=field18581" json:"field18581,omitempty"`
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- extensionFields protoimpl.ExtensionFields ``
+ extensionFields protoimpl.ExtensionFields
}
func (x *Message18283) Reset() {
diff --git a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_4.pb.go b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_4.pb.go
index d9519c5..6a38e88 100644
--- a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_4.pb.go
+++ b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_4.pb.go
@@ -561,7 +561,7 @@
Field929 []byte `protobuf:"bytes,31,opt,name=field929" json:"field929,omitempty"`
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- extensionFields protoimpl.ExtensionFields ``
+ extensionFields protoimpl.ExtensionFields
}
func (x *Message730) Reset() {
@@ -1585,7 +1585,7 @@
Field11887 *UnusedEmptyMessage `protobuf:"bytes,15,opt,name=field11887" json:"field11887,omitempty"`
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- extensionFields protoimpl.ExtensionFields ``
+ extensionFields protoimpl.ExtensionFields
}
func (x *Message11873) Reset() {
diff --git a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_5.pb.go b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_5.pb.go
index b813c01..cc1ddc4 100644
--- a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_5.pb.go
+++ b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_5.pb.go
@@ -269,7 +269,7 @@
Field895 []string `protobuf:"bytes,9,rep,name=field895" json:"field895,omitempty"`
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- extensionFields protoimpl.ExtensionFields ``
+ extensionFields protoimpl.ExtensionFields
}
func (x *Message728) Reset() {
@@ -492,7 +492,7 @@
Field778 *int64 `protobuf:"varint,38,opt,name=field778" json:"field778,omitempty"`
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- extensionFields protoimpl.ExtensionFields ``
+ extensionFields protoimpl.ExtensionFields
}
func (x *Message697) Reset() {
@@ -783,7 +783,7 @@
type Message0 struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- extensionFields protoimpl.ExtensionFields `protobuf_messageset:"1"`
+ extensionFields protoimpl.ExtensionFields
}
func (x *Message0) Reset() {
@@ -1007,7 +1007,7 @@
Field10581 *string `protobuf:"bytes,2,opt,name=field10581" json:"field10581,omitempty"`
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- extensionFields protoimpl.ExtensionFields ``
+ extensionFields protoimpl.ExtensionFields
}
func (x *Message10573) Reset() {
@@ -1249,7 +1249,7 @@
Field10264 []*Message9628 `protobuf:"bytes,94,rep,name=field10264" json:"field10264,omitempty"`
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- extensionFields protoimpl.ExtensionFields ``
+ extensionFields protoimpl.ExtensionFields
}
func (x *Message10155) Reset() {
@@ -2205,7 +2205,7 @@
Field13157 *float32 `protobuf:"fixed32,3,opt,name=field13157" json:"field13157,omitempty"`
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- extensionFields protoimpl.ExtensionFields ``
+ extensionFields protoimpl.ExtensionFields
}
func (x *Message13145) Reset() {
@@ -2503,7 +2503,7 @@
Field8338 *Message7965 `protobuf:"bytes,11,opt,name=field8338" json:"field8338,omitempty"`
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- extensionFields protoimpl.ExtensionFields ``
+ extensionFields protoimpl.ExtensionFields
}
func (x *Message8301) Reset() {
@@ -2667,7 +2667,7 @@
Field8359 *Message7965 `protobuf:"bytes,21,opt,name=field8359" json:"field8359,omitempty"`
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- extensionFields protoimpl.ExtensionFields ``
+ extensionFields protoimpl.ExtensionFields
}
func (x *Message8302) Reset() {
diff --git a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_6.pb.go b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_6.pb.go
index 3ed17a1..80fd184 100644
--- a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_6.pb.go
+++ b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_6.pb.go
@@ -642,7 +642,7 @@
Field9230 *float32 `protobuf:"fixed32,39,opt,name=field9230" json:"field9230,omitempty"`
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- extensionFields protoimpl.ExtensionFields ``
+ extensionFields protoimpl.ExtensionFields
}
func (x *Message9182) Reset() {
diff --git a/internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4.pb.go b/internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4.pb.go
index 3027d94..9994dbd 100644
--- a/internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4.pb.go
+++ b/internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4.pb.go
@@ -2259,7 +2259,7 @@
Message3070 []*Message3069_Message3070 `protobuf:"group,3,rep,name=Message3070,json=message3070" json:"message3070,omitempty"`
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- extensionFields protoimpl.ExtensionFields ``
+ extensionFields protoimpl.ExtensionFields
}
func (x *Message3069) Reset() {
@@ -3486,7 +3486,7 @@
type Message0 struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- extensionFields protoimpl.ExtensionFields `protobuf_messageset:"1"`
+ extensionFields protoimpl.ExtensionFields
}
func (x *Message0) Reset() {
diff --git a/internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4_1.pb.go b/internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4_1.pb.go
index 5a47082..9bfa0b1 100644
--- a/internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4_1.pb.go
+++ b/internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4_1.pb.go
@@ -1274,7 +1274,7 @@
Field12795 *UnusedEmptyMessage `protobuf:"bytes,12,opt,name=field12795" json:"field12795,omitempty"`
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- extensionFields protoimpl.ExtensionFields ``
+ extensionFields protoimpl.ExtensionFields
}
func (x *Message12776) Reset() {
@@ -2363,7 +2363,7 @@
Field6151 *bool `protobuf:"varint,14,opt,name=field6151" json:"field6151,omitempty"`
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- extensionFields protoimpl.ExtensionFields ``
+ extensionFields protoimpl.ExtensionFields
}
func (x *Message6109) Reset() {
diff --git a/internal/testprotos/conformance/test_messages_proto2.pb.go b/internal/testprotos/conformance/test_messages_proto2.pb.go
index 28b8058..39ef291 100644
--- a/internal/testprotos/conformance/test_messages_proto2.pb.go
+++ b/internal/testprotos/conformance/test_messages_proto2.pb.go
@@ -234,7 +234,7 @@
FieldName18__ *int32 `protobuf:"varint,418,opt,name=Field_name18__,json=FieldName18" json:"Field_name18__,omitempty"`
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- extensionFields protoimpl.ExtensionFields ``
+ extensionFields protoimpl.ExtensionFields
}
func (x *TestAllTypesProto2) Reset() {
@@ -1093,7 +1093,7 @@
type TestAllTypesProto2_MessageSetCorrect struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- extensionFields protoimpl.ExtensionFields `protobuf_messageset:"1"`
+ extensionFields protoimpl.ExtensionFields
}
func (x *TestAllTypesProto2_MessageSetCorrect) Reset() {
@@ -1213,7 +1213,7 @@
ExtendedType: (*TestAllTypesProto2_MessageSetCorrect)(nil),
ExtensionType: (*TestAllTypesProto2_MessageSetCorrectExtension1)(nil),
Field: 1547769,
- Name: "protobuf_test_messages.proto2.TestAllTypesProto2.MessageSetCorrectExtension1",
+ Name: "protobuf_test_messages.proto2.TestAllTypesProto2.MessageSetCorrectExtension1.message_set_extension",
Tag: "bytes,1547769,opt,name=message_set_extension",
Filename: "google/protobuf/test_messages_proto2.proto",
},
@@ -1221,7 +1221,7 @@
ExtendedType: (*TestAllTypesProto2_MessageSetCorrect)(nil),
ExtensionType: (*TestAllTypesProto2_MessageSetCorrectExtension2)(nil),
Field: 4135312,
- Name: "protobuf_test_messages.proto2.TestAllTypesProto2.MessageSetCorrectExtension2",
+ Name: "protobuf_test_messages.proto2.TestAllTypesProto2.MessageSetCorrectExtension2.message_set_extension",
Tag: "bytes,4135312,opt,name=message_set_extension",
Filename: "google/protobuf/test_messages_proto2.proto",
},
diff --git a/internal/testprotos/test/test.pb.go b/internal/testprotos/test/test.pb.go
index e044c53..bae3e17 100644
--- a/internal/testprotos/test/test.pb.go
+++ b/internal/testprotos/test/test.pb.go
@@ -1174,7 +1174,7 @@
type TestAllExtensions struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- extensionFields protoimpl.ExtensionFields ``
+ extensionFields protoimpl.ExtensionFields
}
func (x *TestAllExtensions) Reset() {