From 8e1e7001aa98c422d8f2e8bd79445a797c12f174 Mon Sep 17 00:00:00 2001 From: k2tzumi Date: Fri, 11 Aug 2023 14:24:41 +0900 Subject: [PATCH 1/3] go mod edit -go=1.21 --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index b4faaa34..8b905e4c 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/jhump/protoreflect -go 1.18 +go 1.21 require ( github.com/bufbuild/protocompile v0.4.0 From eba1e1f689a8c9fcab2a49256cd2d2484b604efb Mon Sep 17 00:00:00 2001 From: k2tzumi Date: Fri, 11 Aug 2023 16:17:54 +0900 Subject: [PATCH 2/3] Update protocompile v0.4.0 => v0.6.0 --- go.mod | 6 +++--- go.sum | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 8b905e4c..07b6b22a 100644 --- a/go.mod +++ b/go.mod @@ -3,17 +3,17 @@ module github.com/jhump/protoreflect go 1.21 require ( - github.com/bufbuild/protocompile v0.4.0 + github.com/bufbuild/protocompile v0.6.0 github.com/golang/protobuf v1.5.2 github.com/jhump/gopoet v0.1.0 github.com/jhump/goprotoc v0.5.0 google.golang.org/grpc v1.53.0 - google.golang.org/protobuf v1.28.2-0.20230222093303-bc1253ad3743 + google.golang.org/protobuf v1.31.0 ) require ( golang.org/x/net v0.7.0 // indirect - golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect + golang.org/x/sync v0.3.0 // indirect golang.org/x/sys v0.5.0 // indirect golang.org/x/text v0.7.0 // indirect google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect diff --git a/go.sum b/go.sum index 5e7fecf7..cfbd925a 100644 --- a/go.sum +++ b/go.sum @@ -2,6 +2,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8= +github.com/bufbuild/protocompile v0.6.0 h1:Uu7WiSQ6Yj9DbkdnOe7U4mNKp58y9WDMKDn28/ZlunY= +github.com/bufbuild/protocompile v0.6.0/go.mod h1:YNP35qEYoYGme7QMtz5SBCoN4kL4g12jTtjuzRNdjpE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= @@ -69,6 +71,8 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= +golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -112,6 +116,8 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.2-0.20230222093303-bc1253ad3743 h1:yqElulDvOF26oZ2O+2/aoX7mQ8DY/6+p39neytrycd8= google.golang.org/protobuf v1.28.2-0.20230222093303-bc1253ad3743/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= From c906cc00028572334be0264d30e1b58112267824 Mon Sep 17 00:00:00 2001 From: k2tzumi Date: Fri, 11 Aug 2023 16:18:16 +0900 Subject: [PATCH 3/3] Fix type --- desc/protoparse/ast.go | 6 +++--- desc/protoparse/parser.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/desc/protoparse/ast.go b/desc/protoparse/ast.go index 0bc09387..cede3cb2 100644 --- a/desc/protoparse/ast.go +++ b/desc/protoparse/ast.go @@ -148,7 +148,7 @@ func convertASTMessageElement(f *ast.FileNode, el ast.MessageElement) ast2.Messa return convertASTField(f, el) case *ast.MapFieldNode: return convertASTMapField(f, el) - case *ast.OneOfNode: + case *ast.OneofNode: return convertASTOneOf(f, el) case *ast.GroupNode: return convertASTGroup(f, el) @@ -241,7 +241,7 @@ func convertASTGroup(f *ast.FileNode, g *ast.GroupNode) *ast2.GroupNode { ) } -func convertASTOneOf(f *ast.FileNode, oo *ast.OneOfNode) *ast2.OneOfNode { +func convertASTOneOf(f *ast.FileNode, oo *ast.OneofNode) *ast2.OneOfNode { decls := make([]ast2.OneOfElement, len(oo.Decls)) for i := range oo.Decls { decls[i] = convertASTOneOfElement(f, oo.Decls[i]) @@ -255,7 +255,7 @@ func convertASTOneOf(f *ast.FileNode, oo *ast.OneOfNode) *ast2.OneOfNode { ) } -func convertASTOneOfElement(f *ast.FileNode, el ast.OneOfElement) ast2.OneOfElement { +func convertASTOneOfElement(f *ast.FileNode, el ast.OneofElement) ast2.OneOfElement { switch el := el.(type) { case *ast.OptionNode: return convertASTOption(f, el) diff --git a/desc/protoparse/parser.go b/desc/protoparse/parser.go index a1312d11..d476873e 100644 --- a/desc/protoparse/parser.go +++ b/desc/protoparse/parser.go @@ -254,7 +254,7 @@ func (p Parser) ParseFilesButDoNotLink(filenames ...string) ([]*descriptorpb.Fil protos := make([]*descriptorpb.FileDescriptorProto, len(results)) for i, res := range results { protos[i] = res.FileDescriptorProto() - var optsIndex options.Index + var optsIndex sourceinfo.OptionIndex if p.InterpretOptionsInUnlinkedFiles { var err error optsIndex, err = options.InterpretUnlinkedOptions(res)