all: drop reflect/prototype package
Remove the remaining uses of the prototype package.
The most significant change is to impl.MessageInfo, which now directly
implements the MessageType interface. This involves two notable changes
to exported fields of MessageInfo:
- PBType is now Desc.
- GoType is now GoReflectType. (Name changed to avoid a conflict with
the GoType method of the MessageType interface.)
Fixes golang/protobuf#911
Change-Id: Ie2aa4766d6887ceaa9cf06b1f109aa6e6e2a208f
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189340
Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
diff --git a/internal/impl/api_export.go b/internal/impl/api_export.go
index d031d17..a149612 100644
--- a/internal/impl/api_export.go
+++ b/internal/impl/api_export.go
@@ -10,7 +10,6 @@
"google.golang.org/protobuf/encoding/prototext"
pref "google.golang.org/protobuf/reflect/protoreflect"
- "google.golang.org/protobuf/reflect/prototype"
piface "google.golang.org/protobuf/runtime/protoiface"
)
@@ -33,12 +32,7 @@
// EnumTypeOf returns the protoreflect.EnumType for e.
func (Export) EnumTypeOf(e enum) pref.EnumType {
if ev, ok := e.(pref.Enum); ok {
- return &prototype.Enum{
- EnumDescriptor: ev.Descriptor(),
- NewEnum: func(n pref.EnumNumber) pref.Enum {
- return reflect.ValueOf(n).Convert(reflect.TypeOf(e)).Interface().(pref.Enum)
- },
- }
+ return ev.Type()
}
return legacyLoadEnumType(reflect.TypeOf(e))
}
@@ -76,14 +70,9 @@
// MessageTypeOf returns the protoreflect.MessageType for m.
func (Export) MessageTypeOf(m message) pref.MessageType {
if mv, ok := m.(pref.ProtoMessage); ok {
- return &prototype.Message{
- MessageDescriptor: mv.ProtoReflect().Descriptor(),
- NewMessage: func() pref.Message {
- return reflect.New(reflect.TypeOf(m).Elem()).Interface().(pref.ProtoMessage).ProtoReflect()
- },
- }
+ return mv.ProtoReflect().Type()
}
- return legacyLoadMessageInfo(reflect.TypeOf(m)).PBType
+ return legacyLoadMessageInfo(reflect.TypeOf(m))
}
// MessageDescriptorOf returns the protoreflect.MessageDescriptor for m.