Explorar o código

cmd/protoc-gen-go: update deprecation warning

Change-Id: Ie1a854bf6f47d4ca9e941b6ccc64dc24ff32bd19
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/186657
Reviewed-by: Damien Neil <dneil@google.com>
Joe Tsai %!s(int64=6) %!d(string=hai) anos
pai
achega
43761bdfe7
Modificáronse 81 ficheiros con 843 adicións e 843 borrados
  1. 2 2
      cmd/protoc-gen-go-grpc/testdata/grpc/grpc.pb.go
  2. 3 3
      cmd/protoc-gen-go/internal_gengo/main.go
  3. 2 2
      cmd/protoc-gen-go/testdata/annotations/annotations.pb.go
  4. 1 1
      cmd/protoc-gen-go/testdata/annotations/annotations.pb.go.meta
  5. 6 6
      cmd/protoc-gen-go/testdata/comments/comments.pb.go
  6. 2 2
      cmd/protoc-gen-go/testdata/comments/deprecated.pb.go
  7. 4 4
      cmd/protoc-gen-go/testdata/extensions/base/base.pb.go
  8. 10 10
      cmd/protoc-gen-go/testdata/extensions/ext/ext.pb.go
  9. 1 1
      cmd/protoc-gen-go/testdata/extensions/extra/extra.pb.go
  10. 2 2
      cmd/protoc-gen-go/testdata/extensions/proto3/ext3.pb.go
  11. 2 2
      cmd/protoc-gen-go/testdata/fieldnames/fieldnames.pb.go
  12. 1 1
      cmd/protoc-gen-go/testdata/import_public/a.pb.go
  13. 1 1
      cmd/protoc-gen-go/testdata/import_public/b.pb.go
  14. 1 1
      cmd/protoc-gen-go/testdata/import_public/c.pb.go
  15. 6 6
      cmd/protoc-gen-go/testdata/import_public/sub/a.pb.go
  16. 1 1
      cmd/protoc-gen-go/testdata/import_public/sub/b.pb.go
  17. 1 1
      cmd/protoc-gen-go/testdata/import_public/sub2/a.pb.go
  18. 1 1
      cmd/protoc-gen-go/testdata/imports/fmt/m.pb.go
  19. 3 3
      cmd/protoc-gen-go/testdata/imports/test_a_1/m1.pb.go
  20. 1 1
      cmd/protoc-gen-go/testdata/imports/test_a_1/m2.pb.go
  21. 1 1
      cmd/protoc-gen-go/testdata/imports/test_a_2/m3.pb.go
  22. 1 1
      cmd/protoc-gen-go/testdata/imports/test_a_2/m4.pb.go
  23. 1 1
      cmd/protoc-gen-go/testdata/imports/test_b_1/m1.pb.go
  24. 1 1
      cmd/protoc-gen-go/testdata/imports/test_b_1/m2.pb.go
  25. 1 1
      cmd/protoc-gen-go/testdata/imports/test_import_a1m1.pb.go
  26. 1 1
      cmd/protoc-gen-go/testdata/imports/test_import_a1m2.pb.go
  27. 1 1
      cmd/protoc-gen-go/testdata/imports/test_import_all.pb.go
  28. 1 1
      cmd/protoc-gen-go/testdata/issue780_oneof_conflict/test.pb.go
  29. 2 2
      cmd/protoc-gen-go/testdata/nopackage/nopackage.pb.go
  30. 8 8
      cmd/protoc-gen-go/testdata/proto2/enum.pb.go
  31. 7 7
      cmd/protoc-gen-go/testdata/proto2/fields.pb.go
  32. 3 3
      cmd/protoc-gen-go/testdata/proto2/nested_messages.pb.go
  33. 1 1
      cmd/protoc-gen-go/testdata/proto2/proto2.pb.go
  34. 1 1
      cmd/protoc-gen-go/testdata/proto3/enum.pb.go
  35. 3 3
      cmd/protoc-gen-go/testdata/proto3/fields.pb.go
  36. 24 24
      encoding/testprotos/pb2/test.pb.go
  37. 9 9
      encoding/testprotos/pb3/test.pb.go
  38. 1 1
      internal/testprotos/benchmarks/benchmarks.pb.go
  39. 2 2
      internal/testprotos/benchmarks/datasets/google_message1/proto2/benchmark_message1_proto2.pb.go
  40. 2 2
      internal/testprotos/benchmarks/datasets/google_message1/proto3/benchmark_message1_proto3.pb.go
  41. 3 3
      internal/testprotos/benchmarks/datasets/google_message2/benchmark_message2.pb.go
  42. 34 34
      internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3.pb.go
  43. 61 61
      internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_1.pb.go
  44. 36 36
      internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_2.pb.go
  45. 37 37
      internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_3.pb.go
  46. 56 56
      internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_4.pb.go
  47. 57 57
      internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_5.pb.go
  48. 43 43
      internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_6.pb.go
  49. 10 10
      internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_7.pb.go
  50. 59 59
      internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_8.pb.go
  51. 47 47
      internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4.pb.go
  52. 46 46
      internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4_1.pb.go
  53. 35 35
      internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4_2.pb.go
  54. 42 42
      internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4_3.pb.go
  55. 6 6
      internal/testprotos/conformance/conformance.pb.go
  56. 11 11
      internal/testprotos/conformance/test_messages_proto2.pb.go
  57. 6 6
      internal/testprotos/conformance/test_messages_proto3.pb.go
  58. 1 1
      internal/testprotos/irregular/test.pb.go
  59. 1 1
      internal/testprotos/legacy/legacy.pb.go
  60. 2 2
      internal/testprotos/messageset/messagesetpb/message_set.pb.go
  61. 2 2
      internal/testprotos/messageset/msetextpb/msetextpb.pb.go
  62. 30 30
      internal/testprotos/test/test.pb.go
  63. 2 2
      internal/testprotos/test/test_import.pb.go
  64. 1 1
      internal/testprotos/test/test_public.pb.go
  65. 1 1
      internal/testprotos/test/weak1/test_weak.pb.go
  66. 1 1
      internal/testprotos/test/weak2/test_weak.pb.go
  67. 5 5
      internal/testprotos/test3/test.pb.go
  68. 2 2
      internal/testprotos/test3/test_import.pb.go
  69. 8 8
      reflect/protoregistry/testprotos/test.pb.go
  70. 42 42
      types/descriptorpb/descriptor.pb.go
  71. 1 1
      types/known/anypb/any.pb.go
  72. 3 3
      types/known/apipb/api.pb.go
  73. 1 1
      types/known/durationpb/duration.pb.go
  74. 1 1
      types/known/emptypb/empty.pb.go
  75. 1 1
      types/known/fieldmaskpb/field_mask.pb.go
  76. 1 1
      types/known/sourcecontextpb/source_context.pb.go
  77. 4 4
      types/known/structpb/struct.pb.go
  78. 1 1
      types/known/timestamppb/timestamp.pb.go
  79. 8 8
      types/known/typepb/type.pb.go
  80. 9 9
      types/known/wrapperspb/wrappers.pb.go
  81. 4 4
      types/pluginpb/plugin.pb.go

+ 2 - 2
cmd/protoc-gen-go-grpc/testdata/grpc/grpc.pb.go

@@ -45,7 +45,7 @@ func (x *Request) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Request.ProtoReflect.Type instead.
+// Deprecated: Use Request.ProtoReflect.Descriptor instead.
 func (*Request) Descriptor() ([]byte, []int) {
 	return file_grpc_grpc_proto_rawDescGZIP(), []int{0}
 }
@@ -78,7 +78,7 @@ func (x *Response) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Response.ProtoReflect.Type instead.
+// Deprecated: Use Response.ProtoReflect.Descriptor instead.
 func (*Response) Descriptor() ([]byte, []int) {
 	return file_grpc_grpc_proto_rawDescGZIP(), []int{1}
 }

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

@@ -361,7 +361,7 @@ func genEnum(gen *protogen.Plugin, g *protogen.GeneratedFile, f *fileInfo, enum
 		for i := 1; i < len(enum.Location.Path); i += 2 {
 			indexes = append(indexes, strconv.Itoa(int(enum.Location.Path[i])))
 		}
-		g.P("// Deprecated: Use ", enum.GoIdent, ".Type instead.")
+		g.P("// Deprecated: Use ", enum.GoIdent, ".Descriptor instead.")
 		g.P("func (", enum.GoIdent, ") EnumDescriptor() ([]byte, []int) {")
 		g.P("return ", rawDescVarName(f), "GZIP(), []int{", strings.Join(indexes, ","), "}")
 		g.P("}")
@@ -513,7 +513,7 @@ func genMessage(gen *protogen.Plugin, g *protogen.GeneratedFile, f *fileInfo, me
 		for i := 1; i < len(message.Location.Path); i += 2 {
 			indexes = append(indexes, strconv.Itoa(int(message.Location.Path[i])))
 		}
-		g.P("// Deprecated: Use ", message.GoIdent, ".ProtoReflect.Type instead.")
+		g.P("// Deprecated: Use ", message.GoIdent, ".ProtoReflect.Descriptor instead.")
 		g.P("func (*", message.GoIdent, ") Descriptor() ([]byte, []int) {")
 		g.P("return ", rawDescVarName(f), "GZIP(), []int{", strings.Join(indexes, ","), "}")
 		g.P("}")
@@ -532,7 +532,7 @@ func genMessage(gen *protogen.Plugin, g *protogen.GeneratedFile, f *fileInfo, me
 			}
 			g.P("}")
 			g.P()
-			g.P("// Deprecated: Use ", message.GoIdent, ".ProtoReflect.Type.ExtensionRanges instead.")
+			g.P("// Deprecated: Use ", message.GoIdent, ".ProtoReflect.Descriptor.ExtensionRanges instead.")
 			g.P("func (*", message.GoIdent, ") ExtensionRangeArray() []", protoExtRange, " {")
 			g.P("return ", extRangeVar)
 			g.P("}")

+ 2 - 2
cmd/protoc-gen-go/testdata/annotations/annotations.pb.go

@@ -64,7 +64,7 @@ func (x *AnnotationsTestEnum) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use AnnotationsTestEnum.Type instead.
+// Deprecated: Use AnnotationsTestEnum.Descriptor instead.
 func (AnnotationsTestEnum) EnumDescriptor() ([]byte, []int) {
 	return file_annotations_annotations_proto_rawDescGZIP(), []int{0}
 }
@@ -98,7 +98,7 @@ func (x *AnnotationsTestMessage) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use AnnotationsTestMessage.ProtoReflect.Type instead.
+// Deprecated: Use AnnotationsTestMessage.ProtoReflect.Descriptor instead.
 func (*AnnotationsTestMessage) Descriptor() ([]byte, []int) {
 	return file_annotations_annotations_proto_rawDescGZIP(), []int{0}
 }

+ 1 - 1
cmd/protoc-gen-go/testdata/annotations/annotations.pb.go.meta

@@ -1 +1 @@
-annotation:{path:5 path:0 source_file:"annotations/annotations.proto" begin:590 end:609} annotation:{path:5 path:0 path:2 path:0 source_file:"annotations/annotations.proto" begin:626 end:673} annotation:{path:4 path:0 source_file:"annotations/annotations.proto" begin:1898 end:1920} annotation:{path:4 path:0 path:2 path:0 source_file:"annotations/annotations.proto" begin:1976 end:1996} annotation:{path:4 path:0 path:2 path:0 source_file:"annotations/annotations.proto" begin:2972 end:2995}
+annotation:{path:5 path:0 source_file:"annotations/annotations.proto" begin:590 end:609} annotation:{path:5 path:0 path:2 path:0 source_file:"annotations/annotations.proto" begin:626 end:673} annotation:{path:4 path:0 source_file:"annotations/annotations.proto" begin:1904 end:1926} annotation:{path:4 path:0 path:2 path:0 source_file:"annotations/annotations.proto" begin:1982 end:2002} annotation:{path:4 path:0 path:2 path:0 source_file:"annotations/annotations.proto" begin:2984 end:3007}

+ 6 - 6
cmd/protoc-gen-go/testdata/comments/comments.pb.go

@@ -56,7 +56,7 @@ func (x *Message1) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message1.ProtoReflect.Type instead.
+// Deprecated: Use Message1.ProtoReflect.Descriptor instead.
 func (*Message1) Descriptor() ([]byte, []int) {
 	return file_comments_comments_proto_rawDescGZIP(), []int{0}
 }
@@ -121,7 +121,7 @@ func (x *Message2) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message2.ProtoReflect.Type instead.
+// Deprecated: Use Message2.ProtoReflect.Descriptor instead.
 func (*Message2) Descriptor() ([]byte, []int) {
 	return file_comments_comments_proto_rawDescGZIP(), []int{1}
 }
@@ -155,7 +155,7 @@ func (x *Message1_Message1A) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message1_Message1A.ProtoReflect.Type instead.
+// Deprecated: Use Message1_Message1A.ProtoReflect.Descriptor instead.
 func (*Message1_Message1A) Descriptor() ([]byte, []int) {
 	return file_comments_comments_proto_rawDescGZIP(), []int{0, 0}
 }
@@ -189,7 +189,7 @@ func (x *Message1_Message1B) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message1_Message1B.ProtoReflect.Type instead.
+// Deprecated: Use Message1_Message1B.ProtoReflect.Descriptor instead.
 func (*Message1_Message1B) Descriptor() ([]byte, []int) {
 	return file_comments_comments_proto_rawDescGZIP(), []int{0, 1}
 }
@@ -223,7 +223,7 @@ func (x *Message2_Message2A) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message2_Message2A.ProtoReflect.Type instead.
+// Deprecated: Use Message2_Message2A.ProtoReflect.Descriptor instead.
 func (*Message2_Message2A) Descriptor() ([]byte, []int) {
 	return file_comments_comments_proto_rawDescGZIP(), []int{1, 0}
 }
@@ -257,7 +257,7 @@ func (x *Message2_Message2B) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message2_Message2B.ProtoReflect.Type instead.
+// Deprecated: Use Message2_Message2B.ProtoReflect.Descriptor instead.
 func (*Message2_Message2B) Descriptor() ([]byte, []int) {
 	return file_comments_comments_proto_rawDescGZIP(), []int{1, 1}
 }

+ 2 - 2
cmd/protoc-gen-go/testdata/comments/deprecated.pb.go

@@ -53,7 +53,7 @@ func (x DeprecatedEnum) Number() protoreflect.EnumNumber {
 	return protoreflect.EnumNumber(x)
 }
 
-// Deprecated: Use DeprecatedEnum.Type instead.
+// Deprecated: Use DeprecatedEnum.Descriptor instead.
 func (DeprecatedEnum) EnumDescriptor() ([]byte, []int) {
 	return file_comments_deprecated_proto_rawDescGZIP(), []int{0}
 }
@@ -88,7 +88,7 @@ func (x *DeprecatedMessage) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use DeprecatedMessage.ProtoReflect.Type instead.
+// Deprecated: Use DeprecatedMessage.ProtoReflect.Descriptor instead.
 func (*DeprecatedMessage) Descriptor() ([]byte, []int) {
 	return file_comments_deprecated_proto_rawDescGZIP(), []int{0}
 }

+ 4 - 4
cmd/protoc-gen-go/testdata/extensions/base/base.pb.go

@@ -48,7 +48,7 @@ func (x *BaseMessage) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use BaseMessage.ProtoReflect.Type instead.
+// Deprecated: Use BaseMessage.ProtoReflect.Descriptor instead.
 func (*BaseMessage) Descriptor() ([]byte, []int) {
 	return file_extensions_base_base_proto_rawDescGZIP(), []int{0}
 }
@@ -58,7 +58,7 @@ var extRange_BaseMessage = []protoiface.ExtensionRangeV1{
 	{Start: 16, End: 536870911},
 }
 
-// Deprecated: Use BaseMessage.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use BaseMessage.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*BaseMessage) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_BaseMessage
 }
@@ -99,7 +99,7 @@ func (x *MessageSetWireFormatMessage) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use MessageSetWireFormatMessage.ProtoReflect.Type instead.
+// Deprecated: Use MessageSetWireFormatMessage.ProtoReflect.Descriptor instead.
 func (*MessageSetWireFormatMessage) Descriptor() ([]byte, []int) {
 	return file_extensions_base_base_proto_rawDescGZIP(), []int{1}
 }
@@ -108,7 +108,7 @@ var extRange_MessageSetWireFormatMessage = []protoiface.ExtensionRangeV1{
 	{Start: 100, End: 2147483646},
 }
 
-// Deprecated: Use MessageSetWireFormatMessage.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use MessageSetWireFormatMessage.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*MessageSetWireFormatMessage) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_MessageSetWireFormatMessage
 }

+ 10 - 10
cmd/protoc-gen-go/testdata/extensions/ext/ext.pb.go

@@ -67,7 +67,7 @@ func (x *Enum) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum.Type instead.
+// Deprecated: Use Enum.Descriptor instead.
 func (Enum) EnumDescriptor() ([]byte, []int) {
 	return file_extensions_ext_ext_proto_rawDescGZIP(), []int{0}
 }
@@ -101,7 +101,7 @@ func (x *Message) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message.ProtoReflect.Type instead.
+// Deprecated: Use Message.ProtoReflect.Descriptor instead.
 func (*Message) Descriptor() ([]byte, []int) {
 	return file_extensions_ext_ext_proto_rawDescGZIP(), []int{0}
 }
@@ -142,7 +142,7 @@ func (x *ExtensionGroup) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use ExtensionGroup.ProtoReflect.Type instead.
+// Deprecated: Use ExtensionGroup.ProtoReflect.Descriptor instead.
 func (*ExtensionGroup) Descriptor() ([]byte, []int) {
 	return file_extensions_ext_ext_proto_rawDescGZIP(), []int{1}
 }
@@ -183,7 +183,7 @@ func (x *ExtendingMessage) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use ExtendingMessage.ProtoReflect.Type instead.
+// Deprecated: Use ExtendingMessage.ProtoReflect.Descriptor instead.
 func (*ExtendingMessage) Descriptor() ([]byte, []int) {
 	return file_extensions_ext_ext_proto_rawDescGZIP(), []int{2}
 }
@@ -217,7 +217,7 @@ func (x *RepeatedGroup) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use RepeatedGroup.ProtoReflect.Type instead.
+// Deprecated: Use RepeatedGroup.ProtoReflect.Descriptor instead.
 func (*RepeatedGroup) Descriptor() ([]byte, []int) {
 	return file_extensions_ext_ext_proto_rawDescGZIP(), []int{3}
 }
@@ -259,7 +259,7 @@ func (x *Extendable) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Extendable.ProtoReflect.Type instead.
+// Deprecated: Use Extendable.ProtoReflect.Descriptor instead.
 func (*Extendable) Descriptor() ([]byte, []int) {
 	return file_extensions_ext_ext_proto_rawDescGZIP(), []int{4}
 }
@@ -268,7 +268,7 @@ var extRange_Extendable = []protoiface.ExtensionRangeV1{
 	{Start: 1, End: 536870911},
 }
 
-// Deprecated: Use Extendable.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use Extendable.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*Extendable) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_Extendable
 }
@@ -302,7 +302,7 @@ func (x *MessageSetWireFormatExtension) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use MessageSetWireFormatExtension.ProtoReflect.Type instead.
+// Deprecated: Use MessageSetWireFormatExtension.ProtoReflect.Descriptor instead.
 func (*MessageSetWireFormatExtension) Descriptor() ([]byte, []int) {
 	return file_extensions_ext_ext_proto_rawDescGZIP(), []int{5}
 }
@@ -335,7 +335,7 @@ func (x *Message_M) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message_M.ProtoReflect.Type instead.
+// Deprecated: Use Message_M.ProtoReflect.Descriptor instead.
 func (*Message_M) Descriptor() ([]byte, []int) {
 	return file_extensions_ext_ext_proto_rawDescGZIP(), []int{0, 0}
 }
@@ -368,7 +368,7 @@ func (x *ExtendingMessage_ExtendingMessageSubmessage) ProtoReflect() protoreflec
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use ExtendingMessage_ExtendingMessageSubmessage.ProtoReflect.Type instead.
+// Deprecated: Use ExtendingMessage_ExtendingMessageSubmessage.ProtoReflect.Descriptor instead.
 func (*ExtendingMessage_ExtendingMessageSubmessage) Descriptor() ([]byte, []int) {
 	return file_extensions_ext_ext_proto_rawDescGZIP(), []int{2, 0}
 }

+ 1 - 1
cmd/protoc-gen-go/testdata/extensions/extra/extra.pb.go

@@ -46,7 +46,7 @@ func (x *ExtraMessage) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use ExtraMessage.ProtoReflect.Type instead.
+// Deprecated: Use ExtraMessage.ProtoReflect.Descriptor instead.
 func (*ExtraMessage) Descriptor() ([]byte, []int) {
 	return file_extensions_extra_extra_proto_rawDescGZIP(), []int{0}
 }

+ 2 - 2
cmd/protoc-gen-go/testdata/extensions/proto3/ext3.pb.go

@@ -56,7 +56,7 @@ func (x Enum) Number() protoreflect.EnumNumber {
 	return protoreflect.EnumNumber(x)
 }
 
-// Deprecated: Use Enum.Type instead.
+// Deprecated: Use Enum.Descriptor instead.
 func (Enum) EnumDescriptor() ([]byte, []int) {
 	return file_extensions_proto3_ext3_proto_rawDescGZIP(), []int{0}
 }
@@ -89,7 +89,7 @@ func (x *Message) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message.ProtoReflect.Type instead.
+// Deprecated: Use Message.ProtoReflect.Descriptor instead.
 func (*Message) Descriptor() ([]byte, []int) {
 	return file_extensions_proto3_ext3_proto_rawDescGZIP(), []int{0}
 }

+ 2 - 2
cmd/protoc-gen-go/testdata/fieldnames/fieldnames.pb.go

@@ -84,7 +84,7 @@ func (x *Message) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message.ProtoReflect.Type instead.
+// Deprecated: Use Message.ProtoReflect.Descriptor instead.
 func (*Message) Descriptor() ([]byte, []int) {
 	return file_fieldnames_fieldnames_proto_rawDescGZIP(), []int{0}
 }
@@ -300,7 +300,7 @@ func (x *Message_OneofMessageConflict) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message_OneofMessageConflict.ProtoReflect.Type instead.
+// Deprecated: Use Message_OneofMessageConflict.ProtoReflect.Descriptor instead.
 func (*Message_OneofMessageConflict) Descriptor() ([]byte, []int) {
 	return file_fieldnames_fieldnames_proto_rawDescGZIP(), []int{0, 0}
 }

+ 1 - 1
cmd/protoc-gen-go/testdata/import_public/a.pb.go

@@ -87,7 +87,7 @@ func (x *Public) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Public.ProtoReflect.Type instead.
+// Deprecated: Use Public.ProtoReflect.Descriptor instead.
 func (*Public) Descriptor() ([]byte, []int) {
 	return file_import_public_a_proto_rawDescGZIP(), []int{0}
 }

+ 1 - 1
cmd/protoc-gen-go/testdata/import_public/b.pb.go

@@ -48,7 +48,7 @@ func (x *Local) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Local.ProtoReflect.Type instead.
+// Deprecated: Use Local.ProtoReflect.Descriptor instead.
 func (*Local) Descriptor() ([]byte, []int) {
 	return file_import_public_b_proto_rawDescGZIP(), []int{0}
 }

+ 1 - 1
cmd/protoc-gen-go/testdata/import_public/c.pb.go

@@ -51,7 +51,7 @@ func (x *UsingPublicImport) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use UsingPublicImport.ProtoReflect.Type instead.
+// Deprecated: Use UsingPublicImport.ProtoReflect.Descriptor instead.
 func (*UsingPublicImport) Descriptor() ([]byte, []int) {
 	return file_import_public_c_proto_rawDescGZIP(), []int{0}
 }

+ 6 - 6
cmd/protoc-gen-go/testdata/import_public/sub/a.pb.go

@@ -71,7 +71,7 @@ func (x *E) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use E.Type instead.
+// Deprecated: Use E.Descriptor instead.
 func (E) EnumDescriptor() ([]byte, []int) {
 	return file_import_public_sub_a_proto_rawDescGZIP(), []int{0}
 }
@@ -122,7 +122,7 @@ func (x *M_Subenum) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use M_Subenum.Type instead.
+// Deprecated: Use M_Subenum.Descriptor instead.
 func (M_Subenum) EnumDescriptor() ([]byte, []int) {
 	return file_import_public_sub_a_proto_rawDescGZIP(), []int{0, 0}
 }
@@ -173,7 +173,7 @@ func (x *M_Submessage_Submessage_Subenum) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use M_Submessage_Submessage_Subenum.Type instead.
+// Deprecated: Use M_Submessage_Submessage_Subenum.Descriptor instead.
 func (M_Submessage_Submessage_Subenum) EnumDescriptor() ([]byte, []int) {
 	return file_import_public_sub_a_proto_rawDescGZIP(), []int{0, 0, 0}
 }
@@ -216,7 +216,7 @@ func (x *M) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use M.ProtoReflect.Type instead.
+// Deprecated: Use M.ProtoReflect.Descriptor instead.
 func (*M) Descriptor() ([]byte, []int) {
 	return file_import_public_sub_a_proto_rawDescGZIP(), []int{0}
 }
@@ -225,7 +225,7 @@ var extRange_M = []protoiface.ExtensionRangeV1{
 	{Start: 100, End: 536870911},
 }
 
-// Deprecated: Use M.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use M.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*M) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_M
 }
@@ -332,7 +332,7 @@ func (x *M_Submessage) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use M_Submessage.ProtoReflect.Type instead.
+// Deprecated: Use M_Submessage.ProtoReflect.Descriptor instead.
 func (*M_Submessage) Descriptor() ([]byte, []int) {
 	return file_import_public_sub_a_proto_rawDescGZIP(), []int{0, 0}
 }

+ 1 - 1
cmd/protoc-gen-go/testdata/import_public/sub/b.pb.go

@@ -45,7 +45,7 @@ func (x *M2) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use M2.ProtoReflect.Type instead.
+// Deprecated: Use M2.ProtoReflect.Descriptor instead.
 func (*M2) Descriptor() ([]byte, []int) {
 	return file_import_public_sub_b_proto_rawDescGZIP(), []int{0}
 }

+ 1 - 1
cmd/protoc-gen-go/testdata/import_public/sub2/a.pb.go

@@ -45,7 +45,7 @@ func (x *Sub2Message) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Sub2Message.ProtoReflect.Type instead.
+// Deprecated: Use Sub2Message.ProtoReflect.Descriptor instead.
 func (*Sub2Message) Descriptor() ([]byte, []int) {
 	return file_import_public_sub2_a_proto_rawDescGZIP(), []int{0}
 }

+ 1 - 1
cmd/protoc-gen-go/testdata/imports/fmt/m.pb.go

@@ -45,7 +45,7 @@ func (x *M) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use M.ProtoReflect.Type instead.
+// Deprecated: Use M.ProtoReflect.Descriptor instead.
 func (*M) Descriptor() ([]byte, []int) {
 	return file_imports_fmt_m_proto_rawDescGZIP(), []int{0}
 }

+ 3 - 3
cmd/protoc-gen-go/testdata/imports/test_a_1/m1.pb.go

@@ -54,7 +54,7 @@ func (x E1) Number() protoreflect.EnumNumber {
 	return protoreflect.EnumNumber(x)
 }
 
-// Deprecated: Use E1.Type instead.
+// Deprecated: Use E1.Descriptor instead.
 func (E1) EnumDescriptor() ([]byte, []int) {
 	return file_imports_test_a_1_m1_proto_rawDescGZIP(), []int{0}
 }
@@ -87,7 +87,7 @@ func (x *M1) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use M1.ProtoReflect.Type instead.
+// Deprecated: Use M1.ProtoReflect.Descriptor instead.
 func (*M1) Descriptor() ([]byte, []int) {
 	return file_imports_test_a_1_m1_proto_rawDescGZIP(), []int{0}
 }
@@ -121,7 +121,7 @@ func (x *M1_1) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use M1_1.ProtoReflect.Type instead.
+// Deprecated: Use M1_1.ProtoReflect.Descriptor instead.
 func (*M1_1) Descriptor() ([]byte, []int) {
 	return file_imports_test_a_1_m1_proto_rawDescGZIP(), []int{1}
 }

+ 1 - 1
cmd/protoc-gen-go/testdata/imports/test_a_1/m2.pb.go

@@ -45,7 +45,7 @@ func (x *M2) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use M2.ProtoReflect.Type instead.
+// Deprecated: Use M2.ProtoReflect.Descriptor instead.
 func (*M2) Descriptor() ([]byte, []int) {
 	return file_imports_test_a_1_m2_proto_rawDescGZIP(), []int{0}
 }

+ 1 - 1
cmd/protoc-gen-go/testdata/imports/test_a_2/m3.pb.go

@@ -45,7 +45,7 @@ func (x *M3) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use M3.ProtoReflect.Type instead.
+// Deprecated: Use M3.ProtoReflect.Descriptor instead.
 func (*M3) Descriptor() ([]byte, []int) {
 	return file_imports_test_a_2_m3_proto_rawDescGZIP(), []int{0}
 }

+ 1 - 1
cmd/protoc-gen-go/testdata/imports/test_a_2/m4.pb.go

@@ -45,7 +45,7 @@ func (x *M4) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use M4.ProtoReflect.Type instead.
+// Deprecated: Use M4.ProtoReflect.Descriptor instead.
 func (*M4) Descriptor() ([]byte, []int) {
 	return file_imports_test_a_2_m4_proto_rawDescGZIP(), []int{0}
 }

+ 1 - 1
cmd/protoc-gen-go/testdata/imports/test_b_1/m1.pb.go

@@ -45,7 +45,7 @@ func (x *M1) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use M1.ProtoReflect.Type instead.
+// Deprecated: Use M1.ProtoReflect.Descriptor instead.
 func (*M1) Descriptor() ([]byte, []int) {
 	return file_imports_test_b_1_m1_proto_rawDescGZIP(), []int{0}
 }

+ 1 - 1
cmd/protoc-gen-go/testdata/imports/test_b_1/m2.pb.go

@@ -45,7 +45,7 @@ func (x *M2) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use M2.ProtoReflect.Type instead.
+// Deprecated: Use M2.ProtoReflect.Descriptor instead.
 func (*M2) Descriptor() ([]byte, []int) {
 	return file_imports_test_b_1_m2_proto_rawDescGZIP(), []int{0}
 }

