Skip to content
Snippets Groups Projects

Update module golang/protobuf to v1.5.1

Merged Update module golang/protobuf to v1.5.1
renovate/github.com-golang-protobuf-1.x into master
Merged renovate requested to merge renovate/github.com-golang-protobuf-1.x into master
Compare
and
100 files
+ 6528
− 2127
Compare changes
  • Side-by-side
  • Inline
Files
100
vendor/github.com/golang/protobuf/proto/registry.go
+ 2
− 8
@@ -13,6 +13,7 @@ import (
"strings"
"sync"
"google.golang.org/protobuf/reflect/protodesc"
"google.golang.org/protobuf/reflect/protoreflect"
"google.golang.org/protobuf/reflect/protoregistry"
"google.golang.org/protobuf/runtime/protoimpl"
@@ -62,14 +63,7 @@ func FileDescriptor(s filePath) fileDescGZIP {
// Find the descriptor in the v2 registry.
var b []byte
if fd, _ := protoregistry.GlobalFiles.FindFileByPath(s); fd != nil {
if fd, ok := fd.(interface{ ProtoLegacyRawDesc() []byte }); ok {
b = fd.ProtoLegacyRawDesc()
} else {
// TODO: Use protodesc.ToFileDescriptorProto to construct
// a descriptorpb.FileDescriptorProto and marshal it.
// However, doing so causes the proto package to have a dependency
// on descriptorpb, leading to cyclic dependency issues.
}
b, _ = Marshal(protodesc.ToFileDescriptorProto(fd))
}
// Locally cache the raw descriptor form for the file.