this repo has no description
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

update txtpbfmt to drop indirect dependency on glog

cuelang.org/go/encoding/protobuf/textproto imports
github.com/protocolbuffers/txtpbfmt/parser,
which is a fairly low-level package but offers optional log messages.

Those used to be implemented directly with github.com/golang/glog,
meaning that CUE users had to include glog as an indirect dependency.
This has minor implications in terms of download and binary sizes,
but it also meant that glog's global flags got registered in package
flag's default flagset, potentially affecting Go library users as well.

We sent a couple of pull requests to txtpbfmt to replace its hard
dependency on glog in favor of a minimal logging interface.
Now that those are merged, we can update the version.
One can see that glog is no longer an indirect requirement in go.mod.

The full list of changes included in upstream's 20 commits is at:
https://github.com/protocolbuffers/txtpbfmt/compare/74888fd59c2b...3462fbc510c0
Of note is that the parser preserves more comments now,
which causes a minor improvement in our test cases.

Fixes #1199.

Signed-off-by: Daniel Martí <mvdan@mvdan.cc>
Change-Id: I2c14a12e343f748df6e66b390495d72f628a96c4
Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/552359
Unity-Result: CUEcueckoo <cueckoo@cuelang.org>
TryBot-Result: CUEcueckoo <cueckoo@cuelang.org>
Reviewed-by: Paul Jolly <paul@myitcv.io>
Reviewed-by: Marcel van Lohuizen <mpvl@gmail.com>

+6 -8
+3
encoding/protobuf/textproto/testdata/decoder/comments.txtar
··· 77 77 123, // elem 0 line comment 78 78 79 79 // trailing elem 0 80 + // inbetween comment 1 80 81 // inbetween comment 2 82 + // doc elem 1 81 83 456, // elem 1 line comment 82 84 83 85 // trailing elem 1 86 + // final floating 1 84 87 85 88 // final floating 2 86 89 ]
+1 -2
go.mod
··· 11 11 github.com/kr/pretty v0.1.0 12 12 github.com/kylelemons/godebug v1.1.0 13 13 github.com/mpvl/unique v0.0.0-20150818121801-cbe035fff7de 14 - github.com/protocolbuffers/txtpbfmt v0.0.0-20220428173112-74888fd59c2b 14 + github.com/protocolbuffers/txtpbfmt v0.0.0-20230328191034-3462fbc510c0 15 15 github.com/rogpeppe/go-internal v1.10.0 16 16 github.com/spf13/cobra v1.4.0 17 17 github.com/spf13/pflag v1.0.5 ··· 25 25 26 26 require ( 27 27 github.com/davecgh/go-spew v1.1.1 // indirect 28 - github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect 29 28 github.com/inconshreveable/mousetrap v1.0.0 // indirect 30 29 github.com/kr/text v0.1.0 // indirect 31 30 github.com/lib/pq v1.0.0 // indirect
+2 -6
go.sum
··· 5 5 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 6 6 github.com/emicklei/proto v1.10.0 h1:pDGyFRVV5RvV+nkBK9iy3q67FBy9Xa7vwrOTE+g5aGw= 7 7 github.com/emicklei/proto v1.10.0/go.mod h1:rn1FgRS/FANiZdD2djyH7TMA9jdRDcYQ9IEN9yvjX0A= 8 - github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= 9 - github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= 10 - github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= 11 8 github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= 12 9 github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= 13 10 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4= ··· 34 31 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= 35 32 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= 36 33 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= 37 - github.com/protocolbuffers/txtpbfmt v0.0.0-20220428173112-74888fd59c2b h1:zd/2RNzIRkoGGMjE+YIsZ85CnDIz672JK2F3Zl4vux4= 38 - github.com/protocolbuffers/txtpbfmt v0.0.0-20220428173112-74888fd59c2b/go.mod h1:KjY0wibdYKc4DYkerHSbguaf3JeIPGhNJBp2BNiFH78= 34 + github.com/protocolbuffers/txtpbfmt v0.0.0-20230328191034-3462fbc510c0 h1:sadMIsgmHpEOGbUs6VtHBXRR1OHevnj7hLx9ZcdNGW4= 35 + github.com/protocolbuffers/txtpbfmt v0.0.0-20230328191034-3462fbc510c0/go.mod h1:jgxiZysxFPM+iWKwQwPR+y+Jvo54ARd4EisXxKYpB5c= 39 36 github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= 40 37 github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= 41 38 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= ··· 56 53 golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= 57 54 golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4= 58 55 golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s= 59 - golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= 60 56 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= 61 57 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= 62 58 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=