+ 1 - 1
cmd/protoc-gen-go/testdata/imports/test_import_a1m1.pb.go

@@ -47,7 +47,7 @@ func (x *A1M1) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use A1M1.ProtoReflect.Type instead.
+// Deprecated: Use A1M1.ProtoReflect.Descriptor instead.
 func (*A1M1) Descriptor() ([]byte, []int) {
 	return file_imports_test_import_a1m1_proto_rawDescGZIP(), []int{0}
 }

+ 1 - 1
cmd/protoc-gen-go/testdata/imports/test_import_a1m2.pb.go

@@ -47,7 +47,7 @@ func (x *A1M2) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use A1M2.ProtoReflect.Type instead.
+// Deprecated: Use A1M2.ProtoReflect.Descriptor instead.
 func (*A1M2) Descriptor() ([]byte, []int) {
 	return file_imports_test_import_a1m2_proto_rawDescGZIP(), []int{0}
 }

+ 1 - 1
cmd/protoc-gen-go/testdata/imports/test_import_all.pb.go

@@ -54,7 +54,7 @@ func (x *All) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use All.ProtoReflect.Type instead.
+// Deprecated: Use All.ProtoReflect.Descriptor instead.
 func (*All) Descriptor() ([]byte, []int) {
 	return file_imports_test_import_all_proto_rawDescGZIP(), []int{0}
 }

+ 1 - 1
cmd/protoc-gen-go/testdata/issue780_oneof_conflict/test.pb.go

@@ -48,7 +48,7 @@ func (x *Foo) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Foo.ProtoReflect.Type instead.
+// Deprecated: Use Foo.ProtoReflect.Descriptor instead.
 func (*Foo) Descriptor() ([]byte, []int) {
 	return file_issue780_oneof_conflict_test_proto_rawDescGZIP(), []int{0}
 }

+ 2 - 2
cmd/protoc-gen-go/testdata/nopackage/nopackage.pb.go

@@ -64,7 +64,7 @@ func (x *Enum) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum.Type instead.
+// Deprecated: Use Enum.Descriptor instead.
 func (Enum) EnumDescriptor() ([]byte, []int) {
 	return file_nopackage_nopackage_proto_rawDescGZIP(), []int{0}
 }
@@ -99,7 +99,7 @@ func (x *Message) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message.ProtoReflect.Type instead.
+// Deprecated: Use Message.ProtoReflect.Descriptor instead.
 func (*Message) Descriptor() ([]byte, []int) {
 	return file_nopackage_nopackage_proto_rawDescGZIP(), []int{0}
 }

+ 8 - 8
cmd/protoc-gen-go/testdata/proto2/enum.pb.go

@@ -70,7 +70,7 @@ func (x *EnumType1) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use EnumType1.Type instead.
+// Deprecated: Use EnumType1.Descriptor instead.
 func (EnumType1) EnumDescriptor() ([]byte, []int) {
 	return file_proto2_enum_proto_rawDescGZIP(), []int{0}
 }
@@ -124,7 +124,7 @@ func (x *EnumType2) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use EnumType2.Type instead.
+// Deprecated: Use EnumType2.Descriptor instead.
 func (EnumType2) EnumDescriptor() ([]byte, []int) {
 	return file_proto2_enum_proto_rawDescGZIP(), []int{1}
 }
@@ -177,7 +177,7 @@ func (x *EnumContainerMessage1_NestedEnumType1A) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use EnumContainerMessage1_NestedEnumType1A.Type instead.
+// Deprecated: Use EnumContainerMessage1_NestedEnumType1A.Descriptor instead.
 func (EnumContainerMessage1_NestedEnumType1A) EnumDescriptor() ([]byte, []int) {
 	return file_proto2_enum_proto_rawDescGZIP(), []int{0, 0}
 }
@@ -228,7 +228,7 @@ func (x *EnumContainerMessage1_NestedEnumType1B) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use EnumContainerMessage1_NestedEnumType1B.Type instead.
+// Deprecated: Use EnumContainerMessage1_NestedEnumType1B.Descriptor instead.
 func (EnumContainerMessage1_NestedEnumType1B) EnumDescriptor() ([]byte, []int) {
 	return file_proto2_enum_proto_rawDescGZIP(), []int{0, 1}
 }
@@ -281,7 +281,7 @@ func (x *EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2A) Unmarshal
 	return nil
 }
 
-// Deprecated: Use EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2A.Type instead.
+// Deprecated: Use EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2A.Descriptor instead.
 func (EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2A) EnumDescriptor() ([]byte, []int) {
 	return file_proto2_enum_proto_rawDescGZIP(), []int{0, 0, 0}
 }
@@ -332,7 +332,7 @@ func (x *EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2B) Unmarshal
 	return nil
 }
 
-// Deprecated: Use EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2B.Type instead.
+// Deprecated: Use EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2B.Descriptor instead.
 func (EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2B) EnumDescriptor() ([]byte, []int) {
 	return file_proto2_enum_proto_rawDescGZIP(), []int{0, 0, 1}
 }
@@ -367,7 +367,7 @@ func (x *EnumContainerMessage1) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use EnumContainerMessage1.ProtoReflect.Type instead.
+// Deprecated: Use EnumContainerMessage1.ProtoReflect.Descriptor instead.
 func (*EnumContainerMessage1) Descriptor() ([]byte, []int) {
 	return file_proto2_enum_proto_rawDescGZIP(), []int{0}
 }
@@ -417,7 +417,7 @@ func (x *EnumContainerMessage1_EnumContainerMessage2) ProtoReflect() protoreflec
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use EnumContainerMessage1_EnumContainerMessage2.ProtoReflect.Type instead.
+// Deprecated: Use EnumContainerMessage1_EnumContainerMessage2.ProtoReflect.Descriptor instead.
 func (*EnumContainerMessage1_EnumContainerMessage2) Descriptor() ([]byte, []int) {
 	return file_proto2_enum_proto_rawDescGZIP(), []int{0, 0}
 }

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

@@ -68,7 +68,7 @@ func (x *FieldTestMessage_Enum) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use FieldTestMessage_Enum.Type instead.
+// Deprecated: Use FieldTestMessage_Enum.Descriptor instead.
 func (FieldTestMessage_Enum) EnumDescriptor() ([]byte, []int) {
 	return file_proto2_fields_proto_rawDescGZIP(), []int{0, 0}
 }
@@ -207,7 +207,7 @@ func (x *FieldTestMessage) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use FieldTestMessage.ProtoReflect.Type instead.
+// Deprecated: Use FieldTestMessage.ProtoReflect.Descriptor instead.
 func (*FieldTestMessage) Descriptor() ([]byte, []int) {
 	return file_proto2_fields_proto_rawDescGZIP(), []int{0}
 }
@@ -1131,7 +1131,7 @@ func (x *FieldTestMessage_OptionalGroup) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use FieldTestMessage_OptionalGroup.ProtoReflect.Type instead.
+// Deprecated: Use FieldTestMessage_OptionalGroup.ProtoReflect.Descriptor instead.
 func (*FieldTestMessage_OptionalGroup) Descriptor() ([]byte, []int) {
 	return file_proto2_fields_proto_rawDescGZIP(), []int{0, 0}
 }
@@ -1172,7 +1172,7 @@ func (x *FieldTestMessage_RequiredGroup) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use FieldTestMessage_RequiredGroup.ProtoReflect.Type instead.
+// Deprecated: Use FieldTestMessage_RequiredGroup.ProtoReflect.Descriptor instead.
 func (*FieldTestMessage_RequiredGroup) Descriptor() ([]byte, []int) {
 	return file_proto2_fields_proto_rawDescGZIP(), []int{0, 1}
 }
@@ -1213,7 +1213,7 @@ func (x *FieldTestMessage_RepeatedGroup) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use FieldTestMessage_RepeatedGroup.ProtoReflect.Type instead.
+// Deprecated: Use FieldTestMessage_RepeatedGroup.ProtoReflect.Descriptor instead.
 func (*FieldTestMessage_RepeatedGroup) Descriptor() ([]byte, []int) {
 	return file_proto2_fields_proto_rawDescGZIP(), []int{0, 2}
 }
@@ -1254,7 +1254,7 @@ func (x *FieldTestMessage_OneofGroup) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use FieldTestMessage_OneofGroup.ProtoReflect.Type instead.
+// Deprecated: Use FieldTestMessage_OneofGroup.ProtoReflect.Descriptor instead.
 func (*FieldTestMessage_OneofGroup) Descriptor() ([]byte, []int) {
 	return file_proto2_fields_proto_rawDescGZIP(), []int{0, 6}
 }
@@ -1294,7 +1294,7 @@ func (x *FieldTestMessage_Message) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use FieldTestMessage_Message.ProtoReflect.Type instead.
+// Deprecated: Use FieldTestMessage_Message.ProtoReflect.Descriptor instead.
 func (*FieldTestMessage_Message) Descriptor() ([]byte, []int) {
 	return file_proto2_fields_proto_rawDescGZIP(), []int{0, 7}
 }

+ 3 - 3
cmd/protoc-gen-go/testdata/proto2/nested_messages.pb.go

@@ -47,7 +47,7 @@ func (x *Layer1) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Layer1.ProtoReflect.Type instead.
+// Deprecated: Use Layer1.ProtoReflect.Descriptor instead.
 func (*Layer1) Descriptor() ([]byte, []int) {
 	return file_proto2_nested_messages_proto_rawDescGZIP(), []int{0}
 }
@@ -95,7 +95,7 @@ func (x *Layer1_Layer2) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Layer1_Layer2.ProtoReflect.Type instead.
+// Deprecated: Use Layer1_Layer2.ProtoReflect.Descriptor instead.
 func (*Layer1_Layer2) Descriptor() ([]byte, []int) {
 	return file_proto2_nested_messages_proto_rawDescGZIP(), []int{0, 0}
 }
@@ -135,7 +135,7 @@ func (x *Layer1_Layer2_Layer3) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Layer1_Layer2_Layer3.ProtoReflect.Type instead.
+// Deprecated: Use Layer1_Layer2_Layer3.ProtoReflect.Descriptor instead.
 func (*Layer1_Layer2_Layer3) Descriptor() ([]byte, []int) {
 	return file_proto2_nested_messages_proto_rawDescGZIP(), []int{0, 0, 0}
 }

+ 1 - 1
cmd/protoc-gen-go/testdata/proto2/proto2.pb.go

@@ -47,7 +47,7 @@ func (x *Message) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message.ProtoReflect.Type instead.
+// Deprecated: Use Message.ProtoReflect.Descriptor instead.
 func (*Message) Descriptor() ([]byte, []int) {
 	return file_proto2_proto2_proto_rawDescGZIP(), []int{0}
 }

+ 1 - 1
cmd/protoc-gen-go/testdata/proto3/enum.pb.go

@@ -60,7 +60,7 @@ func (x Enum) Number() protoreflect.EnumNumber {
 	return protoreflect.EnumNumber(x)
 }
 
-// Deprecated: Use Enum.Type instead.
+// Deprecated: Use Enum.Descriptor instead.
 func (Enum) EnumDescriptor() ([]byte, []int) {
 	return file_proto3_enum_proto_rawDescGZIP(), []int{0}
 }

+ 3 - 3
cmd/protoc-gen-go/testdata/proto3/fields.pb.go

@@ -54,7 +54,7 @@ func (x FieldTestMessage_Enum) Number() protoreflect.EnumNumber {
 	return protoreflect.EnumNumber(x)
 }
 
-// Deprecated: Use FieldTestMessage_Enum.Type instead.
+// Deprecated: Use FieldTestMessage_Enum.Descriptor instead.
 func (FieldTestMessage_Enum) EnumDescriptor() ([]byte, []int) {
 	return file_proto3_fields_proto_rawDescGZIP(), []int{0, 0}
 }
@@ -124,7 +124,7 @@ func (x *FieldTestMessage) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use FieldTestMessage.ProtoReflect.Type instead.
+// Deprecated: Use FieldTestMessage.ProtoReflect.Descriptor instead.
 func (*FieldTestMessage) Descriptor() ([]byte, []int) {
 	return file_proto3_fields_proto_rawDescGZIP(), []int{0}
 }
@@ -416,7 +416,7 @@ func (x *FieldTestMessage_Message) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use FieldTestMessage_Message.ProtoReflect.Type instead.
+// Deprecated: Use FieldTestMessage_Message.ProtoReflect.Descriptor instead.
 func (*FieldTestMessage_Message) Descriptor() ([]byte, []int) {
 	return file_proto3_fields_proto_rawDescGZIP(), []int{0, 3}
 }

+ 24 - 24
encoding/testprotos/pb2/test.pb.go

@@ -78,7 +78,7 @@ func (x *Enum) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum.Type instead.
+// Deprecated: Use Enum.Descriptor instead.
 func (Enum) EnumDescriptor() ([]byte, []int) {
 	return file_pb2_test_proto_rawDescGZIP(), []int{0}
 }
@@ -135,7 +135,7 @@ func (x *Enums_NestedEnum) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enums_NestedEnum.Type instead.
+// Deprecated: Use Enums_NestedEnum.Descriptor instead.
 func (Enums_NestedEnum) EnumDescriptor() ([]byte, []int) {
 	return file_pb2_test_proto_rawDescGZIP(), []int{1, 0}
 }
@@ -184,7 +184,7 @@ func (x *Scalars) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Scalars.ProtoReflect.Type instead.
+// Deprecated: Use Scalars.ProtoReflect.Descriptor instead.
 func (*Scalars) Descriptor() ([]byte, []int) {
 	return file_pb2_test_proto_rawDescGZIP(), []int{0}
 }
@@ -327,7 +327,7 @@ func (x *Enums) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Enums.ProtoReflect.Type instead.
+// Deprecated: Use Enums.ProtoReflect.Descriptor instead.
 func (*Enums) Descriptor() ([]byte, []int) {
 	return file_pb2_test_proto_rawDescGZIP(), []int{1}
 }
@@ -398,7 +398,7 @@ func (x *Repeats) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Repeats.ProtoReflect.Type instead.
+// Deprecated: Use Repeats.ProtoReflect.Descriptor instead.
 func (*Repeats) Descriptor() ([]byte, []int) {
 	return file_pb2_test_proto_rawDescGZIP(), []int{2}
 }
@@ -497,7 +497,7 @@ func (x *Nested) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Nested.ProtoReflect.Type instead.
+// Deprecated: Use Nested.ProtoReflect.Descriptor instead.
 func (*Nested) Descriptor() ([]byte, []int) {
 	return file_pb2_test_proto_rawDescGZIP(), []int{3}
 }
@@ -549,7 +549,7 @@ func (x *Nests) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Nests.ProtoReflect.Type instead.
+// Deprecated: Use Nests.ProtoReflect.Descriptor instead.
 func (*Nests) Descriptor() ([]byte, []int) {
 	return file_pb2_test_proto_rawDescGZIP(), []int{4}
 }
@@ -617,7 +617,7 @@ func (x *Requireds) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Requireds.ProtoReflect.Type instead.
+// Deprecated: Use Requireds.ProtoReflect.Descriptor instead.
 func (*Requireds) Descriptor() ([]byte, []int) {
 	return file_pb2_test_proto_rawDescGZIP(), []int{5}
 }
@@ -695,7 +695,7 @@ func (x *PartialRequired) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use PartialRequired.ProtoReflect.Type instead.
+// Deprecated: Use PartialRequired.ProtoReflect.Descriptor instead.
 func (*PartialRequired) Descriptor() ([]byte, []int) {
 	return file_pb2_test_proto_rawDescGZIP(), []int{6}
 }
@@ -743,7 +743,7 @@ func (x *NestedWithRequired) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use NestedWithRequired.ProtoReflect.Type instead.
+// Deprecated: Use NestedWithRequired.ProtoReflect.Descriptor instead.
 func (*NestedWithRequired) Descriptor() ([]byte, []int) {
 	return file_pb2_test_proto_rawDescGZIP(), []int{7}
 }
@@ -789,7 +789,7 @@ func (x *IndirectRequired) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use IndirectRequired.ProtoReflect.Type instead.
+// Deprecated: Use IndirectRequired.ProtoReflect.Descriptor instead.
 func (*IndirectRequired) Descriptor() ([]byte, []int) {
 	return file_pb2_test_proto_rawDescGZIP(), []int{8}
 }
@@ -871,7 +871,7 @@ func (x *Extensions) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Extensions.ProtoReflect.Type instead.
+// Deprecated: Use Extensions.ProtoReflect.Descriptor instead.
 func (*Extensions) Descriptor() ([]byte, []int) {
 	return file_pb2_test_proto_rawDescGZIP(), []int{9}
 }
@@ -880,7 +880,7 @@ var extRange_Extensions = []protoiface.ExtensionRangeV1{
 	{Start: 20, End: 100},
 }
 
-// Deprecated: Use Extensions.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use Extensions.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*Extensions) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_Extensions
 }
@@ -934,7 +934,7 @@ func (x *ExtensionsContainer) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use ExtensionsContainer.ProtoReflect.Type instead.
+// Deprecated: Use ExtensionsContainer.ProtoReflect.Descriptor instead.
 func (*ExtensionsContainer) Descriptor() ([]byte, []int) {
 	return file_pb2_test_proto_rawDescGZIP(), []int{10}
 }
@@ -968,7 +968,7 @@ func (x *MessageSet) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use MessageSet.ProtoReflect.Type instead.
+// Deprecated: Use MessageSet.ProtoReflect.Descriptor instead.
 func (*MessageSet) Descriptor() ([]byte, []int) {
 	return file_pb2_test_proto_rawDescGZIP(), []int{11}
 }
@@ -977,7 +977,7 @@ var extRange_MessageSet = []protoiface.ExtensionRangeV1{
 	{Start: 4, End: 2147483646},
 }
 
-// Deprecated: Use MessageSet.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use MessageSet.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*MessageSet) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_MessageSet
 }
@@ -1011,7 +1011,7 @@ func (x *MessageSetExtension) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use MessageSetExtension.ProtoReflect.Type instead.
+// Deprecated: Use MessageSetExtension.ProtoReflect.Descriptor instead.
 func (*MessageSetExtension) Descriptor() ([]byte, []int) {
 	return file_pb2_test_proto_rawDescGZIP(), []int{12}
 }
@@ -1052,7 +1052,7 @@ func (x *FakeMessageSet) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use FakeMessageSet.ProtoReflect.Type instead.
+// Deprecated: Use FakeMessageSet.ProtoReflect.Descriptor instead.
 func (*FakeMessageSet) Descriptor() ([]byte, []int) {
 	return file_pb2_test_proto_rawDescGZIP(), []int{13}
 }
@@ -1061,7 +1061,7 @@ var extRange_FakeMessageSet = []protoiface.ExtensionRangeV1{
 	{Start: 4, End: 536870911},
 }
 
-// Deprecated: Use FakeMessageSet.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use FakeMessageSet.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*FakeMessageSet) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_FakeMessageSet
 }
@@ -1095,7 +1095,7 @@ func (x *FakeMessageSetExtension) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use FakeMessageSetExtension.ProtoReflect.Type instead.
+// Deprecated: Use FakeMessageSetExtension.ProtoReflect.Descriptor instead.
 func (*FakeMessageSetExtension) Descriptor() ([]byte, []int) {
 	return file_pb2_test_proto_rawDescGZIP(), []int{14}
 }
@@ -1154,7 +1154,7 @@ func (x *KnownTypes) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use KnownTypes.ProtoReflect.Type instead.
+// Deprecated: Use KnownTypes.ProtoReflect.Descriptor instead.
 func (*KnownTypes) Descriptor() ([]byte, []int) {
 	return file_pb2_test_proto_rawDescGZIP(), []int{15}
 }
@@ -1316,7 +1316,7 @@ func (x *Nests_OptGroup) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Nests_OptGroup.ProtoReflect.Type instead.
+// Deprecated: Use Nests_OptGroup.ProtoReflect.Descriptor instead.
 func (*Nests_OptGroup) Descriptor() ([]byte, []int) {
 	return file_pb2_test_proto_rawDescGZIP(), []int{4, 0}
 }
@@ -1371,7 +1371,7 @@ func (x *Nests_RptGroup) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Nests_RptGroup.ProtoReflect.Type instead.
+// Deprecated: Use Nests_RptGroup.ProtoReflect.Descriptor instead.
 func (*Nests_RptGroup) Descriptor() ([]byte, []int) {
 	return file_pb2_test_proto_rawDescGZIP(), []int{4, 1}
 }
@@ -1412,7 +1412,7 @@ func (x *Nests_OptGroup_OptNestedGroup) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Nests_OptGroup_OptNestedGroup.ProtoReflect.Type instead.
+// Deprecated: Use Nests_OptGroup_OptNestedGroup.ProtoReflect.Descriptor instead.
 func (*Nests_OptGroup_OptNestedGroup) Descriptor() ([]byte, []int) {
 	return file_pb2_test_proto_rawDescGZIP(), []int{4, 0, 0}
 }

+ 9 - 9
encoding/testprotos/pb3/test.pb.go

@@ -63,7 +63,7 @@ func (x Enum) Number() protoreflect.EnumNumber {
 	return protoreflect.EnumNumber(x)
 }
 
-// Deprecated: Use Enum.Type instead.
+// Deprecated: Use Enum.Descriptor instead.
 func (Enum) EnumDescriptor() ([]byte, []int) {
 	return file_pb3_test_proto_rawDescGZIP(), []int{0}
 }
@@ -113,7 +113,7 @@ func (x Enums_NestedEnum) Number() protoreflect.EnumNumber {
 	return protoreflect.EnumNumber(x)
 }
 
-// Deprecated: Use Enums_NestedEnum.Type instead.
+// Deprecated: Use Enums_NestedEnum.Descriptor instead.
 func (Enums_NestedEnum) EnumDescriptor() ([]byte, []int) {
 	return file_pb3_test_proto_rawDescGZIP(), []int{1, 0}
 }
@@ -162,7 +162,7 @@ func (x *Scalars) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Scalars.ProtoReflect.Type instead.
+// Deprecated: Use Scalars.ProtoReflect.Descriptor instead.
 func (*Scalars) Descriptor() ([]byte, []int) {
 	return file_pb3_test_proto_rawDescGZIP(), []int{0}
 }
@@ -303,7 +303,7 @@ func (x *Enums) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Enums.ProtoReflect.Type instead.
+// Deprecated: Use Enums.ProtoReflect.Descriptor instead.
 func (*Enums) Descriptor() ([]byte, []int) {
 	return file_pb3_test_proto_rawDescGZIP(), []int{1}
 }
@@ -352,7 +352,7 @@ func (x *Nests) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Nests.ProtoReflect.Type instead.
+// Deprecated: Use Nests.ProtoReflect.Descriptor instead.
 func (*Nests) Descriptor() ([]byte, []int) {
 	return file_pb3_test_proto_rawDescGZIP(), []int{2}
 }
@@ -395,7 +395,7 @@ func (x *Nested) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Nested.ProtoReflect.Type instead.
+// Deprecated: Use Nested.ProtoReflect.Descriptor instead.
 func (*Nested) Descriptor() ([]byte, []int) {
 	return file_pb3_test_proto_rawDescGZIP(), []int{3}
 }
@@ -448,7 +448,7 @@ func (x *Oneofs) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Oneofs.ProtoReflect.Type instead.
+// Deprecated: Use Oneofs.ProtoReflect.Descriptor instead.
 func (*Oneofs) Descriptor() ([]byte, []int) {
 	return file_pb3_test_proto_rawDescGZIP(), []int{4}
 }
@@ -537,7 +537,7 @@ func (x *Maps) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Maps.ProtoReflect.Type instead.
+// Deprecated: Use Maps.ProtoReflect.Descriptor instead.
 func (*Maps) Descriptor() ([]byte, []int) {
 	return file_pb3_test_proto_rawDescGZIP(), []int{5}
 }
@@ -607,7 +607,7 @@ func (x *JSONNames) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use JSONNames.ProtoReflect.Type instead.
+// Deprecated: Use JSONNames.ProtoReflect.Descriptor instead.
 func (*JSONNames) Descriptor() ([]byte, []int) {
 	return file_pb3_test_proto_rawDescGZIP(), []int{6}
 }

+ 1 - 1
internal/testprotos/benchmarks/benchmarks.pb.go

@@ -70,7 +70,7 @@ func (x *BenchmarkDataset) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use BenchmarkDataset.ProtoReflect.Type instead.
+// Deprecated: Use BenchmarkDataset.ProtoReflect.Descriptor instead.
 func (*BenchmarkDataset) Descriptor() ([]byte, []int) {
 	return file_benchmarks_proto_rawDescGZIP(), []int{0}
 }

+ 2 - 2
internal/testprotos/benchmarks/datasets/google_message1/proto2/benchmark_message1_proto2.pb.go

@@ -86,7 +86,7 @@ func (x *GoogleMessage1) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use GoogleMessage1.ProtoReflect.Type instead.
+// Deprecated: Use GoogleMessage1.ProtoReflect.Descriptor instead.
 func (*GoogleMessage1) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message1_proto2_benchmark_message1_proto2_proto_rawDescGZIP(), []int{0}
 }
@@ -451,7 +451,7 @@ func (x *GoogleMessage1SubMessage) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use GoogleMessage1SubMessage.ProtoReflect.Type instead.
+// Deprecated: Use GoogleMessage1SubMessage.ProtoReflect.Descriptor instead.
 func (*GoogleMessage1SubMessage) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message1_proto2_benchmark_message1_proto2_proto_rawDescGZIP(), []int{1}
 }

+ 2 - 2
internal/testprotos/benchmarks/datasets/google_message1/proto3/benchmark_message1_proto3.pb.go

@@ -86,7 +86,7 @@ func (x *GoogleMessage1) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use GoogleMessage1.ProtoReflect.Type instead.
+// Deprecated: Use GoogleMessage1.ProtoReflect.Descriptor instead.
 func (*GoogleMessage1) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message1_proto3_benchmark_message1_proto3_proto_rawDescGZIP(), []int{0}
 }
@@ -426,7 +426,7 @@ func (x *GoogleMessage1SubMessage) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use GoogleMessage1SubMessage.ProtoReflect.Type instead.
+// Deprecated: Use GoogleMessage1SubMessage.ProtoReflect.Descriptor instead.
 func (*GoogleMessage1SubMessage) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message1_proto3_benchmark_message1_proto3_proto_rawDescGZIP(), []int{1}
 }

+ 3 - 3
internal/testprotos/benchmarks/datasets/google_message2/benchmark_message2.pb.go

@@ -75,7 +75,7 @@ func (x *GoogleMessage2) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use GoogleMessage2.ProtoReflect.Type instead.
+// Deprecated: Use GoogleMessage2.ProtoReflect.Descriptor instead.
 func (*GoogleMessage2) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message2_benchmark_message2_proto_rawDescGZIP(), []int{0}
 }
@@ -345,7 +345,7 @@ func (x *GoogleMessage2GroupedMessage) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use GoogleMessage2GroupedMessage.ProtoReflect.Type instead.
+// Deprecated: Use GoogleMessage2GroupedMessage.ProtoReflect.Descriptor instead.
 func (*GoogleMessage2GroupedMessage) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message2_benchmark_message2_proto_rawDescGZIP(), []int{1}
 }
@@ -475,7 +475,7 @@ func (x *GoogleMessage2_Group1) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use GoogleMessage2_Group1.ProtoReflect.Type instead.
+// Deprecated: Use GoogleMessage2_Group1.ProtoReflect.Descriptor instead.
 func (*GoogleMessage2_Group1) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message2_benchmark_message2_proto_rawDescGZIP(), []int{0, 0}
 }

+ 34 - 34
internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3.pb.go

@@ -61,7 +61,7 @@ func (x *GoogleMessage3) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use GoogleMessage3.ProtoReflect.Type instead.
+// Deprecated: Use GoogleMessage3.ProtoReflect.Descriptor instead.
 func (*GoogleMessage3) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{0}
 }
@@ -203,7 +203,7 @@ func (x *Message1327) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message1327.ProtoReflect.Type instead.
+// Deprecated: Use Message1327.ProtoReflect.Descriptor instead.
 func (*Message1327) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{1}
 }
@@ -274,7 +274,7 @@ func (x *Message3672) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3672.ProtoReflect.Type instead.
+// Deprecated: Use Message3672.ProtoReflect.Descriptor instead.
 func (*Message3672) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{2}
 }
@@ -384,7 +384,7 @@ func (x *Message3804) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3804.ProtoReflect.Type instead.
+// Deprecated: Use Message3804.ProtoReflect.Descriptor instead.
 func (*Message3804) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{3}
 }
@@ -467,7 +467,7 @@ func (x *Message6849) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6849.ProtoReflect.Type instead.
+// Deprecated: Use Message6849.ProtoReflect.Descriptor instead.
 func (*Message6849) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{4}
 }
@@ -508,7 +508,7 @@ func (x *Message6866) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6866.ProtoReflect.Type instead.
+// Deprecated: Use Message6866.ProtoReflect.Descriptor instead.
 func (*Message6866) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{5}
 }
@@ -549,7 +549,7 @@ func (x *Message6870) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6870.ProtoReflect.Type instead.
+// Deprecated: Use Message6870.ProtoReflect.Descriptor instead.
 func (*Message6870) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{6}
 }
@@ -634,7 +634,7 @@ func (x *Message7651) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7651.ProtoReflect.Type instead.
+// Deprecated: Use Message7651.ProtoReflect.Descriptor instead.
 func (*Message7651) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{7}
 }
@@ -988,7 +988,7 @@ func (x *Message7864) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7864.ProtoReflect.Type instead.
+// Deprecated: Use Message7864.ProtoReflect.Descriptor instead.
 func (*Message7864) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{8}
 }
@@ -1083,7 +1083,7 @@ func (x *Message7929) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7929.ProtoReflect.Type instead.
+// Deprecated: Use Message7929.ProtoReflect.Descriptor instead.
 func (*Message7929) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{9}
 }
@@ -1273,7 +1273,7 @@ func (x *Message8508) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8508.ProtoReflect.Type instead.
+// Deprecated: Use Message8508.ProtoReflect.Descriptor instead.
 func (*Message8508) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{10}
 }
@@ -1427,7 +1427,7 @@ func (x *Message9122) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message9122.ProtoReflect.Type instead.
+// Deprecated: Use Message9122.ProtoReflect.Descriptor instead.
 func (*Message9122) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{11}
 }
@@ -1475,7 +1475,7 @@ func (x *Message10177) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10177.ProtoReflect.Type instead.
+// Deprecated: Use Message10177.ProtoReflect.Descriptor instead.
 func (*Message10177) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{12}
 }
