proto: remove dependency on github.com/golang/protobuf
The only remaining dependencies are for benchmarks and
internal/testprotos/legacy.
Change-Id: I0f7f5292000ccad91bc9526e40fa4d0ec3a36e43
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/186157
Reviewed-by: Damien Neil <dneil@google.com>
diff --git a/proto/decode_test.go b/proto/decode_test.go
index ce2e1af..c32c94c 100644
--- a/proto/decode_test.go
+++ b/proto/decode_test.go
@@ -9,7 +9,6 @@
"reflect"
"testing"
- protoV1 "github.com/golang/protobuf/proto"
"google.golang.org/protobuf/encoding/prototext"
"google.golang.org/protobuf/internal/encoding/pack"
"google.golang.org/protobuf/internal/filedesc"
@@ -17,8 +16,8 @@
"google.golang.org/protobuf/proto"
"google.golang.org/protobuf/reflect/protodesc"
"google.golang.org/protobuf/reflect/protoreflect"
- pref "google.golang.org/protobuf/reflect/protoreflect"
"google.golang.org/protobuf/reflect/prototype"
+ "google.golang.org/protobuf/runtime/protoiface"
"google.golang.org/protobuf/runtime/protoimpl"
legacypb "google.golang.org/protobuf/internal/testprotos/legacy"
@@ -1541,7 +1540,7 @@
func (*TestNoEnforceUTF8_OneofString) isOneofField() {}
func (*TestNoEnforceUTF8_OneofBytes) isOneofField() {}
-func (m *TestNoEnforceUTF8) ProtoReflect() pref.Message {
+func (m *TestNoEnforceUTF8) ProtoReflect() protoreflect.Message {
return messageInfo_TestNoEnforceUTF8.MessageOf(m)
}
@@ -1579,8 +1578,8 @@
}
return md
}(),
- NewMessage: func() pref.Message {
- return pref.ProtoMessage(new(TestNoEnforceUTF8)).ProtoReflect()
+ NewMessage: func() protoreflect.Message {
+ return protoreflect.ProtoMessage(new(TestNoEnforceUTF8)).ProtoReflect()
},
},
OneofWrappers: []interface{}{
@@ -1598,13 +1597,13 @@
type buildOpt func(proto.Message)
-func unknown(raw pref.RawFields) buildOpt {
+func unknown(raw protoreflect.RawFields) buildOpt {
return func(m proto.Message) {
m.ProtoReflect().SetUnknown(raw)
}
}
-func extend(desc *protoV1.ExtensionDesc, value interface{}) buildOpt {
+func extend(desc *protoiface.ExtensionDescV1, value interface{}) buildOpt {
// TODO: Should ExtensionType.ValueOf accept []T instead of *[]T?
t := reflect.TypeOf(value)
if t.Kind() == reflect.Slice && t.Elem().Kind() != reflect.Uint8 {