From 0ce992feddf741ce751cffd6cf8767a61299e933 Mon Sep 17 00:00:00 2001 From: Aaron Son Date: Wed, 13 May 2026 14:03:08 -0700 Subject: [PATCH] [no-release-notes] go.mod: Use tool dependency on goyacc instead of tools.go pattern. --- go.mod | 6 ++++-- go.sum | 6 ++++++ go/vt/sqlparser/Makefile | 2 +- tools.go | 5 ----- tools/check_make_parser.sh | 2 +- 5 files changed, 12 insertions(+), 9 deletions(-) delete mode 100644 tools.go diff --git a/go.mod b/go.mod index 2dffb330f7e..74e44b38b93 100644 --- a/go.mod +++ b/go.mod @@ -3,9 +3,9 @@ module github.com/dolthub/vitess go 1.26.2 require ( - github.com/google/go-cmp v0.5.9 + github.com/google/go-cmp v0.6.0 github.com/stretchr/testify v1.4.0 - golang.org/x/tools v0.6.0 + golang.org/x/tools v0.45.0 google.golang.org/grpc v1.56.3 google.golang.org/protobuf v1.33.0 ) @@ -19,3 +19,5 @@ require ( gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect ) + +tool golang.org/x/tools/cmd/goyacc diff --git a/go.sum b/go.sum index 5c74bdd79ca..01346771a62 100644 --- a/go.sum +++ b/go.sum @@ -7,6 +7,8 @@ github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= @@ -19,12 +21,16 @@ github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJy github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM= golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= +golang.org/x/net v0.54.0 h1:2zJIZAxAHV/OHCDTCOHAYehQzLfSXuf/5SoL/Dv6w/w= golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.44.0 h1:ildZl3J4uzeKP07r2F++Op7E9B29JRUy+a27EibtBTQ= golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/tools v0.45.0 h1:18qN3FAooORvApf5XjCXgsuayZOEtXf6JK18I3+ONa8= +golang.org/x/tools v0.45.0/go.mod h1:LuUGqqaXcXMEFEruIVJVm5mgDD8vww/z/SR1gQ4uE/0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A= google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU= diff --git a/go/vt/sqlparser/Makefile b/go/vt/sqlparser/Makefile index 1ca0af6755e..88555b41388 100644 --- a/go/vt/sqlparser/Makefile +++ b/go/vt/sqlparser/Makefile @@ -15,7 +15,7 @@ MAKEFLAGS = -s sql.go: sql.y - go run golang.org/x/tools/cmd/goyacc -o sql.go sql.y + go tool goyacc -o sql.go sql.y gofmt -w sql.go clean: diff --git a/tools.go b/tools.go deleted file mode 100644 index 87d1f901423..00000000000 --- a/tools.go +++ /dev/null @@ -1,5 +0,0 @@ -// +build tools - -package unused - -import _ "golang.org/x/tools/cmd/goyacc" diff --git a/tools/check_make_parser.sh b/tools/check_make_parser.sh index 5e8edfba1ca..03dd7052d89 100755 --- a/tools/check_make_parser.sh +++ b/tools/check_make_parser.sh @@ -14,7 +14,7 @@ if ! cd go/vt/sqlparser/ ; then exit 1 fi -output=$(go run golang.org/x/tools/cmd/goyacc -o $TMP sql.y) +output=$(go tool goyacc -o $TMP sql.y) if [ -n "$output" ]; then echo "Expected empty output from goyacc, got:"