@@ -1518,7 +1518,7 @@ func (x *Message10278) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10278.ProtoReflect.Type instead.
+// Deprecated: Use Message10278.ProtoReflect.Descriptor instead.
 func (*Message10278) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{13}
 }
@@ -1573,7 +1573,7 @@ func (x *Message10323) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10323.ProtoReflect.Type instead.
+// Deprecated: Use Message10323.ProtoReflect.Descriptor instead.
 func (*Message10323) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{14}
 }
@@ -1615,7 +1615,7 @@ func (x *Message10324) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10324.ProtoReflect.Type instead.
+// Deprecated: Use Message10324.ProtoReflect.Descriptor instead.
 func (*Message10324) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{15}
 }
@@ -1663,7 +1663,7 @@ func (x *Message11990) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message11990.ProtoReflect.Type instead.
+// Deprecated: Use Message11990.ProtoReflect.Descriptor instead.
 func (*Message11990) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{16}
 }
@@ -1706,7 +1706,7 @@ func (x *Message12691) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12691.ProtoReflect.Type instead.
+// Deprecated: Use Message12691.ProtoReflect.Descriptor instead.
 func (*Message12691) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{17}
 }
@@ -1780,7 +1780,7 @@ func (x *Message12870) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12870.ProtoReflect.Type instead.
+// Deprecated: Use Message12870.ProtoReflect.Descriptor instead.
 func (*Message12870) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{18}
 }
@@ -1955,7 +1955,7 @@ func (x *Message13154) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message13154.ProtoReflect.Type instead.
+// Deprecated: Use Message13154.ProtoReflect.Descriptor instead.
 func (*Message13154) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{19}
 }
@@ -2035,7 +2035,7 @@ func (x *Message16507) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message16507.ProtoReflect.Type instead.
+// Deprecated: Use Message16507.ProtoReflect.Descriptor instead.
 func (*Message16507) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{20}
 }
@@ -2044,7 +2044,7 @@ var extRange_Message16507 = []protoiface.ExtensionRangeV1{
 	{Start: 21, End: 21},
 }
 
-// Deprecated: Use Message16507.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use Message16507.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*Message16507) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_Message16507
 }
@@ -2302,7 +2302,7 @@ func (x *Message16564) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message16564.ProtoReflect.Type instead.
+// Deprecated: Use Message16564.ProtoReflect.Descriptor instead.
 func (*Message16564) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{21}
 }
@@ -2344,7 +2344,7 @@ func (x *Message16661) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message16661.ProtoReflect.Type instead.
+// Deprecated: Use Message16661.ProtoReflect.Descriptor instead.
 func (*Message16661) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{22}
 }
@@ -2395,7 +2395,7 @@ func (x *Message16746) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message16746.ProtoReflect.Type instead.
+// Deprecated: Use Message16746.ProtoReflect.Descriptor instead.
 func (*Message16746) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{23}
 }
@@ -2458,7 +2458,7 @@ func (x *Message17786) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message17786.ProtoReflect.Type instead.
+// Deprecated: Use Message17786.ProtoReflect.Descriptor instead.
 func (*Message17786) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{24}
 }
@@ -2506,7 +2506,7 @@ func (x *Message22857) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message22857.ProtoReflect.Type instead.
+// Deprecated: Use Message22857.ProtoReflect.Descriptor instead.
 func (*Message22857) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{25}
 }
@@ -2548,7 +2548,7 @@ func (x *Message24404) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message24404.ProtoReflect.Type instead.
+// Deprecated: Use Message24404.ProtoReflect.Descriptor instead.
 func (*Message24404) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{26}
 }
@@ -2597,7 +2597,7 @@ func (x *Message27300) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message27300.ProtoReflect.Type instead.
+// Deprecated: Use Message27300.ProtoReflect.Descriptor instead.
 func (*Message27300) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{27}
 }
@@ -2667,7 +2667,7 @@ func (x *Message27453) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message27453.ProtoReflect.Type instead.
+// Deprecated: Use Message27453.ProtoReflect.Descriptor instead.
 func (*Message27453) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{28}
 }
@@ -2863,7 +2863,7 @@ func (x *Message3672_Message3673) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3672_Message3673.ProtoReflect.Type instead.
+// Deprecated: Use Message3672_Message3673.ProtoReflect.Descriptor instead.
 func (*Message3672_Message3673) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{2, 0}
 }
@@ -2912,7 +2912,7 @@ func (x *Message3672_Message3674) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3672_Message3674.ProtoReflect.Type instead.
+// Deprecated: Use Message3672_Message3674.ProtoReflect.Descriptor instead.
 func (*Message3672_Message3674) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{2, 1}
 }
@@ -2985,7 +2985,7 @@ func (x *Message17786_Message17787) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message17786_Message17787.ProtoReflect.Type instead.
+// Deprecated: Use Message17786_Message17787.ProtoReflect.Descriptor instead.
 func (*Message17786_Message17787) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{24, 0}
 }
@@ -3231,7 +3231,7 @@ func (x *Message24404_Message24405) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message24404_Message24405.ProtoReflect.Type instead.
+// Deprecated: Use Message24404_Message24405.ProtoReflect.Descriptor instead.
 func (*Message24404_Message24405) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{26, 0}
 }

+ 61 - 61
internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_1.pb.go

@@ -47,7 +47,7 @@ func (x *Message34390) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message34390.ProtoReflect.Type instead.
+// Deprecated: Use Message34390.ProtoReflect.Descriptor instead.
 func (*Message34390) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{0}
 }
@@ -89,7 +89,7 @@ func (x *Message34624) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message34624.ProtoReflect.Type instead.
+// Deprecated: Use Message34624.ProtoReflect.Descriptor instead.
 func (*Message34624) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{1}
 }
@@ -150,7 +150,7 @@ func (x *Message34791) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message34791.ProtoReflect.Type instead.
+// Deprecated: Use Message34791.ProtoReflect.Descriptor instead.
 func (*Message34791) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{2}
 }
@@ -287,7 +287,7 @@ func (x *Message35483) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message35483.ProtoReflect.Type instead.
+// Deprecated: Use Message35483.ProtoReflect.Descriptor instead.
 func (*Message35483) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{3}
 }
@@ -370,7 +370,7 @@ func (x *Message35807) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message35807.ProtoReflect.Type instead.
+// Deprecated: Use Message35807.ProtoReflect.Descriptor instead.
 func (*Message35807) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{4}
 }
@@ -461,7 +461,7 @@ func (x *Message37487) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message37487.ProtoReflect.Type instead.
+// Deprecated: Use Message37487.ProtoReflect.Descriptor instead.
 func (*Message37487) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{5}
 }
@@ -513,7 +513,7 @@ func (x *Message13062) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message13062.ProtoReflect.Type instead.
+// Deprecated: Use Message13062.ProtoReflect.Descriptor instead.
 func (*Message13062) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{6}
 }
@@ -582,7 +582,7 @@ func (x *Message952) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message952.ProtoReflect.Type instead.
+// Deprecated: Use Message952.ProtoReflect.Descriptor instead.
 func (*Message952) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{7}
 }
@@ -685,7 +685,7 @@ func (x *Message36876) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message36876.ProtoReflect.Type instead.
+// Deprecated: Use Message36876.ProtoReflect.Descriptor instead.
 func (*Message36876) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{8}
 }
@@ -1159,7 +1159,7 @@ func (x *Message1328) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message1328.ProtoReflect.Type instead.
+// Deprecated: Use Message1328.ProtoReflect.Descriptor instead.
 func (*Message1328) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{9}
 }
@@ -1192,7 +1192,7 @@ func (x *Message6850) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6850.ProtoReflect.Type instead.
+// Deprecated: Use Message6850.ProtoReflect.Descriptor instead.
 func (*Message6850) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{10}
 }
@@ -1258,7 +1258,7 @@ func (x *Message6863) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6863.ProtoReflect.Type instead.
+// Deprecated: Use Message6863.ProtoReflect.Descriptor instead.
 func (*Message6863) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{11}
 }
@@ -1522,7 +1522,7 @@ func (x *Message6871) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6871.ProtoReflect.Type instead.
+// Deprecated: Use Message6871.ProtoReflect.Descriptor instead.
 func (*Message6871) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{12}
 }
@@ -1557,7 +1557,7 @@ func (x *Message7547) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7547.ProtoReflect.Type instead.
+// Deprecated: Use Message7547.ProtoReflect.Descriptor instead.
 func (*Message7547) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{13}
 }
@@ -1616,7 +1616,7 @@ func (x *Message7648) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7648.ProtoReflect.Type instead.
+// Deprecated: Use Message7648.ProtoReflect.Descriptor instead.
 func (*Message7648) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{14}
 }
@@ -1733,7 +1733,7 @@ func (x *Message7865) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7865.ProtoReflect.Type instead.
+// Deprecated: Use Message7865.ProtoReflect.Descriptor instead.
 func (*Message7865) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{15}
 }
@@ -1768,7 +1768,7 @@ func (x *Message7928) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7928.ProtoReflect.Type instead.
+// Deprecated: Use Message7928.ProtoReflect.Descriptor instead.
 func (*Message7928) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{16}
 }
@@ -1818,7 +1818,7 @@ func (x *Message7919) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7919.ProtoReflect.Type instead.
+// Deprecated: Use Message7919.ProtoReflect.Descriptor instead.
 func (*Message7919) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{17}
 }
@@ -1874,7 +1874,7 @@ func (x *Message7920) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7920.ProtoReflect.Type instead.
+// Deprecated: Use Message7920.ProtoReflect.Descriptor instead.
 func (*Message7920) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{18}
 }
@@ -1925,7 +1925,7 @@ func (x *Message7921) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7921.ProtoReflect.Type instead.
+// Deprecated: Use Message7921.ProtoReflect.Descriptor instead.
 func (*Message7921) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{19}
 }
@@ -1991,7 +1991,7 @@ func (x *Message8511) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8511.ProtoReflect.Type instead.
+// Deprecated: Use Message8511.ProtoReflect.Descriptor instead.
 func (*Message8511) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{20}
 }
@@ -2065,7 +2065,7 @@ func (x *Message8512) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8512.ProtoReflect.Type instead.
+// Deprecated: Use Message8512.ProtoReflect.Descriptor instead.
 func (*Message8512) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{21}
 }
@@ -2144,7 +2144,7 @@ func (x *Message8513) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8513.ProtoReflect.Type instead.
+// Deprecated: Use Message8513.ProtoReflect.Descriptor instead.
 func (*Message8513) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{22}
 }
@@ -2210,7 +2210,7 @@ func (x *Message8514) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8514.ProtoReflect.Type instead.
+// Deprecated: Use Message8514.ProtoReflect.Descriptor instead.
 func (*Message8514) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{23}
 }
@@ -2281,7 +2281,7 @@ func (x *Message8515) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8515.ProtoReflect.Type instead.
+// Deprecated: Use Message8515.ProtoReflect.Descriptor instead.
 func (*Message8515) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{24}
 }
@@ -2342,7 +2342,7 @@ func (x *Message10320) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10320.ProtoReflect.Type instead.
+// Deprecated: Use Message10320.ProtoReflect.Descriptor instead.
 func (*Message10320) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{25}
 }
@@ -2427,7 +2427,7 @@ func (x *Message10321) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10321.ProtoReflect.Type instead.
+// Deprecated: Use Message10321.ProtoReflect.Descriptor instead.
 func (*Message10321) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{26}
 }
@@ -2484,7 +2484,7 @@ func (x *Message10322) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10322.ProtoReflect.Type instead.
+// Deprecated: Use Message10322.ProtoReflect.Descriptor instead.
 func (*Message10322) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{27}
 }
@@ -2542,7 +2542,7 @@ func (x *Message11988) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message11988.ProtoReflect.Type instead.
+// Deprecated: Use Message11988.ProtoReflect.Descriptor instead.
 func (*Message11988) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{28}
 }
@@ -2607,7 +2607,7 @@ func (x *Message12668) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12668.ProtoReflect.Type instead.
+// Deprecated: Use Message12668.ProtoReflect.Descriptor instead.
 func (*Message12668) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{29}
 }
@@ -2675,7 +2675,7 @@ func (x *Message12825) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12825.ProtoReflect.Type instead.
+// Deprecated: Use Message12825.ProtoReflect.Descriptor instead.
 func (*Message12825) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{30}
 }
@@ -2760,7 +2760,7 @@ func (x *Message16478) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message16478.ProtoReflect.Type instead.
+// Deprecated: Use Message16478.ProtoReflect.Descriptor instead.
 func (*Message16478) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{31}
 }
@@ -2817,7 +2817,7 @@ func (x *Message16552) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message16552.ProtoReflect.Type instead.
+// Deprecated: Use Message16552.ProtoReflect.Descriptor instead.
 func (*Message16552) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{32}
 }
@@ -2874,7 +2874,7 @@ func (x *Message16660) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message16660.ProtoReflect.Type instead.
+// Deprecated: Use Message16660.ProtoReflect.Descriptor instead.
 func (*Message16660) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{33}
 }
@@ -2953,7 +2953,7 @@ func (x *Message16727) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message16727.ProtoReflect.Type instead.
+// Deprecated: Use Message16727.ProtoReflect.Descriptor instead.
 func (*Message16727) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{34}
 }
@@ -2962,7 +2962,7 @@ var extRange_Message16727 = []protoiface.ExtensionRangeV1{
 	{Start: 1000, End: 536870911},
 }
 
-// Deprecated: Use Message16727.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use Message16727.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*Message16727) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_Message16727
 }
@@ -3165,7 +3165,7 @@ func (x *Message16725) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message16725.ProtoReflect.Type instead.
+// Deprecated: Use Message16725.ProtoReflect.Descriptor instead.
 func (*Message16725) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{35}
 }
@@ -3234,7 +3234,7 @@ func (x *Message17726) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message17726.ProtoReflect.Type instead.
+// Deprecated: Use Message17726.ProtoReflect.Descriptor instead.
 func (*Message17726) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{36}
 }
@@ -3423,7 +3423,7 @@ func (x *Message17782) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message17782.ProtoReflect.Type instead.
+// Deprecated: Use Message17782.ProtoReflect.Descriptor instead.
 func (*Message17782) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{37}
 }
@@ -3476,7 +3476,7 @@ func (x *Message17783) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message17783.ProtoReflect.Type instead.
+// Deprecated: Use Message17783.ProtoReflect.Descriptor instead.
 func (*Message17783) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{38}
 }
@@ -3631,7 +3631,7 @@ func (x *Message16945) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message16945.ProtoReflect.Type instead.
+// Deprecated: Use Message16945.ProtoReflect.Descriptor instead.
 func (*Message16945) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{39}
 }
@@ -4336,7 +4336,7 @@ var extRange_Message16945 = []protoiface.ExtensionRangeV1{
 	{Start: 1085, End: 1085},
 }
 
-// Deprecated: Use Message16945.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use Message16945.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*Message16945) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_Message16945
 }
@@ -4924,7 +4924,7 @@ func (x *Message34791_Message34792) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message34791_Message34792.ProtoReflect.Type instead.
+// Deprecated: Use Message34791_Message34792.ProtoReflect.Descriptor instead.
 func (*Message34791_Message34792) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{2, 0}
 }
@@ -4976,7 +4976,7 @@ func (x *Message36876_Message36877) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message36876_Message36877.ProtoReflect.Type instead.
+// Deprecated: Use Message36876_Message36877.ProtoReflect.Descriptor instead.
 func (*Message36876_Message36877) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{8, 0}
 }
@@ -5044,7 +5044,7 @@ func (x *Message36876_Message36878) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message36876_Message36878.ProtoReflect.Type instead.
+// Deprecated: Use Message36876_Message36878.ProtoReflect.Descriptor instead.
 func (*Message36876_Message36878) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{8, 1}
 }
@@ -5079,7 +5079,7 @@ func (x *Message36876_Message36879) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message36876_Message36879.ProtoReflect.Type instead.
+// Deprecated: Use Message36876_Message36879.ProtoReflect.Descriptor instead.
 func (*Message36876_Message36879) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{8, 2}
 }
@@ -5126,7 +5126,7 @@ func (x *Message36876_Message36880) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message36876_Message36880.ProtoReflect.Type instead.
+// Deprecated: Use Message36876_Message36880.ProtoReflect.Descriptor instead.
 func (*Message36876_Message36880) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{8, 3}
 }
@@ -5159,7 +5159,7 @@ func (x *Message36876_Message36881) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message36876_Message36881.ProtoReflect.Type instead.
+// Deprecated: Use Message36876_Message36881.ProtoReflect.Descriptor instead.
 func (*Message36876_Message36881) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{8, 4}
 }
@@ -5192,7 +5192,7 @@ func (x *Message36876_Message36882) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message36876_Message36882.ProtoReflect.Type instead.
+// Deprecated: Use Message36876_Message36882.ProtoReflect.Descriptor instead.
 func (*Message36876_Message36882) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{8, 5}
 }
@@ -5225,7 +5225,7 @@ func (x *Message36876_Message36883) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message36876_Message36883.ProtoReflect.Type instead.
+// Deprecated: Use Message36876_Message36883.ProtoReflect.Descriptor instead.
 func (*Message36876_Message36883) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{8, 6}
 }
@@ -5258,7 +5258,7 @@ func (x *Message36876_Message36884) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message36876_Message36884.ProtoReflect.Type instead.
+// Deprecated: Use Message36876_Message36884.ProtoReflect.Descriptor instead.
 func (*Message36876_Message36884) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{8, 7}
 }
@@ -5291,7 +5291,7 @@ func (x *Message36876_Message36885) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message36876_Message36885.ProtoReflect.Type instead.
+// Deprecated: Use Message36876_Message36885.ProtoReflect.Descriptor instead.
 func (*Message36876_Message36885) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{8, 8}
 }
@@ -5324,7 +5324,7 @@ func (x *Message36876_Message36886) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message36876_Message36886.ProtoReflect.Type instead.
+// Deprecated: Use Message36876_Message36886.ProtoReflect.Descriptor instead.
 func (*Message36876_Message36886) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{8, 9}
 }
@@ -5357,7 +5357,7 @@ func (x *Message36876_Message36887) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message36876_Message36887.ProtoReflect.Type instead.
+// Deprecated: Use Message36876_Message36887.ProtoReflect.Descriptor instead.
 func (*Message36876_Message36887) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{8, 10}
 }
@@ -5396,7 +5396,7 @@ func (x *Message36876_Message36888) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message36876_Message36888.ProtoReflect.Type instead.
+// Deprecated: Use Message36876_Message36888.ProtoReflect.Descriptor instead.
 func (*Message36876_Message36888) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{8, 11}
 }
@@ -5496,7 +5496,7 @@ func (x *Message36876_Message36889) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message36876_Message36889.ProtoReflect.Type instead.
+// Deprecated: Use Message36876_Message36889.ProtoReflect.Descriptor instead.
 func (*Message36876_Message36889) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{8, 12}
 }
@@ -5704,7 +5704,7 @@ func (x *Message36876_Message36910) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message36876_Message36910.ProtoReflect.Type instead.
+// Deprecated: Use Message36876_Message36910.ProtoReflect.Descriptor instead.
 func (*Message36876_Message36910) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{8, 13}
 }
@@ -5741,7 +5741,7 @@ func (x *Message36876_Message36911) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message36876_Message36911.ProtoReflect.Type instead.
+// Deprecated: Use Message36876_Message36911.ProtoReflect.Descriptor instead.
 func (*Message36876_Message36911) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{8, 14}
 }
@@ -5804,7 +5804,7 @@ func (x *Message36876_Message36912) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message36876_Message36912.ProtoReflect.Type instead.
+// Deprecated: Use Message36876_Message36912.ProtoReflect.Descriptor instead.
 func (*Message36876_Message36912) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{8, 15}
 }
@@ -5857,7 +5857,7 @@ func (x *Message17783_Message17784) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message17783_Message17784.ProtoReflect.Type instead.
+// Deprecated: Use Message17783_Message17784.ProtoReflect.Descriptor instead.
 func (*Message17783_Message17784) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{38, 0}
 }
@@ -5938,7 +5938,7 @@ func (x *Message17783_Message17785) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message17783_Message17785.ProtoReflect.Type instead.
+// Deprecated: Use Message17783_Message17785.ProtoReflect.Descriptor instead.
 func (*Message17783_Message17785) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{38, 1}
 }

+ 36 - 36
internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_2.pb.go

@@ -51,7 +51,7 @@ func (x *Message22853) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message22853.ProtoReflect.Type instead.
+// Deprecated: Use Message22853.ProtoReflect.Descriptor instead.
 func (*Message22853) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{0}
 }
@@ -144,7 +144,7 @@ func (x *Message24345) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message24345.ProtoReflect.Type instead.
+// Deprecated: Use Message24345.ProtoReflect.Descriptor instead.
 func (*Message24345) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{1}
 }
@@ -354,7 +354,7 @@ func (x *Message24403) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message24403.ProtoReflect.Type instead.
+// Deprecated: Use Message24403.ProtoReflect.Descriptor instead.
 func (*Message24403) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{2}
 }
@@ -426,7 +426,7 @@ func (x *Message24391) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message24391.ProtoReflect.Type instead.
+// Deprecated: Use Message24391.ProtoReflect.Descriptor instead.
 func (*Message24391) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{3}
 }
@@ -634,7 +634,7 @@ func (x *Message27454) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message27454.ProtoReflect.Type instead.
+// Deprecated: Use Message27454.ProtoReflect.Descriptor instead.
 func (*Message27454) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{4}
 }
@@ -672,7 +672,7 @@ func (x *Message27357) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message27357.ProtoReflect.Type instead.
+// Deprecated: Use Message27357.ProtoReflect.Descriptor instead.
 func (*Message27357) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{5}
 }
@@ -744,7 +744,7 @@ func (x *Message27360) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message27360.ProtoReflect.Type instead.
+// Deprecated: Use Message27360.ProtoReflect.Descriptor instead.
 func (*Message27360) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{6}
 }
@@ -810,7 +810,7 @@ func (x *Message34387) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message34387.ProtoReflect.Type instead.
+// Deprecated: Use Message34387.ProtoReflect.Descriptor instead.
 func (*Message34387) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{7}
 }
@@ -896,7 +896,7 @@ func (x *Message34621) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message34621.ProtoReflect.Type instead.
+// Deprecated: Use Message34621.ProtoReflect.Descriptor instead.
 func (*Message34621) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{8}
 }
@@ -1069,7 +1069,7 @@ func (x *Message35476) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message35476.ProtoReflect.Type instead.
+// Deprecated: Use Message35476.ProtoReflect.Descriptor instead.
 func (*Message35476) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{9}
 }
@@ -1207,7 +1207,7 @@ func (x *Message949) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message949.ProtoReflect.Type instead.
+// Deprecated: Use Message949.ProtoReflect.Descriptor instead.
 func (*Message949) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{10}
 }
@@ -1291,7 +1291,7 @@ func (x *Message36869) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message36869.ProtoReflect.Type instead.
+// Deprecated: Use Message36869.ProtoReflect.Descriptor instead.
 func (*Message36869) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{11}
 }
@@ -1343,7 +1343,7 @@ func (x *Message33968) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message33968.ProtoReflect.Type instead.
+// Deprecated: Use Message33968.ProtoReflect.Descriptor instead.
 func (*Message33968) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{12}
 }
@@ -1427,7 +1427,7 @@ func (x *Message6644) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6644.ProtoReflect.Type instead.
+// Deprecated: Use Message6644.ProtoReflect.Descriptor instead.
 func (*Message6644) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{13}
 }
@@ -1573,7 +1573,7 @@ func (x *Message18831) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message18831.ProtoReflect.Type instead.
+// Deprecated: Use Message18831.ProtoReflect.Descriptor instead.
 func (*Message18831) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{14}
 }
@@ -1615,7 +1615,7 @@ func (x *Message13090) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message13090.ProtoReflect.Type instead.
+// Deprecated: Use Message13090.ProtoReflect.Descriptor instead.
 func (*Message13090) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{15}
 }
@@ -1667,7 +1667,7 @@ func (x *Message11874) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message11874.ProtoReflect.Type instead.
+// Deprecated: Use Message11874.ProtoReflect.Descriptor instead.
 func (*Message11874) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{16}
 }
@@ -1678,7 +1678,7 @@ var extRange_Message11874 = []protoiface.ExtensionRangeV1{
 	{Start: 5, End: 5},
 }
 
-// Deprecated: Use Message11874.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use Message11874.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*Message11874) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_Message11874
 }
@@ -1740,7 +1740,7 @@ func (x *Message4144) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message4144.ProtoReflect.Type instead.
+// Deprecated: Use Message4144.ProtoReflect.Descriptor instead.
 func (*Message4144) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{17}
 }
@@ -1791,7 +1791,7 @@ func (x *Message35573) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message35573.ProtoReflect.Type instead.
+// Deprecated: Use Message35573.ProtoReflect.Descriptor instead.
 func (*Message35573) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{18}
 }
@@ -1913,7 +1913,7 @@ func (x *Message36858) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message36858.ProtoReflect.Type instead.
+// Deprecated: Use Message36858.ProtoReflect.Descriptor instead.
 func (*Message36858) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{19}
 }
@@ -2051,7 +2051,7 @@ func (x *Message13174) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message13174.ProtoReflect.Type instead.
+// Deprecated: Use Message13174.ProtoReflect.Descriptor instead.
 func (*Message13174) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{20}
 }
@@ -2336,7 +2336,7 @@ func (x *Message18283) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message18283.ProtoReflect.Type instead.
+// Deprecated: Use Message18283.ProtoReflect.Descriptor instead.
 func (*Message18283) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{21}
 }
@@ -2348,7 +2348,7 @@ var extRange_Message18283 = []protoiface.ExtensionRangeV1{
 	{Start: 165, End: 165},
 }
 
-// Deprecated: Use Message18283.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use Message18283.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*Message18283) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_Message18283
 }
@@ -3112,7 +3112,7 @@ func (x *Message13169) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message13169.ProtoReflect.Type instead.
+// Deprecated: Use Message13169.ProtoReflect.Descriptor instead.
 func (*Message13169) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{22}
 }
@@ -3167,7 +3167,7 @@ func (x *Message19255) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message19255.ProtoReflect.Type instead.
+// Deprecated: Use Message19255.ProtoReflect.Descriptor instead.
 func (*Message19255) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{23}
 }
@@ -3210,7 +3210,7 @@ func (x *Message35542) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message35542.ProtoReflect.Type instead.
+// Deprecated: Use Message35542.ProtoReflect.Descriptor instead.
 func (*Message35542) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{24}
 }
@@ -3276,7 +3276,7 @@ func (x *Message3901) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3901.ProtoReflect.Type instead.
+// Deprecated: Use Message3901.ProtoReflect.Descriptor instead.
 func (*Message3901) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{25}
 }
@@ -3393,7 +3393,7 @@ func (x *Message33968_Message33969) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message33968_Message33969.ProtoReflect.Type instead.
+// Deprecated: Use Message33968_Message33969.ProtoReflect.Descriptor instead.
 func (*Message33968_Message33969) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{12, 0}
 }
@@ -3433,7 +3433,7 @@ func (x *Message18831_Message18832) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message18831_Message18832.ProtoReflect.Type instead.
+// Deprecated: Use Message18831_Message18832.ProtoReflect.Descriptor instead.
 func (*Message18831_Message18832) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{14, 0}
 }
@@ -3520,7 +3520,7 @@ func (x *Message18831_Message18832_Message18833) ProtoReflect() protoreflect.Mes
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message18831_Message18832_Message18833.ProtoReflect.Type instead.
+// Deprecated: Use Message18831_Message18832_Message18833.ProtoReflect.Descriptor instead.
 func (*Message18831_Message18832_Message18833) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{14, 0, 0}
 }
@@ -3594,7 +3594,7 @@ func (x *Message4144_Message4145) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message4144_Message4145.ProtoReflect.Type instead.
+// Deprecated: Use Message4144_Message4145.ProtoReflect.Descriptor instead.
 func (*Message4144_Message4145) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{17, 0}
 }
@@ -3669,7 +3669,7 @@ func (x *Message35573_Message35574) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message35573_Message35574.ProtoReflect.Type instead.
+// Deprecated: Use Message35573_Message35574.ProtoReflect.Descriptor instead.
 func (*Message35573_Message35574) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{18, 0}
 }
@@ -3740,7 +3740,7 @@ func (x *Message35573_Message35575) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message35573_Message35575.ProtoReflect.Type instead.
+// Deprecated: Use Message35573_Message35575.ProtoReflect.Descriptor instead.
 func (*Message35573_Message35575) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{18, 1}
 }
@@ -4064,7 +4064,7 @@ func (x *Message35573_Message35575_Message35576) ProtoReflect() protoreflect.Mes
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message35573_Message35575_Message35576.ProtoReflect.Type instead.
+// Deprecated: Use Message35573_Message35575_Message35576.ProtoReflect.Descriptor instead.
 func (*Message35573_Message35575_Message35576) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{18, 1, 0}
 }
@@ -4274,7 +4274,7 @@ func (x *Message36858_Message36859) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message36858_Message36859.ProtoReflect.Type instead.
+// Deprecated: Use Message36858_Message36859.ProtoReflect.Descriptor instead.
 func (*Message36858_Message36859) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{19, 0}
 }

+ 37 - 37
internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_3.pb.go

@@ -57,7 +57,7 @@ func (x *Message35546) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message35546.ProtoReflect.Type instead.
+// Deprecated: Use Message35546.ProtoReflect.Descriptor instead.
 func (*Message35546) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{0}
 }
@@ -205,7 +205,7 @@ func (x *Message2356) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message2356.ProtoReflect.Type instead.
+// Deprecated: Use Message2356.ProtoReflect.Descriptor instead.
 func (*Message2356) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{1}
 }
@@ -497,7 +497,7 @@ func (x *Message7029) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7029.ProtoReflect.Type instead.
+// Deprecated: Use Message7029.ProtoReflect.Descriptor instead.
 func (*Message7029) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{2}
 }
@@ -825,7 +825,7 @@ func (x *Message35538) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message35538.ProtoReflect.Type instead.
+// Deprecated: Use Message35538.ProtoReflect.Descriptor instead.
 func (*Message35538) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{3}
 }
@@ -877,7 +877,7 @@ func (x *Message18921) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message18921.ProtoReflect.Type instead.
+// Deprecated: Use Message18921.ProtoReflect.Descriptor instead.
 func (*Message18921) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{4}
 }
@@ -995,7 +995,7 @@ func (x *Message35540) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message35540.ProtoReflect.Type instead.
+// Deprecated: Use Message35540.ProtoReflect.Descriptor instead.
 func (*Message35540) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{5}
 }
