From 6cacac16ce2f94d21bf864011f5e0d2181a1a8bf Mon Sep 17 00:00:00 2001 From: Dmitri Shuralyov Date: Thu, 5 Jun 2025 10:30:45 -0400 Subject: [PATCH 1/2] go.mod: update tagx:ignore'd golang.org/x dependencies These dependencies aren't yet automatically updated due to cycles, leaving them to be maintained manually. They haven't been updated in some time. Do that now. Updating to a newer x/tools version fixes a build error at Go tip: $ go version go version go1.25-devel_eebae283b6 Mon Jun 2 15:28:33 2025 -0700 darwin/arm64 # CL 675736 $ go test -c -o=/dev/null ./... # golang.org/x/tools/internal/tokeninternal $GOMODCACHE/golang.org/x/tools@v0.21.1-0.20240508182429-e35e4ccd0d2d/internal/tokeninternal/tokeninternal.go:64:9: invalid array length -delta * delta (constant -256 of type int64) FAIL golang.org/x/text/cmd/gotext [build failed] For golang/go#73264. For golang/go#73205. Change-Id: Ie6be2f827ba7e49f6d8469e9a53f314b4247759d Reviewed-on: https://go-review.googlesource.com/c/text/+/679115 Reviewed-by: Dmitri Shuralyov Auto-Submit: Dmitri Shuralyov LUCI-TryBot-Result: Go LUCI Reviewed-by: Carlos Amedee --- go.mod | 9 +++++---- go.sum | 10 ++++++---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 1d1452d1..6e0c88a3 100644 --- a/go.mod +++ b/go.mod @@ -2,8 +2,9 @@ module golang.org/x/text go 1.23.0 -require golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // tagx:ignore +require golang.org/x/tools v0.33.0 // tagx:ignore -require golang.org/x/mod v0.17.0 // indirect; tagx:ignore - -require golang.org/x/sync v0.14.0 // indirect +require ( + golang.org/x/mod v0.25.0 // indirect; tagx:ignore + golang.org/x/sync v0.14.0 // indirect +) diff --git a/go.sum b/go.sum index 9561f168..29b63005 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,8 @@ -golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= -golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +golang.org/x/mod v0.25.0 h1:n7a+ZbQKQA/Ysbyb0/6IbB1H/X41mKgbhfv7AfG/44w= +golang.org/x/mod v0.25.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww= golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ= golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= -golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= -golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= +golang.org/x/tools v0.33.0 h1:4qz2S3zmRxbGIhDIAgjxvFutSvH5EfnsYrRBj0UI0bc= +golang.org/x/tools v0.33.0/go.mod h1:CIJMaWEY88juyUfo7UbgPqbC8rU2OqfAV1h2Qp0oMYI= From 80721808805f9d846d907c85d73ca6b5b6ecb870 Mon Sep 17 00:00:00 2001 From: Gopher Robot Date: Thu, 5 Jun 2025 06:02:20 -0700 Subject: [PATCH 2/2] go.mod: update golang.org/x dependencies Update golang.org/x dependencies to their latest tagged versions. Change-Id: Ie551df012b5a8d6a6a0d5acb00b0955c7aec2b41 Reviewed-on: https://go-review.googlesource.com/c/text/+/678640 Reviewed-by: Carlos Amedee Auto-Submit: Dmitri Shuralyov Reviewed-by: Dmitri Shuralyov LUCI-TryBot-Result: Go LUCI --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 6e0c88a3..c0939429 100644 --- a/go.mod +++ b/go.mod @@ -6,5 +6,5 @@ require golang.org/x/tools v0.33.0 // tagx:ignore require ( golang.org/x/mod v0.25.0 // indirect; tagx:ignore - golang.org/x/sync v0.14.0 // indirect + golang.org/x/sync v0.15.0 // indirect ) diff --git a/go.sum b/go.sum index 29b63005..09862922 100644 --- a/go.sum +++ b/go.sum @@ -2,7 +2,7 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= golang.org/x/mod v0.25.0 h1:n7a+ZbQKQA/Ysbyb0/6IbB1H/X41mKgbhfv7AfG/44w= golang.org/x/mod v0.25.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww= -golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ= -golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= +golang.org/x/sync v0.15.0 h1:KWH3jNZsfyT6xfAfKiz6MRNmd46ByHDYaZ7KSkCtdW8= +golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= golang.org/x/tools v0.33.0 h1:4qz2S3zmRxbGIhDIAgjxvFutSvH5EfnsYrRBj0UI0bc= golang.org/x/tools v0.33.0/go.mod h1:CIJMaWEY88juyUfo7UbgPqbC8rU2OqfAV1h2Qp0oMYI=