| Index: client/flagpb/resolver.go
|
| diff --git a/client/flagpb/resolver.go b/client/flagpb/resolver.go
|
| index 3f74fb430d850abc030e7b829b28162517ed437b..36110b18b1b5be5d386431c2f4420d874b637ada 100644
|
| --- a/client/flagpb/resolver.go
|
| +++ b/client/flagpb/resolver.go
|
| @@ -4,7 +4,11 @@
|
|
|
| package flagpb
|
|
|
| -import "github.com/luci/luci-go/common/proto/google/descriptor"
|
| +import (
|
| + "github.com/luci/luci-go/common/proto/google/descutil"
|
| +
|
| + "google.golang.org/genproto/protobuf"
|
| +)
|
|
|
| // Resolver resolves type names.
|
| type Resolver interface {
|
| @@ -24,7 +28,7 @@ type descriptorSetResolver struct {
|
| }
|
|
|
| func (r *descriptorSetResolver) Resolve(name string) interface{} {
|
| - _, o, _ := r.set.Resolve(name)
|
| + _, o, _ := descutil.Resolve(r.set, name)
|
| switch o := o.(type) {
|
| case *descriptor.DescriptorProto, *descriptor.EnumDescriptorProto:
|
| return o
|
|
|