@@ -1036,7 +1036,7 @@ func (x *Message3886) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3886.ProtoReflect.Type instead.
+// Deprecated: Use Message3886.ProtoReflect.Descriptor instead.
 func (*Message3886) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{6}
 }
@@ -1084,7 +1084,7 @@ func (x *Message6743) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6743.ProtoReflect.Type instead.
+// Deprecated: Use Message6743.ProtoReflect.Descriptor instead.
 func (*Message6743) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{7}
 }
@@ -1183,7 +1183,7 @@ func (x *Message6773) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6773.ProtoReflect.Type instead.
+// Deprecated: Use Message6773.ProtoReflect.Descriptor instead.
 func (*Message6773) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{8}
 }
@@ -1313,7 +1313,7 @@ func (x *Message8224) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8224.ProtoReflect.Type instead.
+// Deprecated: Use Message8224.ProtoReflect.Descriptor instead.
 func (*Message8224) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{9}
 }
@@ -1544,7 +1544,7 @@ func (x *Message8392) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8392.ProtoReflect.Type instead.
+// Deprecated: Use Message8392.ProtoReflect.Descriptor instead.
 func (*Message8392) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{10}
 }
@@ -1664,7 +1664,7 @@ func (x *Message8130) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8130.ProtoReflect.Type instead.
+// Deprecated: Use Message8130.ProtoReflect.Descriptor instead.
 func (*Message8130) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{11}
 }
@@ -1873,7 +1873,7 @@ func (x *Message8478) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8478.ProtoReflect.Type instead.
+// Deprecated: Use Message8478.ProtoReflect.Descriptor instead.
 func (*Message8478) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{12}
 }
@@ -1971,7 +1971,7 @@ func (x *Message8479) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8479.ProtoReflect.Type instead.
+// Deprecated: Use Message8479.ProtoReflect.Descriptor instead.
 func (*Message8479) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{13}
 }
@@ -2074,7 +2074,7 @@ func (x *Message10319) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10319.ProtoReflect.Type instead.
+// Deprecated: Use Message10319.ProtoReflect.Descriptor instead.
 func (*Message10319) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{14}
 }
@@ -2160,7 +2160,7 @@ func (x *Message4016) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message4016.ProtoReflect.Type instead.
+// Deprecated: Use Message4016.ProtoReflect.Descriptor instead.
 func (*Message4016) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{15}
 }
@@ -2225,7 +2225,7 @@ func (x *Message12669) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12669.ProtoReflect.Type instead.
+// Deprecated: Use Message12669.ProtoReflect.Descriptor instead.
 func (*Message12669) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{16}
 }
@@ -2292,7 +2292,7 @@ func (x *Message12819) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12819.ProtoReflect.Type instead.
+// Deprecated: Use Message12819.ProtoReflect.Descriptor instead.
 func (*Message12819) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{17}
 }
@@ -2375,7 +2375,7 @@ func (x *Message12820) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12820.ProtoReflect.Type instead.
+// Deprecated: Use Message12820.ProtoReflect.Descriptor instead.
 func (*Message12820) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{18}
 }
@@ -2469,7 +2469,7 @@ func (x *Message12821) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12821.ProtoReflect.Type instead.
+// Deprecated: Use Message12821.ProtoReflect.Descriptor instead.
 func (*Message12821) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{19}
 }
@@ -2542,7 +2542,7 @@ func (x *Message12818) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12818.ProtoReflect.Type instead.
+// Deprecated: Use Message12818.ProtoReflect.Descriptor instead.
 func (*Message12818) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{20}
 }
@@ -2616,7 +2616,7 @@ func (x *Message16479) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message16479.ProtoReflect.Type instead.
+// Deprecated: Use Message16479.ProtoReflect.Descriptor instead.
 func (*Message16479) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{21}
 }
@@ -2696,7 +2696,7 @@ func (x *Message16722) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message16722.ProtoReflect.Type instead.
+// Deprecated: Use Message16722.ProtoReflect.Descriptor instead.
 func (*Message16722) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{22}
 }
@@ -2777,7 +2777,7 @@ func (x *Message16724) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message16724.ProtoReflect.Type instead.
+// Deprecated: Use Message16724.ProtoReflect.Descriptor instead.
 func (*Message16724) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{23}
 }
@@ -2901,7 +2901,7 @@ func (x *Message17728) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message17728.ProtoReflect.Type instead.
+// Deprecated: Use Message17728.ProtoReflect.Descriptor instead.
 func (*Message17728) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{24}
 }
@@ -2949,7 +2949,7 @@ func (x *Message24356) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message24356.ProtoReflect.Type instead.
+// Deprecated: Use Message24356.ProtoReflect.Descriptor instead.
 func (*Message24356) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{25}
 }
@@ -3101,7 +3101,7 @@ func (x *Message24376) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message24376.ProtoReflect.Type instead.
+// Deprecated: Use Message24376.ProtoReflect.Descriptor instead.
 func (*Message24376) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{26}
 }
@@ -3247,7 +3247,7 @@ func (x *Message24366) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message24366.ProtoReflect.Type instead.
+// Deprecated: Use Message24366.ProtoReflect.Descriptor instead.
 func (*Message24366) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{27}
 }
@@ -3387,7 +3387,7 @@ func (x *Message35546_Message35547) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message35546_Message35547.ProtoReflect.Type instead.
+// Deprecated: Use Message35546_Message35547.ProtoReflect.Descriptor instead.
 func (*Message35546_Message35547) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{0, 0}
 }
@@ -3436,7 +3436,7 @@ func (x *Message35546_Message35548) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message35546_Message35548.ProtoReflect.Type instead.
+// Deprecated: Use Message35546_Message35548.ProtoReflect.Descriptor instead.
 func (*Message35546_Message35548) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{0, 1}
 }
@@ -3495,7 +3495,7 @@ func (x *Message2356_Message2357) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message2356_Message2357.ProtoReflect.Type instead.
+// Deprecated: Use Message2356_Message2357.ProtoReflect.Descriptor instead.
 func (*Message2356_Message2357) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{1, 0}
 }
@@ -3612,7 +3612,7 @@ func (x *Message2356_Message2358) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message2356_Message2358.ProtoReflect.Type instead.
+// Deprecated: Use Message2356_Message2358.ProtoReflect.Descriptor instead.
 func (*Message2356_Message2358) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{1, 1}
 }
@@ -3653,7 +3653,7 @@ func (x *Message2356_Message2359) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message2356_Message2359.ProtoReflect.Type instead.
+// Deprecated: Use Message2356_Message2359.ProtoReflect.Descriptor instead.
 func (*Message2356_Message2359) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{1, 2}
 }
@@ -3745,7 +3745,7 @@ func (x *Message7029_Message7030) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7029_Message7030.ProtoReflect.Type instead.
+// Deprecated: Use Message7029_Message7030.ProtoReflect.Descriptor instead.
 func (*Message7029_Message7030) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{2, 0}
 }
@@ -3805,7 +3805,7 @@ func (x *Message7029_Message7031) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7029_Message7031.ProtoReflect.Type instead.
+// Deprecated: Use Message7029_Message7031.ProtoReflect.Descriptor instead.
 func (*Message7029_Message7031) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{2, 1}
 }
@@ -3903,7 +3903,7 @@ func (x *Message18921_Message18922) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message18921_Message18922.ProtoReflect.Type instead.
+// Deprecated: Use Message18921_Message18922.ProtoReflect.Descriptor instead.
 func (*Message18921_Message18922) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{4, 0}
 }
@@ -4101,7 +4101,7 @@ func (x *Message3886_Message3887) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3886_Message3887.ProtoReflect.Type instead.
+// Deprecated: Use Message3886_Message3887.ProtoReflect.Descriptor instead.
 func (*Message3886_Message3887) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{6, 0}
 }

+ 56 - 56
internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_4.pb.go

@@ -46,7 +46,7 @@ func (x *Message24346) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message24346.ProtoReflect.Type instead.
+// Deprecated: Use Message24346.ProtoReflect.Descriptor instead.
 func (*Message24346) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{0}
 }
@@ -80,7 +80,7 @@ func (x *Message24401) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message24401.ProtoReflect.Type instead.
+// Deprecated: Use Message24401.ProtoReflect.Descriptor instead.
 func (*Message24401) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{1}
 }
@@ -121,7 +121,7 @@ func (x *Message24402) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message24402.ProtoReflect.Type instead.
+// Deprecated: Use Message24402.ProtoReflect.Descriptor instead.
 func (*Message24402) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{2}
 }
@@ -179,7 +179,7 @@ func (x *Message24379) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message24379.ProtoReflect.Type instead.
+// Deprecated: Use Message24379.ProtoReflect.Descriptor instead.
 func (*Message24379) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{3}
 }
@@ -340,7 +340,7 @@ func (x *Message27358) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message27358.ProtoReflect.Type instead.
+// Deprecated: Use Message27358.ProtoReflect.Descriptor instead.
 func (*Message27358) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{4}
 }
@@ -397,7 +397,7 @@ func (x *Message34381) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message34381.ProtoReflect.Type instead.
+// Deprecated: Use Message34381.ProtoReflect.Descriptor instead.
 func (*Message34381) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{5}
 }
@@ -507,7 +507,7 @@ func (x *Message34619) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message34619.ProtoReflect.Type instead.
+// Deprecated: Use Message34619.ProtoReflect.Descriptor instead.
 func (*Message34619) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{6}
 }
@@ -623,7 +623,7 @@ func (x *Message730) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message730.ProtoReflect.Type instead.
+// Deprecated: Use Message730.ProtoReflect.Descriptor instead.
 func (*Message730) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{7}
 }
@@ -635,7 +635,7 @@ var extRange_Message730 = []protoiface.ExtensionRangeV1{
 	{Start: 15, End: 15},
 }
 
-// Deprecated: Use Message730.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use Message730.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*Message730) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_Message730
 }
@@ -903,7 +903,7 @@ func (x *Message33958) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message33958.ProtoReflect.Type instead.
+// Deprecated: Use Message33958.ProtoReflect.Descriptor instead.
 func (*Message33958) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{8}
 }
@@ -969,7 +969,7 @@ func (x *Message6637) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6637.ProtoReflect.Type instead.
+// Deprecated: Use Message6637.ProtoReflect.Descriptor instead.
 func (*Message6637) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{9}
 }
@@ -1055,7 +1055,7 @@ func (x *Message6643) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6643.ProtoReflect.Type instead.
+// Deprecated: Use Message6643.ProtoReflect.Descriptor instead.
 func (*Message6643) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{10}
 }
@@ -1233,7 +1233,7 @@ func (x *Message6126) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6126.ProtoReflect.Type instead.
+// Deprecated: Use Message6126.ProtoReflect.Descriptor instead.
 func (*Message6126) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{11}
 }
@@ -1409,7 +1409,7 @@ func (x *Message13083) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message13083.ProtoReflect.Type instead.
+// Deprecated: Use Message13083.ProtoReflect.Descriptor instead.
 func (*Message13083) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{12}
 }
@@ -1515,7 +1515,7 @@ func (x *Message13088) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message13088.ProtoReflect.Type instead.
+// Deprecated: Use Message13088.ProtoReflect.Descriptor instead.
 func (*Message13088) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{13}
 }
@@ -1578,7 +1578,7 @@ func (x *Message10391) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10391.ProtoReflect.Type instead.
+// Deprecated: Use Message10391.ProtoReflect.Descriptor instead.
 func (*Message10391) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{14}
 }
@@ -1687,7 +1687,7 @@ func (x *Message11873) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message11873.ProtoReflect.Type instead.
+// Deprecated: Use Message11873.ProtoReflect.Descriptor instead.
 func (*Message11873) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{15}
 }
@@ -1697,7 +1697,7 @@ var extRange_Message11873 = []protoiface.ExtensionRangeV1{
 	{Start: 10, End: 10},
 }
 
-// Deprecated: Use Message11873.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use Message11873.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*Message11873) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_Message11873
 }
@@ -1818,7 +1818,7 @@ func (x *Message35506) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message35506.ProtoReflect.Type instead.
+// Deprecated: Use Message35506.ProtoReflect.Descriptor instead.
 func (*Message35506) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{16}
 }
@@ -1880,7 +1880,7 @@ func (x *Message13151) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message13151.ProtoReflect.Type instead.
+// Deprecated: Use Message13151.ProtoReflect.Descriptor instead.
 func (*Message13151) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{17}
 }
@@ -1921,7 +1921,7 @@ func (x *Message18253) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message18253.ProtoReflect.Type instead.
+// Deprecated: Use Message18253.ProtoReflect.Descriptor instead.
 func (*Message18253) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{18}
 }
@@ -1962,7 +1962,7 @@ func (x *Message16685) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message16685.ProtoReflect.Type instead.
+// Deprecated: Use Message16685.ProtoReflect.Descriptor instead.
 func (*Message16685) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{19}
 }
@@ -2012,7 +2012,7 @@ func (x *Message16816) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message16816.ProtoReflect.Type instead.
+// Deprecated: Use Message16816.ProtoReflect.Descriptor instead.
 func (*Message16816) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{20}
 }
@@ -2126,7 +2126,7 @@ func (x *Message13168) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message13168.ProtoReflect.Type instead.
+// Deprecated: Use Message13168.ProtoReflect.Descriptor instead.
 func (*Message13168) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{21}
 }
@@ -2249,7 +2249,7 @@ func (x *Message13167) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message13167.ProtoReflect.Type instead.
+// Deprecated: Use Message13167.ProtoReflect.Descriptor instead.
 func (*Message13167) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{22}
 }
@@ -2375,7 +2375,7 @@ func (x *Message1374) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message1374.ProtoReflect.Type instead.
+// Deprecated: Use Message1374.ProtoReflect.Descriptor instead.
 func (*Message1374) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{23}
 }
@@ -2422,7 +2422,7 @@ func (x *Message18943) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message18943.ProtoReflect.Type instead.
+// Deprecated: Use Message18943.ProtoReflect.Descriptor instead.
 func (*Message18943) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{24}
 }
@@ -2455,7 +2455,7 @@ func (x *Message18944) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message18944.ProtoReflect.Type instead.
+// Deprecated: Use Message18944.ProtoReflect.Descriptor instead.
 func (*Message18944) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{25}
 }
@@ -2519,7 +2519,7 @@ func (x *Message18856) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message18856.ProtoReflect.Type instead.
+// Deprecated: Use Message18856.ProtoReflect.Descriptor instead.
 func (*Message18856) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{26}
 }
@@ -2775,7 +2775,7 @@ func (x *Message3850) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3850.ProtoReflect.Type instead.
+// Deprecated: Use Message3850.ProtoReflect.Descriptor instead.
 func (*Message3850) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{27}
 }
@@ -2854,7 +2854,7 @@ func (x *Message6721) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6721.ProtoReflect.Type instead.
+// Deprecated: Use Message6721.ProtoReflect.Descriptor instead.
 func (*Message6721) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{28}
 }
@@ -2916,7 +2916,7 @@ func (x *Message6742) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6742.ProtoReflect.Type instead.
+// Deprecated: Use Message6742.ProtoReflect.Descriptor instead.
 func (*Message6742) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{29}
 }
@@ -2958,7 +2958,7 @@ func (x *Message6726) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6726.ProtoReflect.Type instead.
+// Deprecated: Use Message6726.ProtoReflect.Descriptor instead.
 func (*Message6726) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{30}
 }
@@ -3008,7 +3008,7 @@ func (x *Message6733) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6733.ProtoReflect.Type instead.
+// Deprecated: Use Message6733.ProtoReflect.Descriptor instead.
 func (*Message6733) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{31}
 }
@@ -3064,7 +3064,7 @@ func (x *Message6723) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6723.ProtoReflect.Type instead.
+// Deprecated: Use Message6723.ProtoReflect.Descriptor instead.
 func (*Message6723) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{32}
 }
@@ -3113,7 +3113,7 @@ func (x *Message6725) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6725.ProtoReflect.Type instead.
+// Deprecated: Use Message6725.ProtoReflect.Descriptor instead.
 func (*Message6725) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{33}
 }
@@ -3161,7 +3161,7 @@ func (x *Message6734) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6734.ProtoReflect.Type instead.
+// Deprecated: Use Message6734.ProtoReflect.Descriptor instead.
 func (*Message6734) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{34}
 }
@@ -3204,7 +3204,7 @@ func (x *Message8184) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8184.ProtoReflect.Type instead.
+// Deprecated: Use Message8184.ProtoReflect.Descriptor instead.
 func (*Message8184) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{35}
 }
@@ -3261,7 +3261,7 @@ func (x *Message8477) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8477.ProtoReflect.Type instead.
+// Deprecated: Use Message8477.ProtoReflect.Descriptor instead.
 func (*Message8477) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{36}
 }
@@ -3319,7 +3319,7 @@ func (x *Message8454) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8454.ProtoReflect.Type instead.
+// Deprecated: Use Message8454.ProtoReflect.Descriptor instead.
 func (*Message8454) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{37}
 }
@@ -3383,7 +3383,7 @@ func (x *Message8476) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8476.ProtoReflect.Type instead.
+// Deprecated: Use Message8476.ProtoReflect.Descriptor instead.
 func (*Message8476) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{38}
 }
@@ -3441,7 +3441,7 @@ func (x *Message8455) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8455.ProtoReflect.Type instead.
+// Deprecated: Use Message8455.ProtoReflect.Descriptor instead.
 func (*Message8455) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{39}
 }
@@ -3504,7 +3504,7 @@ func (x *Message8475) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8475.ProtoReflect.Type instead.
+// Deprecated: Use Message8475.ProtoReflect.Descriptor instead.
 func (*Message8475) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{40}
 }
@@ -3551,7 +3551,7 @@ func (x *Message12559) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12559.ProtoReflect.Type instead.
+// Deprecated: Use Message12559.ProtoReflect.Descriptor instead.
 func (*Message12559) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{41}
 }
@@ -3587,7 +3587,7 @@ func (x *Message12817) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12817.ProtoReflect.Type instead.
+// Deprecated: Use Message12817.ProtoReflect.Descriptor instead.
 func (*Message12817) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{42}
 }
@@ -3650,7 +3650,7 @@ func (x *Message16480) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message16480.ProtoReflect.Type instead.
+// Deprecated: Use Message16480.ProtoReflect.Descriptor instead.
 func (*Message16480) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{43}
 }
@@ -3775,7 +3775,7 @@ func (x *Message24317) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message24317.ProtoReflect.Type instead.
+// Deprecated: Use Message24317.ProtoReflect.Descriptor instead.
 func (*Message24317) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{44}
 }
@@ -4017,7 +4017,7 @@ func (x *Message33958_Message33959) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message33958_Message33959.ProtoReflect.Type instead.
+// Deprecated: Use Message33958_Message33959.ProtoReflect.Descriptor instead.
 func (*Message33958_Message33959) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{8, 0}
 }
@@ -4096,7 +4096,7 @@ func (x *Message13083_Message13084) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message13083_Message13084.ProtoReflect.Type instead.
+// Deprecated: Use Message13083_Message13084.ProtoReflect.Descriptor instead.
 func (*Message13083_Message13084) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{12, 0}
 }
@@ -4157,7 +4157,7 @@ func (x *Message13083_Message13085) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message13083_Message13085.ProtoReflect.Type instead.
+// Deprecated: Use Message13083_Message13085.ProtoReflect.Descriptor instead.
 func (*Message13083_Message13085) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{12, 1}
 }
@@ -4190,7 +4190,7 @@ func (x *Message13083_Message13086) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message13083_Message13086.ProtoReflect.Type instead.
+// Deprecated: Use Message13083_Message13086.ProtoReflect.Descriptor instead.
 func (*Message13083_Message13086) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{12, 2}
 }
@@ -4223,7 +4223,7 @@ func (x *Message13083_Message13087) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message13083_Message13087.ProtoReflect.Type instead.
+// Deprecated: Use Message13083_Message13087.ProtoReflect.Descriptor instead.
 func (*Message13083_Message13087) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{12, 3}
 }
@@ -4258,7 +4258,7 @@ func (x *Message13088_Message13089) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message13088_Message13089.ProtoReflect.Type instead.
+// Deprecated: Use Message13088_Message13089.ProtoReflect.Descriptor instead.
 func (*Message13088_Message13089) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{13, 0}
 }
@@ -4307,7 +4307,7 @@ func (x *Message18253_Message18254) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message18253_Message18254.ProtoReflect.Type instead.
+// Deprecated: Use Message18253_Message18254.ProtoReflect.Descriptor instead.
 func (*Message18253_Message18254) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{18, 0}
 }
@@ -4354,7 +4354,7 @@ func (x *Message16816_Message16817) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message16816_Message16817.ProtoReflect.Type instead.
+// Deprecated: Use Message16816_Message16817.ProtoReflect.Descriptor instead.
 func (*Message16816_Message16817) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{20, 0}
 }
@@ -4387,7 +4387,7 @@ func (x *Message16816_Message16818) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message16816_Message16818.ProtoReflect.Type instead.
+// Deprecated: Use Message16816_Message16818.ProtoReflect.Descriptor instead.
 func (*Message16816_Message16818) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{20, 1}
 }

+ 57 - 57
internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_5.pb.go

@@ -46,7 +46,7 @@ func (x *Message24377) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message24377.ProtoReflect.Type instead.
+// Deprecated: Use Message24377.ProtoReflect.Descriptor instead.
 func (*Message24377) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{0}
 }
@@ -79,7 +79,7 @@ func (x *Message24378) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message24378.ProtoReflect.Type instead.
+// Deprecated: Use Message24378.ProtoReflect.Descriptor instead.
 func (*Message24378) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{1}
 }
@@ -117,7 +117,7 @@ func (x *Message24400) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message24400.ProtoReflect.Type instead.
+// Deprecated: Use Message24400.ProtoReflect.Descriptor instead.
 func (*Message24400) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{2}
 }
@@ -185,7 +185,7 @@ func (x *Message24380) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message24380.ProtoReflect.Type instead.
+// Deprecated: Use Message24380.ProtoReflect.Descriptor instead.
 func (*Message24380) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{3}
 }
@@ -218,7 +218,7 @@ func (x *Message24381) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message24381.ProtoReflect.Type instead.
+// Deprecated: Use Message24381.ProtoReflect.Descriptor instead.
 func (*Message24381) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{4}
 }
@@ -255,7 +255,7 @@ func (x *Message719) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message719.ProtoReflect.Type instead.
+// Deprecated: Use Message719.ProtoReflect.Descriptor instead.
 func (*Message719) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{5}
 }
@@ -326,7 +326,7 @@ func (x *Message728) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message728.ProtoReflect.Type instead.
+// Deprecated: Use Message728.ProtoReflect.Descriptor instead.
 func (*Message728) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{6}
 }
@@ -337,7 +337,7 @@ var extRange_Message728 = []protoiface.ExtensionRangeV1{
 	{Start: 12, End: 12},
 }
 
-// Deprecated: Use Message728.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use Message728.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*Message728) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_Message728
 }
@@ -440,7 +440,7 @@ func (x *Message704) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message704.ProtoReflect.Type instead.
+// Deprecated: Use Message704.ProtoReflect.Descriptor instead.
 func (*Message704) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{7}
 }
@@ -559,7 +559,7 @@ func (x *Message697) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message697.ProtoReflect.Type instead.
+// Deprecated: Use Message697.ProtoReflect.Descriptor instead.
 func (*Message697) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{8}
 }
@@ -569,7 +569,7 @@ var extRange_Message697 = []protoiface.ExtensionRangeV1{
 	{Start: 26, End: 26},
 }
 
-// Deprecated: Use Message697.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use Message697.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*Message697) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_Message697
 }
@@ -855,7 +855,7 @@ func (x *Message0) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message0.ProtoReflect.Type instead.
+// Deprecated: Use Message0.ProtoReflect.Descriptor instead.
 func (*Message0) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{9}
 }
@@ -864,7 +864,7 @@ var extRange_Message0 = []protoiface.ExtensionRangeV1{
 	{Start: 4, End: 2147483646},
 }
 
-// Deprecated: Use Message0.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use Message0.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*Message0) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_Message0
 }
@@ -899,7 +899,7 @@ func (x *Message6578) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6578.ProtoReflect.Type instead.
+// Deprecated: Use Message6578.ProtoReflect.Descriptor instead.
 func (*Message6578) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{10}
 }
@@ -949,7 +949,7 @@ func (x *Message6024) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6024.ProtoReflect.Type instead.
+// Deprecated: Use Message6024.ProtoReflect.Descriptor instead.
 func (*Message6024) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{11}
 }
@@ -1005,7 +1005,7 @@ func (x *Message6052) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6052.ProtoReflect.Type instead.
+// Deprecated: Use Message6052.ProtoReflect.Descriptor instead.
 func (*Message6052) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{12}
 }
@@ -1054,7 +1054,7 @@ func (x *Message6054) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6054.ProtoReflect.Type instead.
+// Deprecated: Use Message6054.ProtoReflect.Descriptor instead.
 func (*Message6054) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{13}
 }
@@ -1104,7 +1104,7 @@ func (x *Message10573) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10573.ProtoReflect.Type instead.
+// Deprecated: Use Message10573.ProtoReflect.Descriptor instead.
 func (*Message10573) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{14}
 }
@@ -1113,7 +1113,7 @@ var extRange_Message10573 = []protoiface.ExtensionRangeV1{
 	{Start: 10000, End: 536870911},
 }
 
-// Deprecated: Use Message10573.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use Message10573.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*Message10573) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_Message10573
 }
@@ -1162,7 +1162,7 @@ func (x *Message10824) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10824.ProtoReflect.Type instead.
+// Deprecated: Use Message10824.ProtoReflect.Descriptor instead.
 func (*Message10824) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{15}
 }
@@ -1215,7 +1215,7 @@ func (x *Message10582) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10582.ProtoReflect.Type instead.
+// Deprecated: Use Message10582.ProtoReflect.Descriptor instead.
 func (*Message10582) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{16}
 }
@@ -1361,7 +1361,7 @@ func (x *Message10155) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10155.ProtoReflect.Type instead.
+// Deprecated: Use Message10155.ProtoReflect.Descriptor instead.
 func (*Message10155) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{17}
 }
@@ -1371,7 +1371,7 @@ var extRange_Message10155 = []protoiface.ExtensionRangeV1{
 	{Start: 1000, End: 536870911},
 }
 
-// Deprecated: Use Message10155.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use Message10155.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*Message10155) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_Message10155
 }
@@ -1899,7 +1899,7 @@ func (x *Message11866) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message11866.ProtoReflect.Type instead.
+// Deprecated: Use Message11866.ProtoReflect.Descriptor instead.
 func (*Message11866) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{18}
 }
@@ -1976,7 +1976,7 @@ func (x *Message10469) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10469.ProtoReflect.Type instead.
+// Deprecated: Use Message10469.ProtoReflect.Descriptor instead.
 func (*Message10469) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{19}
 }
@@ -2074,7 +2074,7 @@ func (x *Message10818) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10818.ProtoReflect.Type instead.
+// Deprecated: Use Message10818.ProtoReflect.Descriptor instead.
 func (*Message10818) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{20}
 }
@@ -2144,7 +2144,7 @@ func (x *Message10773) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10773.ProtoReflect.Type instead.
+// Deprecated: Use Message10773.ProtoReflect.Descriptor instead.
 func (*Message10773) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{21}
 }
@@ -2342,7 +2342,7 @@ func (x *Message13145) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message13145.ProtoReflect.Type instead.
+// Deprecated: Use Message13145.ProtoReflect.Descriptor instead.
 func (*Message13145) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{22}
 }
@@ -2351,7 +2351,7 @@ var extRange_Message13145 = []protoiface.ExtensionRangeV1{
 	{Start: 1000, End: 536870911},
 }
 
-// Deprecated: Use Message13145.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use Message13145.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*Message13145) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_Message13145
 }
@@ -2405,7 +2405,7 @@ func (x *Message16686) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message16686.ProtoReflect.Type instead.
+// Deprecated: Use Message16686.ProtoReflect.Descriptor instead.
 func (*Message16686) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{23}
 }
@@ -2440,7 +2440,7 @@ func (x *Message12796) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12796.ProtoReflect.Type instead.
+// Deprecated: Use Message12796.ProtoReflect.Descriptor instead.
 func (*Message12796) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{24}
 }
@@ -2487,7 +2487,7 @@ func (x *Message6722) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6722.ProtoReflect.Type instead.
+// Deprecated: Use Message6722.ProtoReflect.Descriptor instead.
 func (*Message6722) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{25}
 }
@@ -2520,7 +2520,7 @@ func (x *Message6727) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6727.ProtoReflect.Type instead.
+// Deprecated: Use Message6727.ProtoReflect.Descriptor instead.
 func (*Message6727) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{26}
 }
@@ -2553,7 +2553,7 @@ func (x *Message6724) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6724.ProtoReflect.Type instead.
+// Deprecated: Use Message6724.ProtoReflect.Descriptor instead.
 func (*Message6724) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{27}
 }
@@ -2586,7 +2586,7 @@ func (x *Message6735) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6735.ProtoReflect.Type instead.
+// Deprecated: Use Message6735.ProtoReflect.Descriptor instead.
 func (*Message6735) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{28}
 }
@@ -2621,7 +2621,7 @@ func (x *Message8183) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8183.ProtoReflect.Type instead.
+// Deprecated: Use Message8183.ProtoReflect.Descriptor instead.
 func (*Message8183) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{29}
 }
@@ -2680,7 +2680,7 @@ func (x *Message8301) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8301.ProtoReflect.Type instead.
+// Deprecated: Use Message8301.ProtoReflect.Descriptor instead.
 func (*Message8301) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{30}
 }
@@ -2689,7 +2689,7 @@ var extRange_Message8301 = []protoiface.ExtensionRangeV1{
 	{Start: 64, End: 536870911},
 }
 
-// Deprecated: Use Message8301.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use Message8301.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*Message8301) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_Message8301
 }
@@ -2799,7 +2799,7 @@ func (x *Message8456) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8456.ProtoReflect.Type instead.
+// Deprecated: Use Message8456.ProtoReflect.Descriptor instead.
 func (*Message8456) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{31}
 }
@@ -2854,7 +2854,7 @@ func (x *Message8302) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8302.ProtoReflect.Type instead.
+// Deprecated: Use Message8302.ProtoReflect.Descriptor instead.
 func (*Message8302) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{32}
 }
@@ -2863,7 +2863,7 @@ var extRange_Message8302 = []protoiface.ExtensionRangeV1{
 	{Start: 64, End: 536870911},
 }
 
