internal/legacy: remove dependency on descriptor.proto
We jump through many hoops to avoid generated protos depending on
internal/legacy. Break the cycle in the other direction: Remove
the dependency on descriptor.proto from internal/legacy by
using a hand-written parser for the few descriptor fields we need.
Still to do: Remove the descriptor.proto dependency from
internal/encoding/tag.
Change-Id: I5fd99a2170470ba8530eb2679b6dde899821bf3e
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/171457
Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
diff --git a/internal/legacy/file_test.go b/internal/legacy/file_test.go
index 1a8df96..15dca7b 100644
--- a/internal/legacy/file_test.go
+++ b/internal/legacy/file_test.go
@@ -5,13 +5,18 @@
package legacy_test
import (
+ "bytes"
+ "compress/gzip"
+ "io/ioutil"
"reflect"
"testing"
legacy "github.com/golang/protobuf/v2/internal/legacy"
pragma "github.com/golang/protobuf/v2/internal/pragma"
+ "github.com/golang/protobuf/v2/proto"
pdesc "github.com/golang/protobuf/v2/reflect/protodesc"
pref "github.com/golang/protobuf/v2/reflect/protoreflect"
+ descriptorpb "github.com/golang/protobuf/v2/types/descriptor"
cmp "github.com/google/go-cmp/cmp"
proto2_20160225 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto2.v0.0.0-20160225-2fc053c5"
@@ -29,7 +34,20 @@
)
func mustLoadFileDesc(b []byte, _ []int) pref.FileDescriptor {
- fd, err := pdesc.NewFile(legacy.LoadFileDesc(b), nil)
+ zr, err := gzip.NewReader(bytes.NewReader(b))
+ if err != nil {
+ panic(err)
+ }
+ b, err = ioutil.ReadAll(zr)
+ if err != nil {
+ panic(err)
+ }
+ p := new(descriptorpb.FileDescriptorProto)
+ err = proto.UnmarshalOptions{DiscardUnknown: true}.Unmarshal(b, p)
+ if err != nil {
+ panic(err)
+ }
+ fd, err := pdesc.NewFile(p, nil)
if err != nil {
panic(err)
}