reflect/prototype: change registered option types to interface{}

Followup to https://go-review.googlesource.com/c/154877, changing some
additional references to the XXXOptions messages to interface{}.

Change-Id: I907ae5bede296ca95622eaaf9fdfb0c94b2f2a5f
Reviewed-on: https://go-review.googlesource.com/c/155458
Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
This commit is contained in:
Damien Neil 2018-12-20 15:15:02 -08:00
parent bc534a98a5
commit eb6b5877e6

View File

@ -4,8 +4,6 @@
package prototype package prototype
import pref "github.com/golang/protobuf/v2/reflect/protoreflect"
// X provides functionality internal to the protobuf module. // X provides functionality internal to the protobuf module.
// //
// WARNING: The compatibility agreement covers nothing except for functionality // WARNING: The compatibility agreement covers nothing except for functionality
@ -18,23 +16,23 @@ type internal struct{}
// optionTypes contains typed nil-pointers to each of the options types. // optionTypes contains typed nil-pointers to each of the options types.
// These are populated at init time by the descriptor package. // These are populated at init time by the descriptor package.
var optionTypes struct { var optionTypes struct {
File pref.ProtoMessage File interface{}
Enum pref.ProtoMessage Enum interface{}
EnumValue pref.ProtoMessage EnumValue interface{}
Message pref.ProtoMessage Message interface{}
Field pref.ProtoMessage Field interface{}
Oneof pref.ProtoMessage Oneof interface{}
ExtensionRange pref.ProtoMessage ExtensionRange interface{}
Service pref.ProtoMessage Service interface{}
Method pref.ProtoMessage Method interface{}
} }
func (internal) RegisterFileOptions(m pref.ProtoMessage) { optionTypes.File = m } func (internal) RegisterFileOptions(m interface{}) { optionTypes.File = m }
func (internal) RegisterEnumOptions(m pref.ProtoMessage) { optionTypes.Enum = m } func (internal) RegisterEnumOptions(m interface{}) { optionTypes.Enum = m }
func (internal) RegisterEnumValueOptions(m pref.ProtoMessage) { optionTypes.EnumValue = m } func (internal) RegisterEnumValueOptions(m interface{}) { optionTypes.EnumValue = m }
func (internal) RegisterMessageOptions(m pref.ProtoMessage) { optionTypes.Message = m } func (internal) RegisterMessageOptions(m interface{}) { optionTypes.Message = m }
func (internal) RegisterFieldOptions(m pref.ProtoMessage) { optionTypes.Field = m } func (internal) RegisterFieldOptions(m interface{}) { optionTypes.Field = m }
func (internal) RegisterOneofOptions(m pref.ProtoMessage) { optionTypes.Oneof = m } func (internal) RegisterOneofOptions(m interface{}) { optionTypes.Oneof = m }
func (internal) RegisterExtensionRangeOptions(m pref.ProtoMessage) { optionTypes.ExtensionRange = m } func (internal) RegisterExtensionRangeOptions(m interface{}) { optionTypes.ExtensionRange = m }
func (internal) RegisterServiceOptions(m pref.ProtoMessage) { optionTypes.Service = m } func (internal) RegisterServiceOptions(m interface{}) { optionTypes.Service = m }
func (internal) RegisterMethodOptions(m pref.ProtoMessage) { optionTypes.Method = m } func (internal) RegisterMethodOptions(m interface{}) { optionTypes.Method = m }