-// Deprecated: Use Message8302.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use Message8302.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*Message8302) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_Message8302
 }
@@ -3043,7 +3043,7 @@ func (x *Message8457) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8457.ProtoReflect.Type instead.
+// Deprecated: Use Message8457.ProtoReflect.Descriptor instead.
 func (*Message8457) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{33}
 }
@@ -3083,7 +3083,7 @@ func (x *Message8449) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8449.ProtoReflect.Type instead.
+// Deprecated: Use Message8449.ProtoReflect.Descriptor instead.
 func (*Message8449) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{34}
 }
@@ -3168,7 +3168,7 @@ func (x *Message13358) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message13358.ProtoReflect.Type instead.
+// Deprecated: Use Message13358.ProtoReflect.Descriptor instead.
 func (*Message13358) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{35}
 }
@@ -3226,7 +3226,7 @@ func (x *Message13912) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message13912.ProtoReflect.Type instead.
+// Deprecated: Use Message13912.ProtoReflect.Descriptor instead.
 func (*Message13912) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{36}
 }
@@ -3290,7 +3290,7 @@ func (x *Message24316) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message24316.ProtoReflect.Type instead.
+// Deprecated: Use Message24316.ProtoReflect.Descriptor instead.
 func (*Message24316) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{37}
 }
@@ -3350,7 +3350,7 @@ func (x *Message24312) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message24312.ProtoReflect.Type instead.
+// Deprecated: Use Message24312.ProtoReflect.Descriptor instead.
 func (*Message24312) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{38}
 }
@@ -3435,7 +3435,7 @@ func (x *Message24313) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message24313.ProtoReflect.Type instead.
+// Deprecated: Use Message24313.ProtoReflect.Descriptor instead.
 func (*Message24313) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{39}
 }
@@ -3541,7 +3541,7 @@ func (x *Message24315) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message24315.ProtoReflect.Type instead.
+// Deprecated: Use Message24315.ProtoReflect.Descriptor instead.
 func (*Message24315) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{40}
 }
@@ -3599,7 +3599,7 @@ func (x *Message716) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message716.ProtoReflect.Type instead.
+// Deprecated: Use Message716.ProtoReflect.Descriptor instead.
 func (*Message716) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{41}
 }
@@ -3663,7 +3663,7 @@ func (x *Message718) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message718.ProtoReflect.Type instead.
+// Deprecated: Use Message718.ProtoReflect.Descriptor instead.
 func (*Message718) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{42}
 }
@@ -3722,7 +3722,7 @@ func (x *Message703) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message703.ProtoReflect.Type instead.
+// Deprecated: Use Message703.ProtoReflect.Descriptor instead.
 func (*Message703) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{43}
 }
@@ -3803,7 +3803,7 @@ func (x *Message715) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message715.ProtoReflect.Type instead.
+// Deprecated: Use Message715.ProtoReflect.Descriptor instead.
 func (*Message715) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{44}
 }
@@ -3929,7 +3929,7 @@ func (x *Message700) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message700.ProtoReflect.Type instead.
+// Deprecated: Use Message700.ProtoReflect.Descriptor instead.
 func (*Message700) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{45}
 }
@@ -3978,7 +3978,7 @@ func (x *Message699) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message699.ProtoReflect.Type instead.
+// Deprecated: Use Message699.ProtoReflect.Descriptor instead.
 func (*Message699) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{46}
 }
@@ -4033,7 +4033,7 @@ func (x *Message698) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message698.ProtoReflect.Type instead.
+// Deprecated: Use Message698.ProtoReflect.Descriptor instead.
 func (*Message698) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{47}
 }
@@ -4126,7 +4126,7 @@ func (x *Message10155_Message10156) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10155_Message10156.ProtoReflect.Type instead.
+// Deprecated: Use Message10155_Message10156.ProtoReflect.Descriptor instead.
 func (*Message10155_Message10156) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{17, 0}
 }

+ 43 - 43
internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_6.pb.go

@@ -46,7 +46,7 @@ func (x *Message10576) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10576.ProtoReflect.Type instead.
+// Deprecated: Use Message10576.ProtoReflect.Descriptor instead.
 func (*Message10576) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{0}
 }
@@ -81,7 +81,7 @@ func (x *Message10154) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10154.ProtoReflect.Type instead.
+// Deprecated: Use Message10154.ProtoReflect.Descriptor instead.
 func (*Message10154) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{1}
 }
@@ -190,7 +190,7 @@ func (x *Message8944) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8944.ProtoReflect.Type instead.
+// Deprecated: Use Message8944.ProtoReflect.Descriptor instead.
 func (*Message8944) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{2}
 }
@@ -684,7 +684,7 @@ func (x *Message9182) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message9182.ProtoReflect.Type instead.
+// Deprecated: Use Message9182.ProtoReflect.Descriptor instead.
 func (*Message9182) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{3}
 }
@@ -697,7 +697,7 @@ var extRange_Message9182 = []protoiface.ExtensionRangeV1{
 	{Start: 1000, End: 536870911},
 }
 
-// Deprecated: Use Message9182.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use Message9182.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*Message9182) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_Message9182
 }
@@ -914,7 +914,7 @@ func (x *Message9160) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message9160.ProtoReflect.Type instead.
+// Deprecated: Use Message9160.ProtoReflect.Descriptor instead.
 func (*Message9160) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{4}
 }
@@ -962,7 +962,7 @@ func (x *Message9242) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message9242.ProtoReflect.Type instead.
+// Deprecated: Use Message9242.ProtoReflect.Descriptor instead.
 func (*Message9242) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{5}
 }
@@ -1003,7 +1003,7 @@ func (x *Message8890) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8890.ProtoReflect.Type instead.
+// Deprecated: Use Message8890.ProtoReflect.Descriptor instead.
 func (*Message8890) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{6}
 }
@@ -1044,7 +1044,7 @@ func (x *Message9123) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message9123.ProtoReflect.Type instead.
+// Deprecated: Use Message9123.ProtoReflect.Descriptor instead.
 func (*Message9123) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{7}
 }
@@ -1088,7 +1088,7 @@ func (x *Message9628) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message9628.ProtoReflect.Type instead.
+// Deprecated: Use Message9628.ProtoReflect.Descriptor instead.
 func (*Message9628) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{8}
 }
@@ -1214,7 +1214,7 @@ func (x *Message11014) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message11014.ProtoReflect.Type instead.
+// Deprecated: Use Message11014.ProtoReflect.Descriptor instead.
 func (*Message11014) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{9}
 }
@@ -1705,7 +1705,7 @@ func (x *Message10801) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10801.ProtoReflect.Type instead.
+// Deprecated: Use Message10801.ProtoReflect.Descriptor instead.
 func (*Message10801) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{10}
 }
@@ -1760,7 +1760,7 @@ func (x *Message10749) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10749.ProtoReflect.Type instead.
+// Deprecated: Use Message10749.ProtoReflect.Descriptor instead.
 func (*Message10749) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{11}
 }
@@ -1803,7 +1803,7 @@ func (x *Message8298) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8298.ProtoReflect.Type instead.
+// Deprecated: Use Message8298.ProtoReflect.Descriptor instead.
 func (*Message8298) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{12}
 }
@@ -1859,7 +1859,7 @@ func (x *Message8300) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8300.ProtoReflect.Type instead.
+// Deprecated: Use Message8300.ProtoReflect.Descriptor instead.
 func (*Message8300) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{13}
 }
@@ -1911,7 +1911,7 @@ func (x *Message8291) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8291.ProtoReflect.Type instead.
+// Deprecated: Use Message8291.ProtoReflect.Descriptor instead.
 func (*Message8291) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{14}
 }
@@ -1985,7 +1985,7 @@ func (x *Message8296) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8296.ProtoReflect.Type instead.
+// Deprecated: Use Message8296.ProtoReflect.Descriptor instead.
 func (*Message8296) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{15}
 }
@@ -2062,7 +2062,7 @@ func (x *Message7965) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7965.ProtoReflect.Type instead.
+// Deprecated: Use Message7965.ProtoReflect.Descriptor instead.
 func (*Message7965) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{16}
 }
@@ -2111,7 +2111,7 @@ func (x *Message8290) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8290.ProtoReflect.Type instead.
+// Deprecated: Use Message8290.ProtoReflect.Descriptor instead.
 func (*Message8290) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{17}
 }
@@ -2160,7 +2160,7 @@ func (x *Message717) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message717.ProtoReflect.Type instead.
+// Deprecated: Use Message717.ProtoReflect.Descriptor instead.
 func (*Message717) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{18}
 }
@@ -2209,7 +2209,7 @@ func (x *Message713) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message713.ProtoReflect.Type instead.
+// Deprecated: Use Message713.ProtoReflect.Descriptor instead.
 func (*Message713) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{19}
 }
@@ -2263,7 +2263,7 @@ func (x *Message705) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message705.ProtoReflect.Type instead.
+// Deprecated: Use Message705.ProtoReflect.Descriptor instead.
 func (*Message705) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{20}
 }
@@ -2350,7 +2350,7 @@ func (x *Message709) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message709.ProtoReflect.Type instead.
+// Deprecated: Use Message709.ProtoReflect.Descriptor instead.
 func (*Message709) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{21}
 }
@@ -2420,7 +2420,7 @@ func (x *Message702) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message702.ProtoReflect.Type instead.
+// Deprecated: Use Message702.ProtoReflect.Descriptor instead.
 func (*Message702) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{22}
 }
@@ -2472,7 +2472,7 @@ func (x *Message714) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message714.ProtoReflect.Type instead.
+// Deprecated: Use Message714.ProtoReflect.Descriptor instead.
 func (*Message714) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{23}
 }
@@ -2545,7 +2545,7 @@ func (x *Message710) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message710.ProtoReflect.Type instead.
+// Deprecated: Use Message710.ProtoReflect.Descriptor instead.
 func (*Message710) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{24}
 }
@@ -2617,7 +2617,7 @@ func (x *Message706) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message706.ProtoReflect.Type instead.
+// Deprecated: Use Message706.ProtoReflect.Descriptor instead.
 func (*Message706) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{25}
 }
@@ -2683,7 +2683,7 @@ func (x *Message707) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message707.ProtoReflect.Type instead.
+// Deprecated: Use Message707.ProtoReflect.Descriptor instead.
 func (*Message707) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{26}
 }
@@ -2755,7 +2755,7 @@ func (x *Message711) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message711.ProtoReflect.Type instead.
+// Deprecated: Use Message711.ProtoReflect.Descriptor instead.
 func (*Message711) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{27}
 }
@@ -2825,7 +2825,7 @@ func (x *Message712) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message712.ProtoReflect.Type instead.
+// Deprecated: Use Message712.ProtoReflect.Descriptor instead.
 func (*Message712) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{28}
 }
@@ -2943,7 +2943,7 @@ func (x *Message8939) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8939.ProtoReflect.Type instead.
+// Deprecated: Use Message8939.ProtoReflect.Descriptor instead.
 func (*Message8939) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{29}
 }
@@ -3131,7 +3131,7 @@ func (x *Message9181) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message9181.ProtoReflect.Type instead.
+// Deprecated: Use Message9181.ProtoReflect.Descriptor instead.
 func (*Message9181) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{30}
 }
@@ -3174,7 +3174,7 @@ func (x *Message9164) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message9164.ProtoReflect.Type instead.
+// Deprecated: Use Message9164.ProtoReflect.Descriptor instead.
 func (*Message9164) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{31}
 }
@@ -3230,7 +3230,7 @@ func (x *Message9165) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message9165.ProtoReflect.Type instead.
+// Deprecated: Use Message9165.ProtoReflect.Descriptor instead.
 func (*Message9165) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{32}
 }
@@ -3279,7 +3279,7 @@ func (x *Message9166) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message9166.ProtoReflect.Type instead.
+// Deprecated: Use Message9166.ProtoReflect.Descriptor instead.
 func (*Message9166) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{33}
 }
@@ -3334,7 +3334,7 @@ func (x *Message9151) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message9151.ProtoReflect.Type instead.
+// Deprecated: Use Message9151.ProtoReflect.Descriptor instead.
 func (*Message9151) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{34}
 }
@@ -3427,7 +3427,7 @@ func (x *Message8888) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8888.ProtoReflect.Type instead.
+// Deprecated: Use Message8888.ProtoReflect.Descriptor instead.
 func (*Message8888) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{35}
 }
@@ -3493,7 +3493,7 @@ func (x *Message9627) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message9627.ProtoReflect.Type instead.
+// Deprecated: Use Message9627.ProtoReflect.Descriptor instead.
 func (*Message9627) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{36}
 }
@@ -3561,7 +3561,7 @@ func (x *Message11020) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message11020.ProtoReflect.Type instead.
+// Deprecated: Use Message11020.ProtoReflect.Descriptor instead.
 func (*Message11020) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{37}
 }
@@ -3617,7 +3617,7 @@ func (x *Message11013) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message11013.ProtoReflect.Type instead.
+// Deprecated: Use Message11013.ProtoReflect.Descriptor instead.
 func (*Message11013) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{38}
 }
@@ -3811,7 +3811,7 @@ func (x *Message8939_Message8940) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8939_Message8940.ProtoReflect.Type instead.
+// Deprecated: Use Message8939_Message8940.ProtoReflect.Descriptor instead.
 func (*Message8939_Message8940) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{29, 0}
 }
@@ -3850,7 +3850,7 @@ func (x *Message8939_Message8941) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8939_Message8941.ProtoReflect.Type instead.
+// Deprecated: Use Message8939_Message8941.ProtoReflect.Descriptor instead.
 func (*Message8939_Message8941) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{29, 1}
 }
@@ -3931,7 +3931,7 @@ func (x *Message8939_Message8943) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8939_Message8943.ProtoReflect.Type instead.
+// Deprecated: Use Message8939_Message8943.ProtoReflect.Descriptor instead.
 func (*Message8939_Message8943) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{29, 2}
 }

+ 10 - 10
internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_7.pb.go

@@ -45,7 +45,7 @@ func (x *Message11018) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message11018.ProtoReflect.Type instead.
+// Deprecated: Use Message11018.ProtoReflect.Descriptor instead.
 func (*Message11018) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_7_proto_rawDescGZIP(), []int{0}
 }
@@ -82,7 +82,7 @@ func (x *Message10800) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10800.ProtoReflect.Type instead.
+// Deprecated: Use Message10800.ProtoReflect.Descriptor instead.
 func (*Message10800) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_7_proto_rawDescGZIP(), []int{1}
 }
@@ -143,7 +143,7 @@ func (x *Message10802) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10802.ProtoReflect.Type instead.
+// Deprecated: Use Message10802.ProtoReflect.Descriptor instead.
 func (*Message10802) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_7_proto_rawDescGZIP(), []int{2}
 }
@@ -180,7 +180,7 @@ func (x *Message10748) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10748.ProtoReflect.Type instead.
+// Deprecated: Use Message10748.ProtoReflect.Descriptor instead.
 func (*Message10748) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_7_proto_rawDescGZIP(), []int{3}
 }
@@ -243,7 +243,7 @@ func (x *Message7966) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7966.ProtoReflect.Type instead.
+// Deprecated: Use Message7966.ProtoReflect.Descriptor instead.
 func (*Message7966) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_7_proto_rawDescGZIP(), []int{4}
 }
@@ -296,7 +296,7 @@ func (x *Message708) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message708.ProtoReflect.Type instead.
+// Deprecated: Use Message708.ProtoReflect.Descriptor instead.
 func (*Message708) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_7_proto_rawDescGZIP(), []int{5}
 }
@@ -371,7 +371,7 @@ func (x *Message8942) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8942.ProtoReflect.Type instead.
+// Deprecated: Use Message8942.ProtoReflect.Descriptor instead.
 func (*Message8942) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_7_proto_rawDescGZIP(), []int{6}
 }
@@ -406,7 +406,7 @@ func (x *Message11011) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message11011.ProtoReflect.Type instead.
+// Deprecated: Use Message11011.ProtoReflect.Descriptor instead.
 func (*Message11011) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_7_proto_rawDescGZIP(), []int{7}
 }
@@ -453,7 +453,7 @@ func (x *UnusedEmptyMessage) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use UnusedEmptyMessage.ProtoReflect.Type instead.
+// Deprecated: Use UnusedEmptyMessage.ProtoReflect.Descriptor instead.
 func (*UnusedEmptyMessage) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_7_proto_rawDescGZIP(), []int{8}
 }
@@ -487,7 +487,7 @@ func (x *Message741) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message741.ProtoReflect.Type instead.
+// Deprecated: Use Message741.ProtoReflect.Descriptor instead.
 func (*Message741) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_7_proto_rawDescGZIP(), []int{9}
 }

+ 59 - 59
internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_8.pb.go

@@ -67,7 +67,7 @@ func (x *Enum720) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum720.Type instead.
+// Deprecated: Use Enum720.Descriptor instead.
 func (Enum720) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{0}
 }
@@ -667,7 +667,7 @@ func (x *Enum3476) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum3476.Type instead.
+// Deprecated: Use Enum3476.Descriptor instead.
 func (Enum3476) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{1}
 }
@@ -751,7 +751,7 @@ func (x *Enum3805) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum3805.Type instead.
+// Deprecated: Use Enum3805.Descriptor instead.
 func (Enum3805) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{2}
 }
@@ -859,7 +859,7 @@ func (x *Enum3783) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum3783.Type instead.
+// Deprecated: Use Enum3783.Descriptor instead.
 func (Enum3783) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{3}
 }
@@ -961,7 +961,7 @@ func (x *Enum3851) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum3851.Type instead.
+// Deprecated: Use Enum3851.Descriptor instead.
 func (Enum3851) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{4}
 }
@@ -1015,7 +1015,7 @@ func (x *UnusedEnum) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use UnusedEnum.Type instead.
+// Deprecated: Use UnusedEnum.Descriptor instead.
 func (UnusedEnum) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{5}
 }
@@ -1078,7 +1078,7 @@ func (x *Enum4146) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum4146.Type instead.
+// Deprecated: Use Enum4146.Descriptor instead.
 func (Enum4146) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{6}
 }
@@ -1132,7 +1132,7 @@ func (x *Enum4160) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum4160.Type instead.
+// Deprecated: Use Enum4160.Descriptor instead.
 func (Enum4160) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{7}
 }
@@ -1201,7 +1201,7 @@ func (x *Enum4152) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum4152.Type instead.
+// Deprecated: Use Enum4152.Descriptor instead.
 func (Enum4152) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{8}
 }
@@ -1315,7 +1315,7 @@ func (x *Enum6025) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum6025.Type instead.
+// Deprecated: Use Enum6025.Descriptor instead.
 func (Enum6025) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{9}
 }
@@ -1408,7 +1408,7 @@ func (x *Enum6065) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum6065.Type instead.
+// Deprecated: Use Enum6065.Descriptor instead.
 func (Enum6065) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{10}
 }
@@ -1480,7 +1480,7 @@ func (x *Enum6579) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum6579.Type instead.
+// Deprecated: Use Enum6579.Descriptor instead.
 func (Enum6579) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{11}
 }
@@ -1630,7 +1630,7 @@ func (x *Enum6588) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum6588.Type instead.
+// Deprecated: Use Enum6588.Descriptor instead.
 func (Enum6588) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{12}
 }
@@ -1687,7 +1687,7 @@ func (x *Enum6769) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum6769.Type instead.
+// Deprecated: Use Enum6769.Descriptor instead.
 func (Enum6769) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{13}
 }
@@ -1756,7 +1756,7 @@ func (x *Enum6774) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum6774.Type instead.
+// Deprecated: Use Enum6774.Descriptor instead.
 func (Enum6774) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{14}
 }
@@ -1822,7 +1822,7 @@ func (x *Enum6782) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum6782.Type instead.
+// Deprecated: Use Enum6782.Descriptor instead.
 func (Enum6782) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{15}
 }
@@ -1882,7 +1882,7 @@ func (x *Enum6858) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum6858.Type instead.
+// Deprecated: Use Enum6858.Descriptor instead.
 func (Enum6858) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{16}
 }
@@ -1948,7 +1948,7 @@ func (x *Enum6815) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum6815.Type instead.
+// Deprecated: Use Enum6815.Descriptor instead.
 func (Enum6815) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{17}
 }
@@ -2008,7 +2008,7 @@ func (x *Enum6822) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum6822.Type instead.
+// Deprecated: Use Enum6822.Descriptor instead.
 func (Enum6822) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{18}
 }
@@ -2065,7 +2065,7 @@ func (x *Enum7654) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum7654.Type instead.
+// Deprecated: Use Enum7654.Descriptor instead.
 func (Enum7654) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{19}
 }
@@ -2122,7 +2122,7 @@ func (x *Enum8292) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum8292.Type instead.
+// Deprecated: Use Enum8292.Descriptor instead.
 func (Enum8292) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{20}
 }
@@ -2179,7 +2179,7 @@ func (x *Enum8450) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum8450.Type instead.
+// Deprecated: Use Enum8450.Descriptor instead.
 func (Enum8450) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{21}
 }
@@ -2242,7 +2242,7 @@ func (x *Enum8900) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum8900.Type instead.
+// Deprecated: Use Enum8900.Descriptor instead.
 func (Enum8900) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{22}
 }
@@ -2305,7 +2305,7 @@ func (x *Enum8945) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum8945.Type instead.
+// Deprecated: Use Enum8945.Descriptor instead.
 func (Enum8945) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{23}
 }
@@ -2377,7 +2377,7 @@ func (x *Enum8951) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum8951.Type instead.
+// Deprecated: Use Enum8951.Descriptor instead.
 func (Enum8951) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{24}
 }
@@ -2674,7 +2674,7 @@ func (x *Enum9243) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum9243.Type instead.
+// Deprecated: Use Enum9243.Descriptor instead.
 func (Enum9243) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{25}
 }
@@ -2749,7 +2749,7 @@ func (x *Enum10157) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum10157.Type instead.
+// Deprecated: Use Enum10157.Descriptor instead.
 func (Enum10157) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{26}
 }
@@ -2824,7 +2824,7 @@ func (x *Enum10167) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum10167.Type instead.
+// Deprecated: Use Enum10167.Descriptor instead.
 func (Enum10167) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{27}
 }
@@ -2920,7 +2920,7 @@ func (x *Enum8862) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum8862.Type instead.
+// Deprecated: Use Enum8862.Descriptor instead.
 func (Enum8862) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{28}
 }
@@ -2995,7 +2995,7 @@ func (x *Enum10325) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum10325.Type instead.
+// Deprecated: Use Enum10325.Descriptor instead.
 func (Enum10325) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{29}
 }
@@ -3046,7 +3046,7 @@ func (x *Enum10335) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum10335.Type instead.
+// Deprecated: Use Enum10335.Descriptor instead.
 func (Enum10335) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{30}
 }
@@ -3100,7 +3100,7 @@ func (x *Enum10337) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum10337.Type instead.
+// Deprecated: Use Enum10337.Descriptor instead.
 func (Enum10337) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{31}
 }
@@ -3202,7 +3202,7 @@ func (x *Enum10392) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum10392.Type instead.
+// Deprecated: Use Enum10392.Descriptor instead.
 func (Enum10392) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{32}
 }
@@ -4330,7 +4330,7 @@ func (x *Enum11107) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum11107.Type instead.
+// Deprecated: Use Enum11107.Descriptor instead.
 func (Enum11107) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{33}
 }
@@ -4951,7 +4951,7 @@ func (x *Enum11541) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum11541.Type instead.
+// Deprecated: Use Enum11541.Descriptor instead.
 func (Enum11541) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{34}
 }
@@ -5071,7 +5071,7 @@ func (x *Enum11468) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum11468.Type instead.
+// Deprecated: Use Enum11468.Descriptor instead.
 func (Enum11468) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{35}
 }
@@ -5371,7 +5371,7 @@ func (x *Enum11022) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum11022.Type instead.
+// Deprecated: Use Enum11022.Descriptor instead.
 func (Enum11022) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{36}
 }
@@ -5428,7 +5428,7 @@ func (x *Enum12670) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum12670.Type instead.
+// Deprecated: Use Enum12670.Descriptor instead.
 func (Enum12670) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{37}
 }
@@ -5494,7 +5494,7 @@ func (x *Enum12871) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum12871.Type instead.
+// Deprecated: Use Enum12871.Descriptor instead.
 func (Enum12871) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{38}
 }
@@ -5551,7 +5551,7 @@ func (x *Enum13092) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum13092.Type instead.
+// Deprecated: Use Enum13092.Descriptor instead.
 func (Enum13092) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{39}
 }
@@ -5611,7 +5611,7 @@ func (x *Enum13146) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum13146.Type instead.
+// Deprecated: Use Enum13146.Descriptor instead.
 func (Enum13146) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{40}
 }
@@ -6745,7 +6745,7 @@ func (x *Enum16042) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum16042.Type instead.
+// Deprecated: Use Enum16042.Descriptor instead.
 func (Enum16042) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{41}
 }
@@ -6823,7 +6823,7 @@ func (x *Enum16553) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum16553.Type instead.
+// Deprecated: Use Enum16553.Descriptor instead.
 func (Enum16553) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{42}
 }
@@ -6880,7 +6880,7 @@ func (x *Enum16728) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum16728.Type instead.
+// Deprecated: Use Enum16728.Descriptor instead.
 func (Enum16728) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{43}
 }
@@ -6943,7 +6943,7 @@ func (x *Enum16732) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum16732.Type instead.
+// Deprecated: Use Enum16732.Descriptor instead.
 func (Enum16732) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{44}
 }
@@ -7012,7 +7012,7 @@ func (x *Enum16738) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum16738.Type instead.
+// Deprecated: Use Enum16738.Descriptor instead.
 func (Enum16738) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{45}
 }
@@ -7129,7 +7129,7 @@ func (x *Enum16698) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum16698.Type instead.
+// Deprecated: Use Enum16698.Descriptor instead.
 func (Enum16698) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{46}
 }
@@ -7195,7 +7195,7 @@ func (x *Enum16819) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum16819.Type instead.
+// Deprecated: Use Enum16819.Descriptor instead.
 func (Enum16819) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{47}
 }
@@ -7285,7 +7285,7 @@ func (x *Enum16925) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum16925.Type instead.
+// Deprecated: Use Enum16925.Descriptor instead.
 func (Enum16925) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{48}
 }
@@ -7339,7 +7339,7 @@ func (x *Enum22854) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum22854.Type instead.
+// Deprecated: Use Enum22854.Descriptor instead.
 func (Enum22854) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{49}
 }
@@ -7399,7 +7399,7 @@ func (x *Enum24361) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum24361.Type instead.
+// Deprecated: Use Enum24361.Descriptor instead.
 func (Enum24361) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{50}
 }
@@ -7543,7 +7543,7 @@ func (x *Enum16891) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum16891.Type instead.
+// Deprecated: Use Enum16891.Descriptor instead.
 func (Enum16891) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{51}
 }
@@ -7606,7 +7606,7 @@ func (x *Enum27361) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum27361.Type instead.
+// Deprecated: Use Enum27361.Descriptor instead.
 func (Enum27361) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{52}
 }
@@ -7675,7 +7675,7 @@ func (x *Enum33960) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum33960.Type instead.
+// Deprecated: Use Enum33960.Descriptor instead.
 func (Enum33960) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{53}
 }
@@ -7726,7 +7726,7 @@ func (x *Enum34388) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum34388.Type instead.
+// Deprecated: Use Enum34388.Descriptor instead.
 func (Enum34388) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{54}
 }
@@ -7789,7 +7789,7 @@ func (x *Enum35477) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum35477.Type instead.
+// Deprecated: Use Enum35477.Descriptor instead.
 func (Enum35477) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{55}
 }
@@ -7867,7 +7867,7 @@ func (x *Enum35507) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum35507.Type instead.
+// Deprecated: Use Enum35507.Descriptor instead.
 func (Enum35507) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{56}
 }
@@ -7939,7 +7939,7 @@ func (x *Enum36860) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum36860.Type instead.
+// Deprecated: Use Enum36860.Descriptor instead.
 func (Enum36860) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{57}
 }
@@ -7993,7 +7993,7 @@ func (x *Enum36890) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum36890.Type instead.
+// Deprecated: Use Enum36890.Descriptor instead.
 func (Enum36890) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{58}
 }

+ 47 - 47
internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4.pb.go

@@ -62,7 +62,7 @@ func (x *GoogleMessage4) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use GoogleMessage4.ProtoReflect.Type instead.
+// Deprecated: Use GoogleMessage4.ProtoReflect.Descriptor instead.
 func (*GoogleMessage4) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{0}
 }
@@ -228,7 +228,7 @@ func (x *Message37489) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message37489.ProtoReflect.Type instead.
+// Deprecated: Use Message37489.ProtoReflect.Descriptor instead.
 func (*Message37489) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{1}
 }
@@ -410,7 +410,7 @@ func (x *Message7319) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7319.ProtoReflect.Type instead.
+// Deprecated: Use Message7319.ProtoReflect.Descriptor instead.
 func (*Message7319) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{2}
 }
@@ -466,7 +466,7 @@ func (x *Message12717) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12717.ProtoReflect.Type instead.
+// Deprecated: Use Message12717.ProtoReflect.Descriptor instead.
 func (*Message12717) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{3}
 }
@@ -566,7 +566,7 @@ func (x *Message37331) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message37331.ProtoReflect.Type instead.
+// Deprecated: Use Message37331.ProtoReflect.Descriptor instead.
 func (*Message37331) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{4}
 }
@@ -630,7 +630,7 @@ func (x *Message8815) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8815.ProtoReflect.Type instead.
+// Deprecated: Use Message8815.ProtoReflect.Descriptor instead.
 func (*Message8815) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{5}
 }
@@ -690,7 +690,7 @@ func (x *Message7330) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7330.ProtoReflect.Type instead.
+// Deprecated: Use Message7330.ProtoReflect.Descriptor instead.
 func (*Message7330) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{6}
 }
@@ -767,7 +767,7 @@ func (x *Message12960) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12960.ProtoReflect.Type instead.
+// Deprecated: Use Message12960.ProtoReflect.Descriptor instead.
 func (*Message12960) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{7}
 }
@@ -873,7 +873,7 @@ func (x *Message176) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message176.ProtoReflect.Type instead.
+// Deprecated: Use Message176.ProtoReflect.Descriptor instead.
 func (*Message176) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{8}
 }
@@ -1322,7 +1322,7 @@ func (x *Message8817) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8817.ProtoReflect.Type instead.
+// Deprecated: Use Message8817.ProtoReflect.Descriptor instead.
 func (*Message8817) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{9}
 }
@@ -1379,7 +1379,7 @@ func (x *Message8835) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8835.ProtoReflect.Type instead.
+// Deprecated: Use Message8835.ProtoReflect.Descriptor instead.
 func (*Message8835) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{10}
 }
@@ -1436,7 +1436,7 @@ func (x *Message37333) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message37333.ProtoReflect.Type instead.
+// Deprecated: Use Message37333.ProtoReflect.Descriptor instead.
 func (*Message37333) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{11}
 }
@@ -1492,7 +1492,7 @@ func (x *Message13000) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message13000.ProtoReflect.Type instead.
+// Deprecated: Use Message13000.ProtoReflect.Descriptor instead.
 func (*Message13000) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{12}
 }
@@ -1543,7 +1543,7 @@ func (x *Message37335) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message37335.ProtoReflect.Type instead.
+// Deprecated: Use Message37335.ProtoReflect.Descriptor instead.
 func (*Message37335) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{13}
 }
@@ -1607,7 +1607,7 @@ func (x *Message8848) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8848.ProtoReflect.Type instead.
+// Deprecated: Use Message8848.ProtoReflect.Descriptor instead.
 func (*Message8848) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{14}
 }
@@ -1663,7 +1663,7 @@ func (x *Message13035) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message13035.ProtoReflect.Type instead.
+// Deprecated: Use Message13035.ProtoReflect.Descriptor instead.
 func (*Message13035) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{15}
 }
@@ -1712,7 +1712,7 @@ func (x *Message8856) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8856.ProtoReflect.Type instead.
+// Deprecated: Use Message8856.ProtoReflect.Descriptor instead.
 func (*Message8856) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{16}
 }
@@ -1765,7 +1765,7 @@ func (x *Message12908) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12908.ProtoReflect.Type instead.
+// Deprecated: Use Message12908.ProtoReflect.Descriptor instead.
 func (*Message12908) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{17}
 }
@@ -1843,7 +1843,7 @@ func (x *Message12910) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12910.ProtoReflect.Type instead.
+// Deprecated: Use Message12910.ProtoReflect.Descriptor instead.
 func (*Message12910) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{18}
 }
@@ -1908,7 +1908,7 @@ func (x *Message37327) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message37327.ProtoReflect.Type instead.
+// Deprecated: Use Message37327.ProtoReflect.Descriptor instead.
 func (*Message37327) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{19}
 }
@@ -2023,7 +2023,7 @@ func (x *Message37329) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message37329.ProtoReflect.Type instead.
+// Deprecated: Use Message37329.ProtoReflect.Descriptor instead.
 func (*Message37329) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{20}
 }
@@ -2096,7 +2096,7 @@ func (x *Message2517) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message2517.ProtoReflect.Type instead.
+// Deprecated: Use Message2517.ProtoReflect.Descriptor instead.
 func (*Message2517) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{21}
 }
@@ -2168,7 +2168,7 @@ func (x *Message12748) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12748.ProtoReflect.Type instead.
+// Deprecated: Use Message12748.ProtoReflect.Descriptor instead.
 func (*Message12748) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{22}
 }
@@ -2230,7 +2230,7 @@ func (x *Message12687) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12687.ProtoReflect.Type instead.
+// Deprecated: Use Message12687.ProtoReflect.Descriptor instead.
 func (*Message12687) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{23}
 }
@@ -2273,7 +2273,7 @@ func (x *Message11948) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message11948.ProtoReflect.Type instead.
+// Deprecated: Use Message11948.ProtoReflect.Descriptor instead.
 func (*Message11948) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{24}
 }
@@ -2328,7 +2328,7 @@ func (x *Message11976) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message11976.ProtoReflect.Type instead.
+// Deprecated: Use Message11976.ProtoReflect.Descriptor instead.
 func (*Message11976) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{25}
 }
@@ -2370,7 +2370,7 @@ func (x *Message7320) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7320.ProtoReflect.Type instead.
+// Deprecated: Use Message7320.ProtoReflect.Descriptor instead.
 func (*Message7320) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{26}
 }
@@ -2421,7 +2421,7 @@ func (x *Message3069) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3069.ProtoReflect.Type instead.
+// Deprecated: Use Message3069.ProtoReflect.Descriptor instead.
 func (*Message3069) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{27}
 }
@@ -2430,7 +2430,7 @@ var extRange_Message3069 = []protoiface.ExtensionRangeV1{
 	{Start: 10000, End: 536870911},
 }
 
-// Deprecated: Use Message3069.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use Message3069.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*Message3069) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_Message3069
 }
@@ -2485,7 +2485,7 @@ func (x *Message12948) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12948.ProtoReflect.Type instead.
+// Deprecated: Use Message12948.ProtoReflect.Descriptor instead.
 func (*Message12948) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{28}
 }
@@ -2532,7 +2532,7 @@ func (x *Message8768) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8768.ProtoReflect.Type instead.
+// Deprecated: Use Message8768.ProtoReflect.Descriptor instead.
 func (*Message8768) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{29}
 }
@@ -2621,7 +2621,7 @@ func (x *Message12979) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12979.ProtoReflect.Type instead.
+// Deprecated: Use Message12979.ProtoReflect.Descriptor instead.
 func (*Message12979) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{30}
 }
@@ -2728,7 +2728,7 @@ func (x *Message37173) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message37173.ProtoReflect.Type instead.
+// Deprecated: Use Message37173.ProtoReflect.Descriptor instead.
 func (*Message37173) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{31}
 }
@@ -2944,7 +2944,7 @@ func (x *Message12799) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12799.ProtoReflect.Type instead.
+// Deprecated: Use Message12799.ProtoReflect.Descriptor instead.
 func (*Message12799) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{32}
 }
@@ -3053,7 +3053,7 @@ func (x *Message12870) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12870.ProtoReflect.Type instead.
+// Deprecated: Use Message12870.ProtoReflect.Descriptor instead.
 func (*Message12870) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{33}
 }
@@ -3233,7 +3233,7 @@ func (x *Message3804) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3804.ProtoReflect.Type instead.
+// Deprecated: Use Message3804.ProtoReflect.Descriptor instead.
 func (*Message3804) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{34}
 }
@@ -3318,7 +3318,7 @@ func (x *Message12903) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12903.ProtoReflect.Type instead.
+// Deprecated: Use Message12903.ProtoReflect.Descriptor instead.
 func (*Message12903) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{35}
 }
@@ -3374,7 +3374,7 @@ func (x *Message37326) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message37326.ProtoReflect.Type instead.
+// Deprecated: Use Message37326.ProtoReflect.Descriptor instead.
 func (*Message37326) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{36}
 }
@@ -3452,7 +3452,7 @@ func (x *Message2356) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message2356.ProtoReflect.Type instead.
+// Deprecated: Use Message2356.ProtoReflect.Descriptor instead.
 func (*Message2356) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{37}
 }
@@ -3703,7 +3703,7 @@ func (x *Message0) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message0.ProtoReflect.Type instead.
+// Deprecated: Use Message0.ProtoReflect.Descriptor instead.
 func (*Message0) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{38}
 }
@@ -3712,7 +3712,7 @@ var extRange_Message0 = []protoiface.ExtensionRangeV1{
 	{Start: 4, End: 2147483646},
 }
 
-// Deprecated: Use Message0.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use Message0.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*Message0) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_Message0
 }
@@ -3748,7 +3748,7 @@ func (x *Message971) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message971.ProtoReflect.Type instead.
+// Deprecated: Use Message971.ProtoReflect.Descriptor instead.
 func (*Message971) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{39}
 }
@@ -3802,7 +3802,7 @@ func (x *Message176_Message178) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message176_Message178.ProtoReflect.Type instead.
+// Deprecated: Use Message176_Message178.ProtoReflect.Descriptor instead.
 func (*Message176_Message178) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{8, 0}
 }
@@ -3837,7 +3837,7 @@ func (x *Message3069_Message3070) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3069_Message3070.ProtoReflect.Type instead.
+// Deprecated: Use Message3069_Message3070.ProtoReflect.Descriptor instead.
 func (*Message3069_Message3070) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{27, 0}
 }
@@ -3896,7 +3896,7 @@ func (x *Message2356_Message2357) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message2356_Message2357.ProtoReflect.Type instead.
+// Deprecated: Use Message2356_Message2357.ProtoReflect.Descriptor instead.
 func (*Message2356_Message2357) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{37, 0}
 }
@@ -4013,7 +4013,7 @@ func (x *Message2356_Message2358) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message2356_Message2358.ProtoReflect.Type instead.
+// Deprecated: Use Message2356_Message2358.ProtoReflect.Descriptor instead.
 func (*Message2356_Message2358) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{37, 1}
 }
@@ -4046,7 +4046,7 @@ func (x *Message2356_Message2359) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message2356_Message2359.ProtoReflect.Type instead.
+// Deprecated: Use Message2356_Message2359.ProtoReflect.Descriptor instead.
 func (*Message2356_Message2359) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{37, 2}
 }

+ 46 - 46
internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4_1.pb.go

@@ -47,7 +47,7 @@ func (x *Message2463) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message2463.ProtoReflect.Type instead.
+// Deprecated: Use Message2463.ProtoReflect.Descriptor instead.
 func (*Message2463) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{0}
 }
@@ -89,7 +89,7 @@ func (x *Message12686) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12686.ProtoReflect.Type instead.
+// Deprecated: Use Message12686.ProtoReflect.Descriptor instead.
 func (*Message12686) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{1}
 }
@@ -136,7 +136,7 @@ func (x *Message11949) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message11949.ProtoReflect.Type instead.
+// Deprecated: Use Message11949.ProtoReflect.Descriptor instead.
 func (*Message11949) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{2}
 }
@@ -179,7 +179,7 @@ func (x *Message11975) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message11975.ProtoReflect.Type instead.
+// Deprecated: Use Message11975.ProtoReflect.Descriptor instead.
 func (*Message11975) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{3}
 }
@@ -290,7 +290,7 @@ func (x *Message7287) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7287.ProtoReflect.Type instead.
+// Deprecated: Use Message7287.ProtoReflect.Descriptor instead.
 func (*Message7287) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{4}
 }
@@ -427,7 +427,7 @@ func (x *Message3061) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3061.ProtoReflect.Type instead.
+// Deprecated: Use Message3061.ProtoReflect.Descriptor instead.
 func (*Message3061) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{5}
 }
@@ -796,7 +796,7 @@ func (x *Message12949) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12949.ProtoReflect.Type instead.
+// Deprecated: Use Message12949.ProtoReflect.Descriptor instead.
 func (*Message12949) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{6}
 }
@@ -879,7 +879,7 @@ func (x *Message8572) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8572.ProtoReflect.Type instead.
+// Deprecated: Use Message8572.ProtoReflect.Descriptor instead.
 func (*Message8572) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{7}
 }
@@ -1267,7 +1267,7 @@ func (x *Message8774) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8774.ProtoReflect.Type instead.
+// Deprecated: Use Message8774.ProtoReflect.Descriptor instead.
 func (*Message8774) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{8}
 }
@@ -1346,7 +1346,7 @@ func (x *Message12776) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12776.ProtoReflect.Type instead.
+// Deprecated: Use Message12776.ProtoReflect.Descriptor instead.
 func (*Message12776) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{9}
 }
@@ -1360,7 +1360,7 @@ var extRange_Message12776 = []protoiface.ExtensionRangeV1{
 	{Start: 9, End: 9},
 }
 
-// Deprecated: Use Message12776.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use Message12776.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*Message12776) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_Message12776
 }
@@ -1467,7 +1467,7 @@ func (x *Message12798) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12798.ProtoReflect.Type instead.
+// Deprecated: Use Message12798.ProtoReflect.Descriptor instead.
 func (*Message12798) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{10}
 }
@@ -1531,7 +1531,7 @@ func (x *Message12797) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12797.ProtoReflect.Type instead.
+// Deprecated: Use Message12797.ProtoReflect.Descriptor instead.
 func (*Message12797) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{11}
 }
@@ -1592,7 +1592,7 @@ func (x *Message12825) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12825.ProtoReflect.Type instead.
+// Deprecated: Use Message12825.ProtoReflect.Descriptor instead.
 func (*Message12825) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{12}
 }
@@ -1674,7 +1674,7 @@ func (x *Message8590) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8590.ProtoReflect.Type instead.
+// Deprecated: Use Message8590.ProtoReflect.Descriptor instead.
 func (*Message8590) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{13}
 }
@@ -1707,7 +1707,7 @@ func (x *Message8587) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8587.ProtoReflect.Type instead.
+// Deprecated: Use Message8587.ProtoReflect.Descriptor instead.
 func (*Message8587) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{14}
 }
@@ -1742,7 +1742,7 @@ func (x *Message1374) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message1374.ProtoReflect.Type instead.
+// Deprecated: Use Message1374.ProtoReflect.Descriptor instead.
 func (*Message1374) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{15}
 }
@@ -1791,7 +1791,7 @@ func (x *Message2462) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message2462.ProtoReflect.Type instead.
+// Deprecated: Use Message2462.ProtoReflect.Descriptor instead.
 func (*Message2462) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{16}
 }
@@ -1845,7 +1845,7 @@ func (x *Message12685) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12685.ProtoReflect.Type instead.
+// Deprecated: Use Message12685.ProtoReflect.Descriptor instead.
 func (*Message12685) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{17}
 }
@@ -1934,7 +1934,7 @@ func (x *Message10320) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10320.ProtoReflect.Type instead.
+// Deprecated: Use Message10320.ProtoReflect.Descriptor instead.
 func (*Message10320) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{18}
 }
@@ -2019,7 +2019,7 @@ func (x *Message11947) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message11947.ProtoReflect.Type instead.
+// Deprecated: Use Message11947.ProtoReflect.Descriptor instead.
 func (*Message11947) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{19}
 }
@@ -2075,7 +2075,7 @@ func (x *Message11920) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message11920.ProtoReflect.Type instead.
+// Deprecated: Use Message11920.ProtoReflect.Descriptor instead.
 func (*Message11920) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{20}
 }
@@ -2140,7 +2140,7 @@ func (x *Message6643) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6643.ProtoReflect.Type instead.
+// Deprecated: Use Message6643.ProtoReflect.Descriptor instead.
 func (*Message6643) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{21}
 }
@@ -2319,7 +2319,7 @@ func (x *Message6133) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6133.ProtoReflect.Type instead.
+// Deprecated: Use Message6133.ProtoReflect.Descriptor instead.
 func (*Message6133) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{22}
 }
@@ -2505,7 +2505,7 @@ func (x *Message6109) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6109.ProtoReflect.Type instead.
+// Deprecated: Use Message6109.ProtoReflect.Descriptor instead.
 func (*Message6109) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{23}
 }
@@ -2514,7 +2514,7 @@ var extRange_Message6109 = []protoiface.ExtensionRangeV1{
 	{Start: 1000, End: 536870911},
 }
 
-// Deprecated: Use Message6109.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use Message6109.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*Message6109) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_Message6109
 }
@@ -2633,7 +2633,7 @@ func (x *Message3046) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3046.ProtoReflect.Type instead.
+// Deprecated: Use Message3046.ProtoReflect.Descriptor instead.
 func (*Message3046) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{24}
 }
@@ -2683,7 +2683,7 @@ func (x *Message3060) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3060.ProtoReflect.Type instead.
+// Deprecated: Use Message3060.ProtoReflect.Descriptor instead.
 func (*Message3060) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{25}
 }
@@ -2739,7 +2739,7 @@ func (x *Message3041) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3041.ProtoReflect.Type instead.
+// Deprecated: Use Message3041.ProtoReflect.Descriptor instead.
 func (*Message3041) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{26}
 }
@@ -2791,7 +2791,7 @@ func (x *Message3040) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3040.ProtoReflect.Type instead.
+// Deprecated: Use Message3040.ProtoReflect.Descriptor instead.
 func (*Message3040) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{27}
 }
@@ -2865,7 +2865,7 @@ func (x *Message3050) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3050.ProtoReflect.Type instead.
+// Deprecated: Use Message3050.ProtoReflect.Descriptor instead.
 func (*Message3050) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{28}
 }
@@ -2947,7 +2947,7 @@ func (x *Message7905) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7905.ProtoReflect.Type instead.
+// Deprecated: Use Message7905.ProtoReflect.Descriptor instead.
 func (*Message7905) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{29}
 }
@@ -3030,7 +3030,7 @@ func (x *Message3886) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3886.ProtoReflect.Type instead.
+// Deprecated: Use Message3886.ProtoReflect.Descriptor instead.
 func (*Message3886) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{30}
 }
@@ -3076,7 +3076,7 @@ func (x *Message7864) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7864.ProtoReflect.Type instead.
+// Deprecated: Use Message7864.ProtoReflect.Descriptor instead.
 func (*Message7864) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{31}
 }
@@ -3152,7 +3152,7 @@ func (x *Message3922) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3922.ProtoReflect.Type instead.
+// Deprecated: Use Message3922.ProtoReflect.Descriptor instead.
 func (*Message3922) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{32}
 }
@@ -3201,7 +3201,7 @@ func (x *Message3052) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3052.ProtoReflect.Type instead.
+// Deprecated: Use Message3052.ProtoReflect.Descriptor instead.
 func (*Message3052) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{33}
 }
@@ -3297,7 +3297,7 @@ func (x *Message8575) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8575.ProtoReflect.Type instead.
+// Deprecated: Use Message8575.ProtoReflect.Descriptor instead.
 func (*Message8575) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{34}
 }
@@ -3346,7 +3346,7 @@ func (x *Message7843) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7843.ProtoReflect.Type instead.
+// Deprecated: Use Message7843.ProtoReflect.Descriptor instead.
 func (*Message7843) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{35}
 }
@@ -3492,7 +3492,7 @@ func (x *Message3919) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3919.ProtoReflect.Type instead.
+// Deprecated: Use Message3919.ProtoReflect.Descriptor instead.
 func (*Message3919) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{36}
 }
@@ -3552,7 +3552,7 @@ func (x *Message7929) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7929.ProtoReflect.Type instead.
+// Deprecated: Use Message7929.ProtoReflect.Descriptor instead.
 func (*Message7929) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{37}
 }
@@ -3728,7 +3728,7 @@ func (x *Message3061_Message3062) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3061_Message3062.ProtoReflect.Type instead.
+// Deprecated: Use Message3061_Message3062.ProtoReflect.Descriptor instead.
 func (*Message3061_Message3062) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{5, 0}
 }
@@ -3786,7 +3786,7 @@ func (x *Message3061_Message3063) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3061_Message3063.ProtoReflect.Type instead.
+// Deprecated: Use Message3061_Message3063.ProtoReflect.Descriptor instead.
 func (*Message3061_Message3063) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{5, 1}
 }
@@ -3866,7 +3866,7 @@ func (x *Message3061_Message3064) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3061_Message3064.ProtoReflect.Type instead.
+// Deprecated: Use Message3061_Message3064.ProtoReflect.Descriptor instead.
 func (*Message3061_Message3064) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{5, 2}
 }
@@ -4032,7 +4032,7 @@ func (x *Message3061_Message3065) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3061_Message3065.ProtoReflect.Type instead.
+// Deprecated: Use Message3061_Message3065.ProtoReflect.Descriptor instead.
 func (*Message3061_Message3065) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{5, 3}
 }
@@ -4073,7 +4073,7 @@ func (x *Message3061_Message3066) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3061_Message3066.ProtoReflect.Type instead.
+// Deprecated: Use Message3061_Message3066.ProtoReflect.Descriptor instead.
 func (*Message3061_Message3066) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{5, 4}
 }
@@ -4166,7 +4166,7 @@ func (x *Message3886_Message3887) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3886_Message3887.ProtoReflect.Type instead.
+// Deprecated: Use Message3886_Message3887.ProtoReflect.Descriptor instead.
 func (*Message3886_Message3887) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{30, 0}
 }

+ 35 - 35
internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4_2.pb.go

@@ -51,7 +51,7 @@ func (x *Message12774) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12774.ProtoReflect.Type instead.
+// Deprecated: Use Message12774.ProtoReflect.Descriptor instead.
 func (*Message12774) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{0}
 }
@@ -128,7 +128,7 @@ func (x *Message12796) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12796.ProtoReflect.Type instead.
+// Deprecated: Use Message12796.ProtoReflect.Descriptor instead.
 func (*Message12796) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{1}
 }
@@ -180,7 +180,7 @@ func (x *Message12821) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12821.ProtoReflect.Type instead.
+// Deprecated: Use Message12821.ProtoReflect.Descriptor instead.
 func (*Message12821) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{2}
 }
@@ -256,7 +256,7 @@ func (x *Message12820) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12820.ProtoReflect.Type instead.
+// Deprecated: Use Message12820.ProtoReflect.Descriptor instead.
 func (*Message12820) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{3}
 }
@@ -351,7 +351,7 @@ func (x *Message12819) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12819.ProtoReflect.Type instead.
+// Deprecated: Use Message12819.ProtoReflect.Descriptor instead.
 func (*Message12819) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{4}
 }
@@ -431,7 +431,7 @@ func (x *Message12818) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12818.ProtoReflect.Type instead.
+// Deprecated: Use Message12818.ProtoReflect.Descriptor instead.
 func (*Message12818) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{5}
 }
@@ -506,7 +506,7 @@ func (x *Message10319) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10319.ProtoReflect.Type instead.
+// Deprecated: Use Message10319.ProtoReflect.Descriptor instead.
 func (*Message10319) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{6}
 }
@@ -590,7 +590,7 @@ func (x *Message6578) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6578.ProtoReflect.Type instead.
+// Deprecated: Use Message6578.ProtoReflect.Descriptor instead.
 func (*Message6578) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{7}
 }
@@ -656,7 +656,7 @@ func (x *Message6126) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6126.ProtoReflect.Type instead.
+// Deprecated: Use Message6126.ProtoReflect.Descriptor instead.
 func (*Message6126) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{8}
 }
@@ -828,7 +828,7 @@ func (x *Message5881) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message5881.ProtoReflect.Type instead.
+// Deprecated: Use Message5881.ProtoReflect.Descriptor instead.
 func (*Message5881) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{9}
 }
@@ -903,7 +903,7 @@ func (x *Message6110) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6110.ProtoReflect.Type instead.
+// Deprecated: Use Message6110.ProtoReflect.Descriptor instead.
 func (*Message6110) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{10}
 }
@@ -942,7 +942,7 @@ func (x *Message6107) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6107.ProtoReflect.Type instead.
+// Deprecated: Use Message6107.ProtoReflect.Descriptor instead.
 func (*Message6107) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{11}
 }
@@ -1019,7 +1019,7 @@ func (x *Message6129) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6129.ProtoReflect.Type instead.
+// Deprecated: Use Message6129.ProtoReflect.Descriptor instead.
 func (*Message6129) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{12}
 }
@@ -1116,7 +1116,7 @@ func (x *Message5908) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message5908.ProtoReflect.Type instead.
+// Deprecated: Use Message5908.ProtoReflect.Descriptor instead.
 func (*Message5908) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{13}
 }
@@ -1505,7 +1505,7 @@ func (x *Message3850) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3850.ProtoReflect.Type instead.
+// Deprecated: Use Message3850.ProtoReflect.Descriptor instead.
 func (*Message3850) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{14}
 }
@@ -1580,7 +1580,7 @@ func (x *Message7865) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7865.ProtoReflect.Type instead.
+// Deprecated: Use Message7865.ProtoReflect.Descriptor instead.
 func (*Message7865) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{15}
 }
@@ -1620,7 +1620,7 @@ func (x *Message7511) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7511.ProtoReflect.Type instead.
+// Deprecated: Use Message7511.ProtoReflect.Descriptor instead.
 func (*Message7511) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{16}
 }
@@ -1702,7 +1702,7 @@ func (x *Message3920) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3920.ProtoReflect.Type instead.
+// Deprecated: Use Message3920.ProtoReflect.Descriptor instead.
 func (*Message3920) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{17}
 }
@@ -1737,7 +1737,7 @@ func (x *Message7928) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7928.ProtoReflect.Type instead.
+// Deprecated: Use Message7928.ProtoReflect.Descriptor instead.
 func (*Message7928) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{18}
 }
@@ -1788,7 +1788,7 @@ func (x *Message7921) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7921.ProtoReflect.Type instead.
+// Deprecated: Use Message7921.ProtoReflect.Descriptor instead.
 func (*Message7921) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{19}
 }
@@ -1851,7 +1851,7 @@ func (x *Message7920) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7920.ProtoReflect.Type instead.
+// Deprecated: Use Message7920.ProtoReflect.Descriptor instead.
 func (*Message7920) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{20}
 }
@@ -1901,7 +1901,7 @@ func (x *Message7919) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7919.ProtoReflect.Type instead.
+// Deprecated: Use Message7919.ProtoReflect.Descriptor instead.
 func (*Message7919) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{21}
 }
@@ -1958,7 +1958,7 @@ func (x *Message12817) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12817.ProtoReflect.Type instead.
+// Deprecated: Use Message12817.ProtoReflect.Descriptor instead.
 func (*Message12817) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{22}
 }
@@ -2014,7 +2014,7 @@ func (x *Message6054) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6054.ProtoReflect.Type instead.
+// Deprecated: Use Message6054.ProtoReflect.Descriptor instead.
 func (*Message6054) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{23}
 }
@@ -2061,7 +2061,7 @@ func (x *Message6127) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6127.ProtoReflect.Type instead.
+// Deprecated: Use Message6127.ProtoReflect.Descriptor instead.
 func (*Message6127) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{24}
 }
@@ -2096,7 +2096,7 @@ func (x *Message6052) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6052.ProtoReflect.Type instead.
+// Deprecated: Use Message6052.ProtoReflect.Descriptor instead.
 func (*Message6052) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{25}
 }
@@ -2146,7 +2146,7 @@ func (x *Message6024) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6024.ProtoReflect.Type instead.
+// Deprecated: Use Message6024.ProtoReflect.Descriptor instead.
 func (*Message6024) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{26}
 }
@@ -2204,7 +2204,7 @@ func (x *Message5861) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message5861.ProtoReflect.Type instead.
+// Deprecated: Use Message5861.ProtoReflect.Descriptor instead.
 func (*Message5861) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{27}
 }
@@ -2266,7 +2266,7 @@ func (x *Message5880) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message5880.ProtoReflect.Type instead.
+// Deprecated: Use Message5880.ProtoReflect.Descriptor instead.
 func (*Message5880) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{28}
 }
@@ -2312,7 +2312,7 @@ func (x *Message5867) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message5867.ProtoReflect.Type instead.
+// Deprecated: Use Message5867.ProtoReflect.Descriptor instead.
 func (*Message5867) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{29}
 }
@@ -2391,7 +2391,7 @@ func (x *Message4016) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message4016.ProtoReflect.Type instead.
+// Deprecated: Use Message4016.ProtoReflect.Descriptor instead.
 func (*Message4016) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{30}
 }
@@ -2452,7 +2452,7 @@ func (x *Message6108) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6108.ProtoReflect.Type instead.
+// Deprecated: Use Message6108.ProtoReflect.Descriptor instead.
 func (*Message6108) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{31}
 }
@@ -2489,7 +2489,7 @@ func (x *Message5907) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message5907.ProtoReflect.Type instead.
+// Deprecated: Use Message5907.ProtoReflect.Descriptor instead.
 func (*Message5907) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{32}
 }
@@ -2550,7 +2550,7 @@ func (x *UnusedEmptyMessage) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use UnusedEmptyMessage.ProtoReflect.Type instead.
+// Deprecated: Use UnusedEmptyMessage.ProtoReflect.Descriptor instead.
 func (*UnusedEmptyMessage) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{33}
 }
@@ -2585,7 +2585,7 @@ func (x *Message5903) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message5903.ProtoReflect.Type instead.
+// Deprecated: Use Message5903.ProtoReflect.Descriptor instead.
 func (*Message5903) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{34}
 }

+ 42 - 42
internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4_3.pb.go

@@ -67,7 +67,7 @@ func (x *UnusedEnum) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use UnusedEnum.Type instead.
+// Deprecated: Use UnusedEnum.Descriptor instead.
 func (UnusedEnum) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{0}
 }
@@ -139,7 +139,7 @@ func (x *Enum2593) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum2593.Type instead.
+// Deprecated: Use Enum2593.Descriptor instead.
 func (Enum2593) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{1}
 }
@@ -196,7 +196,7 @@ func (x *Enum2834) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum2834.Type instead.
+// Deprecated: Use Enum2834.Descriptor instead.
 func (Enum2834) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{2}
 }
@@ -289,7 +289,7 @@ func (x *Enum2806) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum2806.Type instead.
+// Deprecated: Use Enum2806.Descriptor instead.
 func (Enum2806) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{3}
 }
@@ -700,7 +700,7 @@ func (x *Enum2851) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum2851.Type instead.
+// Deprecated: Use Enum2851.Descriptor instead.
 func (Enum2851) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{4}
 }
@@ -784,7 +784,7 @@ func (x *Enum2602) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum2602.Type instead.
+// Deprecated: Use Enum2602.Descriptor instead.
 func (Enum2602) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{5}
 }
@@ -916,7 +916,7 @@ func (x *Enum3071) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum3071.Type instead.
+// Deprecated: Use Enum3071.Descriptor instead.
 func (Enum3071) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{6}
 }
@@ -1000,7 +1000,7 @@ func (x *Enum3805) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum3805.Type instead.
+// Deprecated: Use Enum3805.Descriptor instead.
 func (Enum3805) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{7}
 }
@@ -1108,7 +1108,7 @@ func (x *Enum3783) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum3783.Type instead.
+// Deprecated: Use Enum3783.Descriptor instead.
 func (Enum3783) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{8}
 }
@@ -1210,7 +1210,7 @@ func (x *Enum3851) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum3851.Type instead.
+// Deprecated: Use Enum3851.Descriptor instead.
 func (Enum3851) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{9}
 }
@@ -1267,7 +1267,7 @@ func (x *Enum5862) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum5862.Type instead.
+// Deprecated: Use Enum5862.Descriptor instead.
 func (Enum5862) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{10}
 }
@@ -1327,7 +1327,7 @@ func (x *Enum5868) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum5868.Type instead.
+// Deprecated: Use Enum5868.Descriptor instead.
 func (Enum5868) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{11}
 }
@@ -1384,7 +1384,7 @@ func (x *Enum5873) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum5873.Type instead.
+// Deprecated: Use Enum5873.Descriptor instead.
 func (Enum5873) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{12}
 }
@@ -1438,7 +1438,7 @@ func (x *Enum5904) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum5904.Type instead.
+// Deprecated: Use Enum5904.Descriptor instead.
 func (Enum5904) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{13}
 }
@@ -1492,7 +1492,7 @@ func (x *Enum5909) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum5909.Type instead.
+// Deprecated: Use Enum5909.Descriptor instead.
 func (Enum5909) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{14}
 }
@@ -1546,7 +1546,7 @@ func (x *Enum5912) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum5912.Type instead.
+// Deprecated: Use Enum5912.Descriptor instead.
 func (Enum5912) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{15}
 }
@@ -1606,7 +1606,7 @@ func (x *Enum5915) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum5915.Type instead.
+// Deprecated: Use Enum5915.Descriptor instead.
 func (Enum5915) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{16}
 }
@@ -1660,7 +1660,7 @@ func (x *Enum5920) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum5920.Type instead.
+// Deprecated: Use Enum5920.Descriptor instead.
 func (Enum5920) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{17}
 }
@@ -1720,7 +1720,7 @@ func (x *Enum5923) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum5923.Type instead.
+// Deprecated: Use Enum5923.Descriptor instead.
 func (Enum5923) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{18}
 }
@@ -1774,7 +1774,7 @@ func (x *Enum5928) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum5928.Type instead.
+// Deprecated: Use Enum5928.Descriptor instead.
 func (Enum5928) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{19}
 }
@@ -1831,7 +1831,7 @@ func (x *Enum5931) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum5931.Type instead.
+// Deprecated: Use Enum5931.Descriptor instead.
 func (Enum5931) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{20}
 }
@@ -1888,7 +1888,7 @@ func (x *Enum5935) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum5935.Type instead.
+// Deprecated: Use Enum5935.Descriptor instead.
 func (Enum5935) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{21}
 }
@@ -1954,7 +1954,7 @@ func (x *Enum5939) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum5939.Type instead.
+// Deprecated: Use Enum5939.Descriptor instead.
 func (Enum5939) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{22}
 }
@@ -2032,7 +2032,7 @@ func (x *Enum5946) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum5946.Type instead.
+// Deprecated: Use Enum5946.Descriptor instead.
 func (Enum5946) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{23}
 }
@@ -2092,7 +2092,7 @@ func (x *Enum5957) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum5957.Type instead.
+// Deprecated: Use Enum5957.Descriptor instead.
 func (Enum5957) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{24}
 }
@@ -2146,7 +2146,7 @@ func (x *Enum5962) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum5962.Type instead.
+// Deprecated: Use Enum5962.Descriptor instead.
 func (Enum5962) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{25}
 }
@@ -2260,7 +2260,7 @@ func (x *Enum6025) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum6025.Type instead.
+// Deprecated: Use Enum6025.Descriptor instead.
 func (Enum6025) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{26}
 }
@@ -2350,7 +2350,7 @@ func (x *Enum6111) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum6111.Type instead.
+// Deprecated: Use Enum6111.Descriptor instead.
 func (Enum6111) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{27}
 }
@@ -2443,7 +2443,7 @@ func (x *Enum6065) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum6065.Type instead.
+// Deprecated: Use Enum6065.Descriptor instead.
 func (Enum6065) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{28}
 }
@@ -2497,7 +2497,7 @@ func (x *Enum6130) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum6130.Type instead.
+// Deprecated: Use Enum6130.Descriptor instead.
 func (Enum6130) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{29}
 }
@@ -2569,7 +2569,7 @@ func (x *Enum6579) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum6579.Type instead.
+// Deprecated: Use Enum6579.Descriptor instead.
 func (Enum6579) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{30}
 }
@@ -2719,7 +2719,7 @@ func (x *Enum6588) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum6588.Type instead.
+// Deprecated: Use Enum6588.Descriptor instead.
 func (Enum6588) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{31}
 }
@@ -2779,7 +2779,7 @@ func (x *Enum7288) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum7288.Type instead.
+// Deprecated: Use Enum7288.Descriptor instead.
 func (Enum7288) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{32}
 }
@@ -2851,7 +2851,7 @@ func (x *Enum7512) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum7512.Type instead.
+// Deprecated: Use Enum7512.Descriptor instead.
 func (Enum7512) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{33}
 }
@@ -2914,7 +2914,7 @@ func (x *Enum7922) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum7922.Type instead.
+// Deprecated: Use Enum7922.Descriptor instead.
 func (Enum7922) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{34}
 }
@@ -3514,7 +3514,7 @@ func (x *Enum3476) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum3476.Type instead.
+// Deprecated: Use Enum3476.Descriptor instead.
 func (Enum3476) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{35}
 }
@@ -3589,7 +3589,7 @@ func (x *Enum10325) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum10325.Type instead.
+// Deprecated: Use Enum10325.Descriptor instead.
 func (Enum10325) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{36}
 }
@@ -3640,7 +3640,7 @@ func (x *Enum10335) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum10335.Type instead.
+// Deprecated: Use Enum10335.Descriptor instead.
 func (Enum10335) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{37}
 }
@@ -3694,7 +3694,7 @@ func (x *Enum10337) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum10337.Type instead.
+// Deprecated: Use Enum10337.Descriptor instead.
 func (Enum10337) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{38}
 }
@@ -3754,7 +3754,7 @@ func (x *Enum11901) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum11901.Type instead.
+// Deprecated: Use Enum11901.Descriptor instead.
 func (Enum11901) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{39}
 }
@@ -3814,7 +3814,7 @@ func (x *Enum12735) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum12735.Type instead.
+// Deprecated: Use Enum12735.Descriptor instead.
 func (Enum12735) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{40}
 }
@@ -3880,7 +3880,7 @@ func (x *Enum12871) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum12871.Type instead.
+// Deprecated: Use Enum12871.Descriptor instead.
 func (Enum12871) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{41}
 }

+ 6 - 6
internal/testprotos/conformance/conformance.pb.go

@@ -66,7 +66,7 @@ func (x WireFormat) Number() protoreflect.EnumNumber {
 	return protoreflect.EnumNumber(x)
 }
 
-// Deprecated: Use WireFormat.Type instead.
+// Deprecated: Use WireFormat.Descriptor instead.
 func (WireFormat) EnumDescriptor() ([]byte, []int) {
 	return file_conformance_conformance_proto_rawDescGZIP(), []int{0}
 }
@@ -130,7 +130,7 @@ func (x TestCategory) Number() protoreflect.EnumNumber {
 	return protoreflect.EnumNumber(x)
 }
 
-// Deprecated: Use TestCategory.Type instead.
+// Deprecated: Use TestCategory.Descriptor instead.
 func (TestCategory) EnumDescriptor() ([]byte, []int) {
 	return file_conformance_conformance_proto_rawDescGZIP(), []int{1}
 }
@@ -167,7 +167,7 @@ func (x *FailureSet) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use FailureSet.ProtoReflect.Type instead.
+// Deprecated: Use FailureSet.ProtoReflect.Descriptor instead.
 func (*FailureSet) Descriptor() ([]byte, []int) {
 	return file_conformance_conformance_proto_rawDescGZIP(), []int{0}
 }
@@ -239,7 +239,7 @@ func (x *ConformanceRequest) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use ConformanceRequest.ProtoReflect.Type instead.
+// Deprecated: Use ConformanceRequest.ProtoReflect.Descriptor instead.
 func (*ConformanceRequest) Descriptor() ([]byte, []int) {
 	return file_conformance_conformance_proto_rawDescGZIP(), []int{1}
 }
@@ -396,7 +396,7 @@ func (x *ConformanceResponse) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use ConformanceResponse.ProtoReflect.Type instead.
+// Deprecated: Use ConformanceResponse.ProtoReflect.Descriptor instead.
 func (*ConformanceResponse) Descriptor() ([]byte, []int) {
 	return file_conformance_conformance_proto_rawDescGZIP(), []int{2}
 }
@@ -547,7 +547,7 @@ func (x *JspbEncodingConfig) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use JspbEncodingConfig.ProtoReflect.Type instead.
+// Deprecated: Use JspbEncodingConfig.ProtoReflect.Descriptor instead.
 func (*JspbEncodingConfig) Descriptor() ([]byte, []int) {
 	return file_conformance_conformance_proto_rawDescGZIP(), []int{3}
 }

+ 11 - 11
internal/testprotos/conformance/test_messages_proto2.pb.go

@@ -71,7 +71,7 @@ func (x *ForeignEnumProto2) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use ForeignEnumProto2.Type instead.
+// Deprecated: Use ForeignEnumProto2.Descriptor instead.
 func (ForeignEnumProto2) EnumDescriptor() ([]byte, []int) {
 	return file_google_protobuf_test_messages_proto2_proto_rawDescGZIP(), []int{0}
 }
@@ -131,7 +131,7 @@ func (x *TestAllTypesProto2_NestedEnum) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use TestAllTypesProto2_NestedEnum.Type instead.
+// Deprecated: Use TestAllTypesProto2_NestedEnum.Descriptor instead.
 func (TestAllTypesProto2_NestedEnum) EnumDescriptor() ([]byte, []int) {
 	return file_google_protobuf_test_messages_proto2_proto_rawDescGZIP(), []int{0, 0}
 }
@@ -269,7 +269,7 @@ func (x *TestAllTypesProto2) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use TestAllTypesProto2.ProtoReflect.Type instead.
+// Deprecated: Use TestAllTypesProto2.ProtoReflect.Descriptor instead.
 func (*TestAllTypesProto2) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_test_messages_proto2_proto_rawDescGZIP(), []int{0}
 }
@@ -278,7 +278,7 @@ var extRange_TestAllTypesProto2 = []protoiface.ExtensionRangeV1{
 	{Start: 120, End: 200},
 }
 
-// Deprecated: Use TestAllTypesProto2.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use TestAllTypesProto2.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*TestAllTypesProto2) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_TestAllTypesProto2
 }
@@ -1007,7 +1007,7 @@ func (x *ForeignMessageProto2) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use ForeignMessageProto2.ProtoReflect.Type instead.
+// Deprecated: Use ForeignMessageProto2.ProtoReflect.Descriptor instead.
 func (*ForeignMessageProto2) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_test_messages_proto2_proto_rawDescGZIP(), []int{1}
 }
@@ -1049,7 +1049,7 @@ func (x *TestAllTypesProto2_NestedMessage) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use TestAllTypesProto2_NestedMessage.ProtoReflect.Type instead.
+// Deprecated: Use TestAllTypesProto2_NestedMessage.ProtoReflect.Descriptor instead.
 func (*TestAllTypesProto2_NestedMessage) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_test_messages_proto2_proto_rawDescGZIP(), []int{0, 0}
 }
@@ -1099,7 +1099,7 @@ func (x *TestAllTypesProto2_Data) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use TestAllTypesProto2_Data.ProtoReflect.Type instead.
+// Deprecated: Use TestAllTypesProto2_Data.ProtoReflect.Descriptor instead.
 func (*TestAllTypesProto2_Data) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_test_messages_proto2_proto_rawDescGZIP(), []int{0, 20}
 }
@@ -1148,7 +1148,7 @@ func (x *TestAllTypesProto2_MessageSetCorrect) ProtoReflect() protoreflect.Messa
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use TestAllTypesProto2_MessageSetCorrect.ProtoReflect.Type instead.
+// Deprecated: Use TestAllTypesProto2_MessageSetCorrect.ProtoReflect.Descriptor instead.
 func (*TestAllTypesProto2_MessageSetCorrect) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_test_messages_proto2_proto_rawDescGZIP(), []int{0, 21}
 }
@@ -1157,7 +1157,7 @@ var extRange_TestAllTypesProto2_MessageSetCorrect = []protoiface.ExtensionRangeV
 	{Start: 4, End: 2147483646},
 }
 
-// Deprecated: Use TestAllTypesProto2_MessageSetCorrect.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use TestAllTypesProto2_MessageSetCorrect.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*TestAllTypesProto2_MessageSetCorrect) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_TestAllTypesProto2_MessageSetCorrect
 }
@@ -1191,7 +1191,7 @@ func (x *TestAllTypesProto2_MessageSetCorrectExtension1) ProtoReflect() protoref
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use TestAllTypesProto2_MessageSetCorrectExtension1.ProtoReflect.Type instead.
+// Deprecated: Use TestAllTypesProto2_MessageSetCorrectExtension1.ProtoReflect.Descriptor instead.
 func (*TestAllTypesProto2_MessageSetCorrectExtension1) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_test_messages_proto2_proto_rawDescGZIP(), []int{0, 22}
 }
@@ -1232,7 +1232,7 @@ func (x *TestAllTypesProto2_MessageSetCorrectExtension2) ProtoReflect() protoref
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use TestAllTypesProto2_MessageSetCorrectExtension2.ProtoReflect.Type instead.
+// Deprecated: Use TestAllTypesProto2_MessageSetCorrectExtension2.ProtoReflect.Descriptor instead.
 func (*TestAllTypesProto2_MessageSetCorrectExtension2) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_test_messages_proto2_proto_rawDescGZIP(), []int{0, 23}
 }

+ 6 - 6
internal/testprotos/conformance/test_messages_proto3.pb.go

@@ -66,7 +66,7 @@ func (x ForeignEnum) Number() protoreflect.EnumNumber {
 	return protoreflect.EnumNumber(x)
 }
 
-// Deprecated: Use ForeignEnum.Type instead.
+// Deprecated: Use ForeignEnum.Descriptor instead.
 func (ForeignEnum) EnumDescriptor() ([]byte, []int) {
 	return file_google_protobuf_test_messages_proto3_proto_rawDescGZIP(), []int{0}
 }
@@ -116,7 +116,7 @@ func (x TestAllTypesProto3_NestedEnum) Number() protoreflect.EnumNumber {
 	return protoreflect.EnumNumber(x)
 }
 
-// Deprecated: Use TestAllTypesProto3_NestedEnum.Type instead.
+// Deprecated: Use TestAllTypesProto3_NestedEnum.Descriptor instead.
 func (TestAllTypesProto3_NestedEnum) EnumDescriptor() ([]byte, []int) {
 	return file_google_protobuf_test_messages_proto3_proto_rawDescGZIP(), []int{0, 0}
 }
@@ -172,7 +172,7 @@ func (x TestAllTypesProto3_AliasedEnum) Number() protoreflect.EnumNumber {
 	return protoreflect.EnumNumber(x)
 }
 
-// Deprecated: Use TestAllTypesProto3_AliasedEnum.Type instead.
+// Deprecated: Use TestAllTypesProto3_AliasedEnum.Descriptor instead.
 func (TestAllTypesProto3_AliasedEnum) EnumDescriptor() ([]byte, []int) {
 	return file_google_protobuf_test_messages_proto3_proto_rawDescGZIP(), []int{0, 1}
 }
@@ -341,7 +341,7 @@ func (x *TestAllTypesProto3) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use TestAllTypesProto3.ProtoReflect.Type instead.
+// Deprecated: Use TestAllTypesProto3.ProtoReflect.Descriptor instead.
 func (*TestAllTypesProto3) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_test_messages_proto3_proto_rawDescGZIP(), []int{0}
 }
@@ -1287,7 +1287,7 @@ func (x *ForeignMessage) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use ForeignMessage.ProtoReflect.Type instead.
+// Deprecated: Use ForeignMessage.ProtoReflect.Descriptor instead.
 func (*ForeignMessage) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_test_messages_proto3_proto_rawDescGZIP(), []int{1}
 }
@@ -1329,7 +1329,7 @@ func (x *TestAllTypesProto3_NestedMessage) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use TestAllTypesProto3_NestedMessage.ProtoReflect.Type instead.
+// Deprecated: Use TestAllTypesProto3_NestedMessage.ProtoReflect.Descriptor instead.
 func (*TestAllTypesProto3_NestedMessage) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_test_messages_proto3_proto_rawDescGZIP(), []int{0, 0}
 }

+ 1 - 1
internal/testprotos/irregular/test.pb.go

@@ -52,7 +52,7 @@ func (x *Message) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message.ProtoReflect.Type instead.
+// Deprecated: Use Message.ProtoReflect.Descriptor instead.
 func (*Message) Descriptor() ([]byte, []int) {
 	return file_irregular_test_proto_rawDescGZIP(), []int{0}
 }

+ 1 - 1
internal/testprotos/legacy/legacy.pb.go

@@ -69,7 +69,7 @@ func (x *Legacy) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Legacy.ProtoReflect.Type instead.
+// Deprecated: Use Legacy.ProtoReflect.Descriptor instead.
 func (*Legacy) Descriptor() ([]byte, []int) {
 	return file_legacy_legacy_proto_rawDescGZIP(), []int{0}
 }

+ 2 - 2
internal/testprotos/messageset/messagesetpb/message_set.pb.go

@@ -47,7 +47,7 @@ func (x *MessageSet) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use MessageSet.ProtoReflect.Type instead.
+// Deprecated: Use MessageSet.ProtoReflect.Descriptor instead.
 func (*MessageSet) Descriptor() ([]byte, []int) {
 	return file_messageset_messagesetpb_message_set_proto_rawDescGZIP(), []int{0}
 }
@@ -56,7 +56,7 @@ var extRange_MessageSet = []protoiface.ExtensionRangeV1{
 	{Start: 4, End: 2147483646},
 }
 
-// Deprecated: Use MessageSet.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use MessageSet.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*MessageSet) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_MessageSet
 }

+ 2 - 2
internal/testprotos/messageset/msetextpb/msetextpb.pb.go

@@ -49,7 +49,7 @@ func (x *Ext1) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Ext1.ProtoReflect.Type instead.
+// Deprecated: Use Ext1.ProtoReflect.Descriptor instead.
 func (*Ext1) Descriptor() ([]byte, []int) {
 	return file_messageset_msetextpb_msetextpb_proto_rawDescGZIP(), []int{0}
 }
@@ -97,7 +97,7 @@ func (x *Ext2) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Ext2.ProtoReflect.Type instead.
+// Deprecated: Use Ext2.ProtoReflect.Descriptor instead.
 func (*Ext2) Descriptor() ([]byte, []int) {
 	return file_messageset_msetextpb_msetextpb_proto_rawDescGZIP(), []int{1}
 }

+ 30 - 30
internal/testprotos/test/test.pb.go

@@ -71,7 +71,7 @@ func (x *ForeignEnum) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use ForeignEnum.Type instead.
+// Deprecated: Use ForeignEnum.Descriptor instead.
 func (ForeignEnum) EnumDescriptor() ([]byte, []int) {
 	return file_test_test_proto_rawDescGZIP(), []int{0}
 }
@@ -122,7 +122,7 @@ func (x *TestReservedEnumFields) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use TestReservedEnumFields.Type instead.
+// Deprecated: Use TestReservedEnumFields.Descriptor instead.
 func (TestReservedEnumFields) EnumDescriptor() ([]byte, []int) {
 	return file_test_test_proto_rawDescGZIP(), []int{1}
 }
@@ -182,7 +182,7 @@ func (x *TestAllTypes_NestedEnum) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use TestAllTypes_NestedEnum.Type instead.
+// Deprecated: Use TestAllTypes_NestedEnum.Descriptor instead.
 func (TestAllTypes_NestedEnum) EnumDescriptor() ([]byte, []int) {
 	return file_test_test_proto_rawDescGZIP(), []int{0, 0}
 }
@@ -232,7 +232,7 @@ func (x *TestDeprecatedMessage_DeprecatedEnum) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use TestDeprecatedMessage_DeprecatedEnum.Type instead.
+// Deprecated: Use TestDeprecatedMessage_DeprecatedEnum.Descriptor instead.
 func (TestDeprecatedMessage_DeprecatedEnum) EnumDescriptor() ([]byte, []int) {
 	return file_test_test_proto_rawDescGZIP(), []int{1, 0}
 }
@@ -355,7 +355,7 @@ func (x *TestAllTypes) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use TestAllTypes.ProtoReflect.Type instead.
+// Deprecated: Use TestAllTypes.ProtoReflect.Descriptor instead.
 func (*TestAllTypes) Descriptor() ([]byte, []int) {
 	return file_test_test_proto_rawDescGZIP(), []int{0}
 }
@@ -1087,7 +1087,7 @@ func (x *TestDeprecatedMessage) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use TestDeprecatedMessage.ProtoReflect.Type instead.
+// Deprecated: Use TestDeprecatedMessage.ProtoReflect.Descriptor instead.
 func (*TestDeprecatedMessage) Descriptor() ([]byte, []int) {
 	return file_test_test_proto_rawDescGZIP(), []int{1}
 }
@@ -1155,7 +1155,7 @@ func (x *ForeignMessage) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use ForeignMessage.ProtoReflect.Type instead.
+// Deprecated: Use ForeignMessage.ProtoReflect.Descriptor instead.
 func (*ForeignMessage) Descriptor() ([]byte, []int) {
 	return file_test_test_proto_rawDescGZIP(), []int{2}
 }
@@ -1202,7 +1202,7 @@ func (x *TestReservedFields) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use TestReservedFields.ProtoReflect.Type instead.
+// Deprecated: Use TestReservedFields.ProtoReflect.Descriptor instead.
 func (*TestReservedFields) Descriptor() ([]byte, []int) {
 	return file_test_test_proto_rawDescGZIP(), []int{3}
 }
@@ -1236,7 +1236,7 @@ func (x *TestAllExtensions) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use TestAllExtensions.ProtoReflect.Type instead.
+// Deprecated: Use TestAllExtensions.ProtoReflect.Descriptor instead.
 func (*TestAllExtensions) Descriptor() ([]byte, []int) {
 	return file_test_test_proto_rawDescGZIP(), []int{4}
 }
@@ -1245,7 +1245,7 @@ var extRange_TestAllExtensions = []protoiface.ExtensionRangeV1{
 	{Start: 1, End: 536870911},
 }
 
-// Deprecated: Use TestAllExtensions.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use TestAllExtensions.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*TestAllExtensions) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_TestAllExtensions
 }
@@ -1279,7 +1279,7 @@ func (x *OptionalGroupExtension) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use OptionalGroupExtension.ProtoReflect.Type instead.
+// Deprecated: Use OptionalGroupExtension.ProtoReflect.Descriptor instead.
 func (*OptionalGroupExtension) Descriptor() ([]byte, []int) {
 	return file_test_test_proto_rawDescGZIP(), []int{5}
 }
@@ -1320,7 +1320,7 @@ func (x *RepeatedGroupExtension) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use RepeatedGroupExtension.ProtoReflect.Type instead.
+// Deprecated: Use RepeatedGroupExtension.ProtoReflect.Descriptor instead.
 func (*RepeatedGroupExtension) Descriptor() ([]byte, []int) {
 	return file_test_test_proto_rawDescGZIP(), []int{6}
 }
@@ -1360,7 +1360,7 @@ func (x *TestNestedExtension) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use TestNestedExtension.ProtoReflect.Type instead.
+// Deprecated: Use TestNestedExtension.ProtoReflect.Descriptor instead.
 func (*TestNestedExtension) Descriptor() ([]byte, []int) {
 	return file_test_test_proto_rawDescGZIP(), []int{7}
 }
@@ -1394,7 +1394,7 @@ func (x *TestRequired) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use TestRequired.ProtoReflect.Type instead.
+// Deprecated: Use TestRequired.ProtoReflect.Descriptor instead.
 func (*TestRequired) Descriptor() ([]byte, []int) {
 	return file_test_test_proto_rawDescGZIP(), []int{8}
 }
@@ -1440,7 +1440,7 @@ func (x *TestRequiredForeign) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use TestRequiredForeign.ProtoReflect.Type instead.
+// Deprecated: Use TestRequiredForeign.ProtoReflect.Descriptor instead.
 func (*TestRequiredForeign) Descriptor() ([]byte, []int) {
 	return file_test_test_proto_rawDescGZIP(), []int{9}
 }
@@ -1520,7 +1520,7 @@ func (x *TestRequiredGroupFields) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use TestRequiredGroupFields.ProtoReflect.Type instead.
+// Deprecated: Use TestRequiredGroupFields.ProtoReflect.Descriptor instead.
 func (*TestRequiredGroupFields) Descriptor() ([]byte, []int) {
 	return file_test_test_proto_rawDescGZIP(), []int{10}
 }
@@ -1570,7 +1570,7 @@ func (x *TestWeak) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use TestWeak.ProtoReflect.Type instead.
+// Deprecated: Use TestWeak.ProtoReflect.Descriptor instead.
 func (*TestWeak) Descriptor() ([]byte, []int) {
 	return file_test_test_proto_rawDescGZIP(), []int{11}
 }
@@ -1661,7 +1661,7 @@ func (x *TestPackedTypes) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use TestPackedTypes.ProtoReflect.Type instead.
+// Deprecated: Use TestPackedTypes.ProtoReflect.Descriptor instead.
 func (*TestPackedTypes) Descriptor() ([]byte, []int) {
 	return file_test_test_proto_rawDescGZIP(), []int{12}
 }
@@ -1806,7 +1806,7 @@ func (x *TestUnpackedTypes) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use TestUnpackedTypes.ProtoReflect.Type instead.
+// Deprecated: Use TestUnpackedTypes.ProtoReflect.Descriptor instead.
 func (*TestUnpackedTypes) Descriptor() ([]byte, []int) {
 	return file_test_test_proto_rawDescGZIP(), []int{13}
 }
@@ -1938,7 +1938,7 @@ func (x *TestPackedExtensions) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use TestPackedExtensions.ProtoReflect.Type instead.
+// Deprecated: Use TestPackedExtensions.ProtoReflect.Descriptor instead.
 func (*TestPackedExtensions) Descriptor() ([]byte, []int) {
 	return file_test_test_proto_rawDescGZIP(), []int{14}
 }
@@ -1947,7 +1947,7 @@ var extRange_TestPackedExtensions = []protoiface.ExtensionRangeV1{
 	{Start: 1, End: 536870911},
 }
 
-// Deprecated: Use TestPackedExtensions.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use TestPackedExtensions.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*TestPackedExtensions) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_TestPackedExtensions
 }
@@ -1981,7 +1981,7 @@ func (x *TestUnpackedExtensions) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use TestUnpackedExtensions.ProtoReflect.Type instead.
+// Deprecated: Use TestUnpackedExtensions.ProtoReflect.Descriptor instead.
 func (*TestUnpackedExtensions) Descriptor() ([]byte, []int) {
 	return file_test_test_proto_rawDescGZIP(), []int{15}
 }
@@ -1990,7 +1990,7 @@ var extRange_TestUnpackedExtensions = []protoiface.ExtensionRangeV1{
 	{Start: 1, End: 536870911},
 }
 
-// Deprecated: Use TestUnpackedExtensions.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use TestUnpackedExtensions.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*TestUnpackedExtensions) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_TestUnpackedExtensions
 }
@@ -2024,7 +2024,7 @@ func (x *FooRequest) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use FooRequest.ProtoReflect.Type instead.
+// Deprecated: Use FooRequest.ProtoReflect.Descriptor instead.
 func (*FooRequest) Descriptor() ([]byte, []int) {
 	return file_test_test_proto_rawDescGZIP(), []int{16}
 }
@@ -2057,7 +2057,7 @@ func (x *FooResponse) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use FooResponse.ProtoReflect.Type instead.
+// Deprecated: Use FooResponse.ProtoReflect.Descriptor instead.
 func (*FooResponse) Descriptor() ([]byte, []int) {
 	return file_test_test_proto_rawDescGZIP(), []int{17}
 }
@@ -2092,7 +2092,7 @@ func (x *TestAllTypes_NestedMessage) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use TestAllTypes_NestedMessage.ProtoReflect.Type instead.
+// Deprecated: Use TestAllTypes_NestedMessage.ProtoReflect.Descriptor instead.
 func (*TestAllTypes_NestedMessage) Descriptor() ([]byte, []int) {
 	return file_test_test_proto_rawDescGZIP(), []int{0, 0}
 }
@@ -2140,7 +2140,7 @@ func (x *TestAllTypes_OptionalGroup) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use TestAllTypes_OptionalGroup.ProtoReflect.Type instead.
+// Deprecated: Use TestAllTypes_OptionalGroup.ProtoReflect.Descriptor instead.
 func (*TestAllTypes_OptionalGroup) Descriptor() ([]byte, []int) {
 	return file_test_test_proto_rawDescGZIP(), []int{0, 1}
 }
@@ -2181,7 +2181,7 @@ func (x *TestAllTypes_RepeatedGroup) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use TestAllTypes_RepeatedGroup.ProtoReflect.Type instead.
+// Deprecated: Use TestAllTypes_RepeatedGroup.ProtoReflect.Descriptor instead.
 func (*TestAllTypes_RepeatedGroup) Descriptor() ([]byte, []int) {
 	return file_test_test_proto_rawDescGZIP(), []int{0, 2}
 }
@@ -2222,7 +2222,7 @@ func (x *TestRequiredGroupFields_OptionalGroup) ProtoReflect() protoreflect.Mess
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use TestRequiredGroupFields_OptionalGroup.ProtoReflect.Type instead.
+// Deprecated: Use TestRequiredGroupFields_OptionalGroup.ProtoReflect.Descriptor instead.
 func (*TestRequiredGroupFields_OptionalGroup) Descriptor() ([]byte, []int) {
 	return file_test_test_proto_rawDescGZIP(), []int{10, 0}
 }
@@ -2263,7 +2263,7 @@ func (x *TestRequiredGroupFields_RepeatedGroup) ProtoReflect() protoreflect.Mess
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use TestRequiredGroupFields_RepeatedGroup.ProtoReflect.Type instead.
+// Deprecated: Use TestRequiredGroupFields_RepeatedGroup.ProtoReflect.Descriptor instead.
 func (*TestRequiredGroupFields_RepeatedGroup) Descriptor() ([]byte, []int) {
 	return file_test_test_proto_rawDescGZIP(), []int{10, 1}
 }

+ 2 - 2
internal/testprotos/test/test_import.pb.go

@@ -64,7 +64,7 @@ func (x *ImportEnum) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use ImportEnum.Type instead.
+// Deprecated: Use ImportEnum.Descriptor instead.
 func (ImportEnum) EnumDescriptor() ([]byte, []int) {
 	return file_test_test_import_proto_rawDescGZIP(), []int{0}
 }
@@ -97,7 +97,7 @@ func (x *ImportMessage) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use ImportMessage.ProtoReflect.Type instead.
+// Deprecated: Use ImportMessage.ProtoReflect.Descriptor instead.
 func (*ImportMessage) Descriptor() ([]byte, []int) {
 	return file_test_test_import_proto_rawDescGZIP(), []int{0}
 }

+ 1 - 1
internal/testprotos/test/test_public.pb.go

@@ -45,7 +45,7 @@ func (x *PublicImportMessage) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use PublicImportMessage.ProtoReflect.Type instead.
+// Deprecated: Use PublicImportMessage.ProtoReflect.Descriptor instead.
 func (*PublicImportMessage) Descriptor() ([]byte, []int) {
 	return file_test_test_public_proto_rawDescGZIP(), []int{0}
 }

+ 1 - 1
internal/testprotos/test/weak1/test_weak.pb.go

@@ -46,7 +46,7 @@ func (x *WeakImportMessage1) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use WeakImportMessage1.ProtoReflect.Type instead.
+// Deprecated: Use WeakImportMessage1.ProtoReflect.Descriptor instead.
 func (*WeakImportMessage1) Descriptor() ([]byte, []int) {
 	return file_test_weak1_test_weak_proto_rawDescGZIP(), []int{0}
 }

+ 1 - 1
internal/testprotos/test/weak2/test_weak.pb.go

@@ -46,7 +46,7 @@ func (x *WeakImportMessage2) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use WeakImportMessage2.ProtoReflect.Type instead.
+// Deprecated: Use WeakImportMessage2.ProtoReflect.Descriptor instead.
 func (*WeakImportMessage2) Descriptor() ([]byte, []int) {
 	return file_test_weak2_test_weak_proto_rawDescGZIP(), []int{0}
 }

+ 5 - 5
internal/testprotos/test3/test.pb.go

@@ -63,7 +63,7 @@ func (x ForeignEnum) Number() protoreflect.EnumNumber {
 	return protoreflect.EnumNumber(x)
 }
 
-// Deprecated: Use ForeignEnum.Type instead.
+// Deprecated: Use ForeignEnum.Descriptor instead.
 func (ForeignEnum) EnumDescriptor() ([]byte, []int) {
 	return file_test3_test_proto_rawDescGZIP(), []int{0}
 }
@@ -113,7 +113,7 @@ func (x TestAllTypes_NestedEnum) Number() protoreflect.EnumNumber {
 	return protoreflect.EnumNumber(x)
 }
 
-// Deprecated: Use TestAllTypes_NestedEnum.Type instead.
+// Deprecated: Use TestAllTypes_NestedEnum.Descriptor instead.
 func (TestAllTypes_NestedEnum) EnumDescriptor() ([]byte, []int) {
 	return file_test3_test_proto_rawDescGZIP(), []int{0, 0}
 }
@@ -216,7 +216,7 @@ func (x *TestAllTypes) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use TestAllTypes.ProtoReflect.Type instead.
+// Deprecated: Use TestAllTypes.ProtoReflect.Descriptor instead.
 func (*TestAllTypes) Descriptor() ([]byte, []int) {
 	return file_test3_test_proto_rawDescGZIP(), []int{0}
 }
@@ -792,7 +792,7 @@ func (x *ForeignMessage) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use ForeignMessage.ProtoReflect.Type instead.
+// Deprecated: Use ForeignMessage.ProtoReflect.Descriptor instead.
 func (*ForeignMessage) Descriptor() ([]byte, []int) {
 	return file_test3_test_proto_rawDescGZIP(), []int{1}
 }
@@ -841,7 +841,7 @@ func (x *TestAllTypes_NestedMessage) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use TestAllTypes_NestedMessage.ProtoReflect.Type instead.
+// Deprecated: Use TestAllTypes_NestedMessage.ProtoReflect.Descriptor instead.
 func (*TestAllTypes_NestedMessage) Descriptor() ([]byte, []int) {
 	return file_test3_test_proto_rawDescGZIP(), []int{0, 0}
 }

+ 2 - 2
internal/testprotos/test3/test_import.pb.go

@@ -54,7 +54,7 @@ func (x ImportEnum) Number() protoreflect.EnumNumber {
 	return protoreflect.EnumNumber(x)
 }
 
-// Deprecated: Use ImportEnum.Type instead.
+// Deprecated: Use ImportEnum.Descriptor instead.
 func (ImportEnum) EnumDescriptor() ([]byte, []int) {
 	return file_test3_test_import_proto_rawDescGZIP(), []int{0}
 }
@@ -87,7 +87,7 @@ func (x *ImportMessage) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use ImportMessage.ProtoReflect.Type instead.
+// Deprecated: Use ImportMessage.ProtoReflect.Descriptor instead.
 func (*ImportMessage) Descriptor() ([]byte, []int) {
 	return file_test3_test_import_proto_rawDescGZIP(), []int{0}
 }

+ 8 - 8
reflect/protoregistry/testprotos/test.pb.go

@@ -65,7 +65,7 @@ func (x *Enum1) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum1.Type instead.
+// Deprecated: Use Enum1.Descriptor instead.
 func (Enum1) EnumDescriptor() ([]byte, []int) {
 	return file_test_proto_rawDescGZIP(), []int{0}
 }
@@ -116,7 +116,7 @@ func (x *Enum2) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum2.Type instead.
+// Deprecated: Use Enum2.Descriptor instead.
 func (Enum2) EnumDescriptor() ([]byte, []int) {
 	return file_test_proto_rawDescGZIP(), []int{1}
 }
@@ -167,7 +167,7 @@ func (x *Enum3) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use Enum3.Type instead.
+// Deprecated: Use Enum3.Descriptor instead.
 func (Enum3) EnumDescriptor() ([]byte, []int) {
 	return file_test_proto_rawDescGZIP(), []int{2}
 }
@@ -201,7 +201,7 @@ func (x *Message1) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message1.ProtoReflect.Type instead.
+// Deprecated: Use Message1.ProtoReflect.Descriptor instead.
 func (*Message1) Descriptor() ([]byte, []int) {
 	return file_test_proto_rawDescGZIP(), []int{0}
 }
@@ -210,7 +210,7 @@ var extRange_Message1 = []protoiface.ExtensionRangeV1{
 	{Start: 10, End: 536870911},
 }
 
-// Deprecated: Use Message1.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use Message1.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*Message1) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_Message1
 }
@@ -243,7 +243,7 @@ func (x *Message2) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message2.ProtoReflect.Type instead.
+// Deprecated: Use Message2.ProtoReflect.Descriptor instead.
 func (*Message2) Descriptor() ([]byte, []int) {
 	return file_test_proto_rawDescGZIP(), []int{1}
 }
@@ -276,7 +276,7 @@ func (x *Message3) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3.ProtoReflect.Type instead.
+// Deprecated: Use Message3.ProtoReflect.Descriptor instead.
 func (*Message3) Descriptor() ([]byte, []int) {
 	return file_test_proto_rawDescGZIP(), []int{2}
 }
@@ -310,7 +310,7 @@ func (x *Message4) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message4.ProtoReflect.Type instead.
+// Deprecated: Use Message4.ProtoReflect.Descriptor instead.
 func (*Message4) Descriptor() ([]byte, []int) {
 	return file_test_proto_rawDescGZIP(), []int{3}
 }

+ 42 - 42
types/descriptorpb/descriptor.pb.go

@@ -127,7 +127,7 @@ func (x *FieldDescriptorProto_Type) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use FieldDescriptorProto_Type.Type instead.
+// Deprecated: Use FieldDescriptorProto_Type.Descriptor instead.
 func (FieldDescriptorProto_Type) EnumDescriptor() ([]byte, []int) {
 	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{4, 0}
 }
@@ -185,7 +185,7 @@ func (x *FieldDescriptorProto_Label) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use FieldDescriptorProto_Label.Type instead.
+// Deprecated: Use FieldDescriptorProto_Label.Descriptor instead.
 func (FieldDescriptorProto_Label) EnumDescriptor() ([]byte, []int) {
 	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{4, 1}
 }
@@ -244,7 +244,7 @@ func (x *FileOptions_OptimizeMode) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use FileOptions_OptimizeMode.Type instead.
+// Deprecated: Use FileOptions_OptimizeMode.Descriptor instead.
 func (FileOptions_OptimizeMode) EnumDescriptor() ([]byte, []int) {
 	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{10, 0}
 }
@@ -302,7 +302,7 @@ func (x *FieldOptions_CType) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use FieldOptions_CType.Type instead.
+// Deprecated: Use FieldOptions_CType.Descriptor instead.
 func (FieldOptions_CType) EnumDescriptor() ([]byte, []int) {
 	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{12, 0}
 }
@@ -362,7 +362,7 @@ func (x *FieldOptions_JSType) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use FieldOptions_JSType.Type instead.
+// Deprecated: Use FieldOptions_JSType.Descriptor instead.
 func (FieldOptions_JSType) EnumDescriptor() ([]byte, []int) {
 	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{12, 1}
 }
@@ -422,7 +422,7 @@ func (x *MethodOptions_IdempotencyLevel) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// Deprecated: Use MethodOptions_IdempotencyLevel.Type instead.
+// Deprecated: Use MethodOptions_IdempotencyLevel.Descriptor instead.
 func (MethodOptions_IdempotencyLevel) EnumDescriptor() ([]byte, []int) {
 	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{17, 0}
 }
@@ -458,7 +458,7 @@ func (x *FileDescriptorSet) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use FileDescriptorSet.ProtoReflect.Type instead.
+// Deprecated: Use FileDescriptorSet.ProtoReflect.Descriptor instead.
 func (*FileDescriptorSet) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{0}
 }
@@ -522,7 +522,7 @@ func (x *FileDescriptorProto) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use FileDescriptorProto.ProtoReflect.Type instead.
+// Deprecated: Use FileDescriptorProto.ProtoReflect.Descriptor instead.
 func (*FileDescriptorProto) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{1}
 }
@@ -652,7 +652,7 @@ func (x *DescriptorProto) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use DescriptorProto.ProtoReflect.Type instead.
+// Deprecated: Use DescriptorProto.ProtoReflect.Descriptor instead.
 func (*DescriptorProto) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{2}
 }
@@ -758,7 +758,7 @@ func (x *ExtensionRangeOptions) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use ExtensionRangeOptions.ProtoReflect.Type instead.
+// Deprecated: Use ExtensionRangeOptions.ProtoReflect.Descriptor instead.
 func (*ExtensionRangeOptions) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{3}
 }
@@ -767,7 +767,7 @@ var extRange_ExtensionRangeOptions = []protoiface.ExtensionRangeV1{
 	{Start: 1000, End: 536870911},
 }
 
-// Deprecated: Use ExtensionRangeOptions.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use ExtensionRangeOptions.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*ExtensionRangeOptions) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_ExtensionRangeOptions
 }
@@ -838,7 +838,7 @@ func (x *FieldDescriptorProto) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use FieldDescriptorProto.ProtoReflect.Type instead.
+// Deprecated: Use FieldDescriptorProto.ProtoReflect.Descriptor instead.
 func (*FieldDescriptorProto) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{4}
 }
@@ -944,7 +944,7 @@ func (x *OneofDescriptorProto) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use OneofDescriptorProto.ProtoReflect.Type instead.
+// Deprecated: Use OneofDescriptorProto.ProtoReflect.Descriptor instead.
 func (*OneofDescriptorProto) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{5}
 }
@@ -1002,7 +1002,7 @@ func (x *EnumDescriptorProto) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use EnumDescriptorProto.ProtoReflect.Type instead.
+// Deprecated: Use EnumDescriptorProto.ProtoReflect.Descriptor instead.
 func (*EnumDescriptorProto) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{6}
 }
@@ -1074,7 +1074,7 @@ func (x *EnumValueDescriptorProto) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use EnumValueDescriptorProto.ProtoReflect.Type instead.
+// Deprecated: Use EnumValueDescriptorProto.ProtoReflect.Descriptor instead.
 func (*EnumValueDescriptorProto) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{7}
 }
@@ -1132,7 +1132,7 @@ func (x *ServiceDescriptorProto) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use ServiceDescriptorProto.ProtoReflect.Type instead.
+// Deprecated: Use ServiceDescriptorProto.ProtoReflect.Descriptor instead.
 func (*ServiceDescriptorProto) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{8}
 }
@@ -1197,7 +1197,7 @@ func (x *MethodDescriptorProto) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use MethodDescriptorProto.ProtoReflect.Type instead.
+// Deprecated: Use MethodDescriptorProto.ProtoReflect.Descriptor instead.
 func (*MethodDescriptorProto) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{9}
 }
@@ -1360,7 +1360,7 @@ func (x *FileOptions) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use FileOptions.ProtoReflect.Type instead.
+// Deprecated: Use FileOptions.ProtoReflect.Descriptor instead.
 func (*FileOptions) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{10}
 }
@@ -1369,7 +1369,7 @@ var extRange_FileOptions = []protoiface.ExtensionRangeV1{
 	{Start: 1000, End: 536870911},
 }
 
-// Deprecated: Use FileOptions.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use FileOptions.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*FileOptions) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_FileOptions
 }
@@ -1613,7 +1613,7 @@ func (x *MessageOptions) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use MessageOptions.ProtoReflect.Type instead.
+// Deprecated: Use MessageOptions.ProtoReflect.Descriptor instead.
 func (*MessageOptions) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{11}
 }
@@ -1622,7 +1622,7 @@ var extRange_MessageOptions = []protoiface.ExtensionRangeV1{
 	{Start: 1000, End: 536870911},
 }
 
-// Deprecated: Use MessageOptions.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use MessageOptions.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*MessageOptions) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_MessageOptions
 }
@@ -1756,7 +1756,7 @@ func (x *FieldOptions) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use FieldOptions.ProtoReflect.Type instead.
+// Deprecated: Use FieldOptions.ProtoReflect.Descriptor instead.
 func (*FieldOptions) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{12}
 }
@@ -1765,7 +1765,7 @@ var extRange_FieldOptions = []protoiface.ExtensionRangeV1{
 	{Start: 1000, End: 536870911},
 }
 
-// Deprecated: Use FieldOptions.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use FieldOptions.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*FieldOptions) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_FieldOptions
 }
@@ -1856,7 +1856,7 @@ func (x *OneofOptions) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use OneofOptions.ProtoReflect.Type instead.
+// Deprecated: Use OneofOptions.ProtoReflect.Descriptor instead.
 func (*OneofOptions) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{13}
 }
@@ -1865,7 +1865,7 @@ var extRange_OneofOptions = []protoiface.ExtensionRangeV1{
 	{Start: 1000, End: 536870911},
 }
 
-// Deprecated: Use OneofOptions.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use OneofOptions.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*OneofOptions) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_OneofOptions
 }
@@ -1916,7 +1916,7 @@ func (x *EnumOptions) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use EnumOptions.ProtoReflect.Type instead.
+// Deprecated: Use EnumOptions.ProtoReflect.Descriptor instead.
 func (*EnumOptions) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{14}
 }
@@ -1925,7 +1925,7 @@ var extRange_EnumOptions = []protoiface.ExtensionRangeV1{
 	{Start: 1000, End: 536870911},
 }
 
-// Deprecated: Use EnumOptions.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use EnumOptions.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*EnumOptions) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_EnumOptions
 }
@@ -1989,7 +1989,7 @@ func (x *EnumValueOptions) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use EnumValueOptions.ProtoReflect.Type instead.
+// Deprecated: Use EnumValueOptions.ProtoReflect.Descriptor instead.
 func (*EnumValueOptions) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{15}
 }
@@ -1998,7 +1998,7 @@ var extRange_EnumValueOptions = []protoiface.ExtensionRangeV1{
 	{Start: 1000, End: 536870911},
 }
 
-// Deprecated: Use EnumValueOptions.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use EnumValueOptions.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*EnumValueOptions) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_EnumValueOptions
 }
@@ -2055,7 +2055,7 @@ func (x *ServiceOptions) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use ServiceOptions.ProtoReflect.Type instead.
+// Deprecated: Use ServiceOptions.ProtoReflect.Descriptor instead.
 func (*ServiceOptions) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{16}
 }
@@ -2064,7 +2064,7 @@ var extRange_ServiceOptions = []protoiface.ExtensionRangeV1{
 	{Start: 1000, End: 536870911},
 }
 
-// Deprecated: Use ServiceOptions.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use ServiceOptions.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*ServiceOptions) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_ServiceOptions
 }
@@ -2122,7 +2122,7 @@ func (x *MethodOptions) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use MethodOptions.ProtoReflect.Type instead.
+// Deprecated: Use MethodOptions.ProtoReflect.Descriptor instead.
 func (*MethodOptions) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{17}
 }
@@ -2131,7 +2131,7 @@ var extRange_MethodOptions = []protoiface.ExtensionRangeV1{
 	{Start: 1000, End: 536870911},
 }
 
-// Deprecated: Use MethodOptions.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use MethodOptions.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*MethodOptions) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_MethodOptions
 }
@@ -2203,7 +2203,7 @@ func (x *UninterpretedOption) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use UninterpretedOption.ProtoReflect.Type instead.
+// Deprecated: Use UninterpretedOption.ProtoReflect.Descriptor instead.
 func (*UninterpretedOption) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{18}
 }
@@ -2331,7 +2331,7 @@ func (x *SourceCodeInfo) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use SourceCodeInfo.ProtoReflect.Type instead.
+// Deprecated: Use SourceCodeInfo.ProtoReflect.Descriptor instead.
 func (*SourceCodeInfo) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{19}
 }
@@ -2377,7 +2377,7 @@ func (x *GeneratedCodeInfo) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use GeneratedCodeInfo.ProtoReflect.Type instead.
+// Deprecated: Use GeneratedCodeInfo.ProtoReflect.Descriptor instead.
 func (*GeneratedCodeInfo) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{20}
 }
@@ -2420,7 +2420,7 @@ func (x *DescriptorProto_ExtensionRange) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use DescriptorProto_ExtensionRange.ProtoReflect.Type instead.
+// Deprecated: Use DescriptorProto_ExtensionRange.ProtoReflect.Descriptor instead.
 func (*DescriptorProto_ExtensionRange) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{2, 0}
 }
@@ -2479,7 +2479,7 @@ func (x *DescriptorProto_ReservedRange) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use DescriptorProto_ReservedRange.ProtoReflect.Type instead.
+// Deprecated: Use DescriptorProto_ReservedRange.ProtoReflect.Descriptor instead.
 func (*DescriptorProto_ReservedRange) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{2, 1}
 }
@@ -2534,7 +2534,7 @@ func (x *EnumDescriptorProto_EnumReservedRange) ProtoReflect() protoreflect.Mess
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use EnumDescriptorProto_EnumReservedRange.ProtoReflect.Type instead.
+// Deprecated: Use EnumDescriptorProto_EnumReservedRange.ProtoReflect.Descriptor instead.
 func (*EnumDescriptorProto_EnumReservedRange) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{6, 0}
 }
@@ -2588,7 +2588,7 @@ func (x *UninterpretedOption_NamePart) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use UninterpretedOption_NamePart.ProtoReflect.Type instead.
+// Deprecated: Use UninterpretedOption_NamePart.ProtoReflect.Descriptor instead.
 func (*UninterpretedOption_NamePart) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{18, 0}
 }
@@ -2715,7 +2715,7 @@ func (x *SourceCodeInfo_Location) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use SourceCodeInfo_Location.ProtoReflect.Type instead.
+// Deprecated: Use SourceCodeInfo_Location.ProtoReflect.Descriptor instead.
 func (*SourceCodeInfo_Location) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{19, 0}
 }
@@ -2795,7 +2795,7 @@ func (x *GeneratedCodeInfo_Annotation) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use GeneratedCodeInfo_Annotation.ProtoReflect.Type instead.
+// Deprecated: Use GeneratedCodeInfo_Annotation.ProtoReflect.Descriptor instead.
 func (*GeneratedCodeInfo_Annotation) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{20, 0}
 }

+ 1 - 1
types/known/anypb/any.pb.go

@@ -156,7 +156,7 @@ func (x *Any) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Any.ProtoReflect.Type instead.
+// Deprecated: Use Any.ProtoReflect.Descriptor instead.
 func (*Any) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_any_proto_rawDescGZIP(), []int{0}
 }

+ 3 - 3
types/known/apipb/api.pb.go

@@ -92,7 +92,7 @@ func (x *Api) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Api.ProtoReflect.Type instead.
+// Deprecated: Use Api.ProtoReflect.Descriptor instead.
 func (*Api) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_api_proto_rawDescGZIP(), []int{0}
 }
@@ -189,7 +189,7 @@ func (x *Method) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Method.ProtoReflect.Type instead.
+// Deprecated: Use Method.ProtoReflect.Descriptor instead.
 func (*Method) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_api_proto_rawDescGZIP(), []int{1}
 }
@@ -354,7 +354,7 @@ func (x *Mixin) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Mixin.ProtoReflect.Type instead.
+// Deprecated: Use Mixin.ProtoReflect.Descriptor instead.
 func (*Mixin) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_api_proto_rawDescGZIP(), []int{2}
 }

+ 1 - 1
types/known/durationpb/duration.pb.go

@@ -116,7 +116,7 @@ func (x *Duration) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Duration.ProtoReflect.Type instead.
+// Deprecated: Use Duration.ProtoReflect.Descriptor instead.
 func (*Duration) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_duration_proto_rawDescGZIP(), []int{0}
 }

+ 1 - 1
types/known/emptypb/empty.pb.go

@@ -54,7 +54,7 @@ func (x *Empty) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Empty.ProtoReflect.Type instead.
+// Deprecated: Use Empty.ProtoReflect.Descriptor instead.
 func (*Empty) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_empty_proto_rawDescGZIP(), []int{0}
 }

+ 1 - 1
types/known/fieldmaskpb/field_mask.pb.go

@@ -246,7 +246,7 @@ func (x *FieldMask) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use FieldMask.ProtoReflect.Type instead.
+// Deprecated: Use FieldMask.ProtoReflect.Descriptor instead.
 func (*FieldMask) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_field_mask_proto_rawDescGZIP(), []int{0}
 }

+ 1 - 1
types/known/sourcecontextpb/source_context.pb.go

@@ -50,7 +50,7 @@ func (x *SourceContext) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use SourceContext.ProtoReflect.Type instead.
+// Deprecated: Use SourceContext.ProtoReflect.Descriptor instead.
 func (*SourceContext) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_source_context_proto_rawDescGZIP(), []int{0}
 }

+ 4 - 4
types/known/structpb/struct.pb.go

@@ -59,7 +59,7 @@ func (x NullValue) Number() protoreflect.EnumNumber {
 	return protoreflect.EnumNumber(x)
 }
 
-// Deprecated: Use NullValue.Type instead.
+// Deprecated: Use NullValue.Descriptor instead.
 func (NullValue) EnumDescriptor() ([]byte, []int) {
 	return file_google_protobuf_struct_proto_rawDescGZIP(), []int{0}
 }
@@ -102,7 +102,7 @@ func (x *Struct) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Struct.ProtoReflect.Type instead.
+// Deprecated: Use Struct.ProtoReflect.Descriptor instead.
 func (*Struct) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_struct_proto_rawDescGZIP(), []int{0}
 }
@@ -164,7 +164,7 @@ func (x *Value) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Value.ProtoReflect.Type instead.
+// Deprecated: Use Value.ProtoReflect.Descriptor instead.
 func (*Value) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_struct_proto_rawDescGZIP(), []int{1}
 }
@@ -291,7 +291,7 @@ func (x *ListValue) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use ListValue.ProtoReflect.Type instead.
+// Deprecated: Use ListValue.ProtoReflect.Descriptor instead.
 func (*ListValue) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_struct_proto_rawDescGZIP(), []int{2}
 }

+ 1 - 1
types/known/timestamppb/timestamp.pb.go

@@ -136,7 +136,7 @@ func (x *Timestamp) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Timestamp.ProtoReflect.Type instead.
+// Deprecated: Use Timestamp.ProtoReflect.Descriptor instead.
 func (*Timestamp) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_timestamp_proto_rawDescGZIP(), []int{0}
 }

+ 8 - 8
types/known/typepb/type.pb.go

@@ -62,7 +62,7 @@ func (x Syntax) Number() protoreflect.EnumNumber {
 	return protoreflect.EnumNumber(x)
 }
 
-// Deprecated: Use Syntax.Type instead.
+// Deprecated: Use Syntax.Descriptor instead.
 func (Syntax) EnumDescriptor() ([]byte, []int) {
 	return file_google_protobuf_type_proto_rawDescGZIP(), []int{0}
 }
@@ -177,7 +177,7 @@ func (x Field_Kind) Number() protoreflect.EnumNumber {
 	return protoreflect.EnumNumber(x)
 }
 
-// Deprecated: Use Field_Kind.Type instead.
+// Deprecated: Use Field_Kind.Descriptor instead.
 func (Field_Kind) EnumDescriptor() ([]byte, []int) {
 	return file_google_protobuf_type_proto_rawDescGZIP(), []int{1, 0}
 }
@@ -232,7 +232,7 @@ func (x Field_Cardinality) Number() protoreflect.EnumNumber {
 	return protoreflect.EnumNumber(x)
 }
 
-// Deprecated: Use Field_Cardinality.Type instead.
+// Deprecated: Use Field_Cardinality.Descriptor instead.
 func (Field_Cardinality) EnumDescriptor() ([]byte, []int) {
 	return file_google_protobuf_type_proto_rawDescGZIP(), []int{1, 1}
 }
@@ -278,7 +278,7 @@ func (x *Type) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Type.ProtoReflect.Type instead.
+// Deprecated: Use Type.ProtoReflect.Descriptor instead.
 func (*Type) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_type_proto_rawDescGZIP(), []int{0}
 }
@@ -376,7 +376,7 @@ func (x *Field) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Field.ProtoReflect.Type instead.
+// Deprecated: Use Field.ProtoReflect.Descriptor instead.
 func (*Field) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_type_proto_rawDescGZIP(), []int{1}
 }
@@ -490,7 +490,7 @@ func (x *Enum) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Enum.ProtoReflect.Type instead.
+// Deprecated: Use Enum.ProtoReflect.Descriptor instead.
 func (*Enum) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_type_proto_rawDescGZIP(), []int{2}
 }
@@ -565,7 +565,7 @@ func (x *EnumValue) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use EnumValue.ProtoReflect.Type instead.
+// Deprecated: Use EnumValue.ProtoReflect.Descriptor instead.
 func (*EnumValue) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_type_proto_rawDescGZIP(), []int{3}
 }
@@ -631,7 +631,7 @@ func (x *Option) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Option.ProtoReflect.Type instead.
+// Deprecated: Use Option.ProtoReflect.Descriptor instead.
 func (*Option) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_type_proto_rawDescGZIP(), []int{4}
 }

+ 9 - 9
types/known/wrapperspb/wrappers.pb.go

@@ -50,7 +50,7 @@ func (x *DoubleValue) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use DoubleValue.ProtoReflect.Type instead.
+// Deprecated: Use DoubleValue.ProtoReflect.Descriptor instead.
 func (*DoubleValue) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_wrappers_proto_rawDescGZIP(), []int{0}
 }
@@ -95,7 +95,7 @@ func (x *FloatValue) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use FloatValue.ProtoReflect.Type instead.
+// Deprecated: Use FloatValue.ProtoReflect.Descriptor instead.
 func (*FloatValue) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_wrappers_proto_rawDescGZIP(), []int{1}
 }
@@ -140,7 +140,7 @@ func (x *Int64Value) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Int64Value.ProtoReflect.Type instead.
+// Deprecated: Use Int64Value.ProtoReflect.Descriptor instead.
 func (*Int64Value) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_wrappers_proto_rawDescGZIP(), []int{2}
 }
@@ -185,7 +185,7 @@ func (x *UInt64Value) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use UInt64Value.ProtoReflect.Type instead.
+// Deprecated: Use UInt64Value.ProtoReflect.Descriptor instead.
 func (*UInt64Value) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_wrappers_proto_rawDescGZIP(), []int{3}
 }
@@ -230,7 +230,7 @@ func (x *Int32Value) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Int32Value.ProtoReflect.Type instead.
+// Deprecated: Use Int32Value.ProtoReflect.Descriptor instead.
 func (*Int32Value) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_wrappers_proto_rawDescGZIP(), []int{4}
 }
@@ -275,7 +275,7 @@ func (x *UInt32Value) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use UInt32Value.ProtoReflect.Type instead.
+// Deprecated: Use UInt32Value.ProtoReflect.Descriptor instead.
 func (*UInt32Value) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_wrappers_proto_rawDescGZIP(), []int{5}
 }
@@ -320,7 +320,7 @@ func (x *BoolValue) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use BoolValue.ProtoReflect.Type instead.
+// Deprecated: Use BoolValue.ProtoReflect.Descriptor instead.
 func (*BoolValue) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_wrappers_proto_rawDescGZIP(), []int{6}
 }
@@ -365,7 +365,7 @@ func (x *StringValue) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use StringValue.ProtoReflect.Type instead.
+// Deprecated: Use StringValue.ProtoReflect.Descriptor instead.
 func (*StringValue) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_wrappers_proto_rawDescGZIP(), []int{7}
 }
@@ -410,7 +410,7 @@ func (x *BytesValue) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use BytesValue.ProtoReflect.Type instead.
+// Deprecated: Use BytesValue.ProtoReflect.Descriptor instead.
 func (*BytesValue) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_wrappers_proto_rawDescGZIP(), []int{8}
 }

+ 4 - 4
types/pluginpb/plugin.pb.go

@@ -53,7 +53,7 @@ func (x *Version) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Version.ProtoReflect.Type instead.
+// Deprecated: Use Version.ProtoReflect.Descriptor instead.
 func (*Version) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_compiler_plugin_proto_rawDescGZIP(), []int{0}
 }
@@ -138,7 +138,7 @@ func (x *CodeGeneratorRequest) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use CodeGeneratorRequest.ProtoReflect.Type instead.
+// Deprecated: Use CodeGeneratorRequest.ProtoReflect.Descriptor instead.
 func (*CodeGeneratorRequest) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_compiler_plugin_proto_rawDescGZIP(), []int{1}
 }
@@ -210,7 +210,7 @@ func (x *CodeGeneratorResponse) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use CodeGeneratorResponse.ProtoReflect.Type instead.
+// Deprecated: Use CodeGeneratorResponse.ProtoReflect.Descriptor instead.
 func (*CodeGeneratorResponse) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_compiler_plugin_proto_rawDescGZIP(), []int{2}
 }
@@ -310,7 +310,7 @@ func (x *CodeGeneratorResponse_File) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use CodeGeneratorResponse_File.ProtoReflect.Type instead.
+// Deprecated: Use CodeGeneratorResponse_File.ProtoReflect.Descriptor instead.
 func (*CodeGeneratorResponse_File) Descriptor() ([]byte, []int) {
 	return file_google_protobuf_compiler_plugin_proto_rawDescGZIP(), []int{2, 0}
 }