From 59e96fe55e3af2eeafd1786d2634032cc594035a Mon Sep 17 00:00:00 2001 From: Ben Clayton Date: Thu, 7 Apr 2022 17:50:24 +0000 Subject: [PATCH] tools/src: Fix up paths post-tint-merge Bug: dawn:1339 Change-Id: Icdc15e4d80ed4e65b343294eb3bc22a417fcf490 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/86062 Auto-Submit: Ben Clayton Reviewed-by: Corentin Wallez Commit-Queue: Ben Clayton --- tools/src/bench/bench_test.go | 2 +- tools/src/cmd/benchdiff/main.go | 2 +- tools/src/cmd/builtin-gen/ast/ast.go | 2 +- .../src/cmd/builtin-gen/gen/builtin_table.go | 6 +- tools/src/cmd/builtin-gen/gen/generate.go | 2 +- tools/src/cmd/builtin-gen/gen/permutate.go | 4 +- tools/src/cmd/builtin-gen/lexer/lexer.go | 2 +- tools/src/cmd/builtin-gen/lexer/lexer_test.go | 4 +- tools/src/cmd/builtin-gen/main.go | 14 +-- tools/src/cmd/builtin-gen/parser/parser.go | 6 +- .../src/cmd/builtin-gen/parser/parser_test.go | 4 +- tools/src/cmd/builtin-gen/resolver/resolve.go | 6 +- .../cmd/builtin-gen/resolver/resolver_test.go | 4 +- tools/src/cmd/builtin-gen/sem/sem.go | 2 +- tools/src/cmd/fix-tests/main.go | 2 +- tools/src/cmd/gerrit-stats/main.go | 2 +- tools/src/cmd/perfmon/main.go | 4 +- tools/src/cmd/snippets/main.go | 2 +- tools/src/cmd/test-runner/main.go | 4 +- tools/src/cmd/trim-includes/main.go | 4 +- tools/src/fileutils/fileutils_test.go | 2 +- tools/src/glob/glob.go | 2 +- tools/src/go.mod | 28 ++++- tools/src/go.sum | 115 ++++++++++++++++++ tools/src/list/list_test.go | 2 +- tools/src/lut/lut.go | 2 +- tools/src/lut/lut_test.go | 4 +- tools/src/match/match_test.go | 2 +- 28 files changed, 187 insertions(+), 48 deletions(-) diff --git a/tools/src/bench/bench_test.go b/tools/src/bench/bench_test.go index 3f9f6c08d1..98d2033802 100644 --- a/tools/src/bench/bench_test.go +++ b/tools/src/bench/bench_test.go @@ -19,7 +19,7 @@ import ( "testing" "time" - "dawn.googlesource.com/tint/tools/src/bench" + "dawn.googlesource.com/dawn/tools/src/bench" ) func TestParseJson(t *testing.T) { diff --git a/tools/src/cmd/benchdiff/main.go b/tools/src/cmd/benchdiff/main.go index 0f7f9492f0..ad9b9bddaa 100644 --- a/tools/src/cmd/benchdiff/main.go +++ b/tools/src/cmd/benchdiff/main.go @@ -25,7 +25,7 @@ import ( "path/filepath" "time" - "dawn.googlesource.com/tint/tools/src/bench" + "dawn.googlesource.com/dawn/tools/src/bench" ) var ( diff --git a/tools/src/cmd/builtin-gen/ast/ast.go b/tools/src/cmd/builtin-gen/ast/ast.go index e67530bd03..228c9f6bc9 100644 --- a/tools/src/cmd/builtin-gen/ast/ast.go +++ b/tools/src/cmd/builtin-gen/ast/ast.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "dawn.googlesource.com/tint/tools/src/cmd/builtin-gen/tok" + "dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/tok" ) // AST is the parsed syntax tree of the intrinsic definition file diff --git a/tools/src/cmd/builtin-gen/gen/builtin_table.go b/tools/src/cmd/builtin-gen/gen/builtin_table.go index dcd7a5f4d8..10cdcb0da9 100644 --- a/tools/src/cmd/builtin-gen/gen/builtin_table.go +++ b/tools/src/cmd/builtin-gen/gen/builtin_table.go @@ -17,9 +17,9 @@ package gen import ( "fmt" - "dawn.googlesource.com/tint/tools/src/cmd/builtin-gen/sem" - "dawn.googlesource.com/tint/tools/src/list" - "dawn.googlesource.com/tint/tools/src/lut" + "dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/sem" + "dawn.googlesource.com/dawn/tools/src/list" + "dawn.googlesource.com/dawn/tools/src/lut" ) // BuiltinTable holds data specific to the intrinsic_table.inl.tmpl template diff --git a/tools/src/cmd/builtin-gen/gen/generate.go b/tools/src/cmd/builtin-gen/gen/generate.go index ad9fd7ed55..71456b1341 100644 --- a/tools/src/cmd/builtin-gen/gen/generate.go +++ b/tools/src/cmd/builtin-gen/gen/generate.go @@ -22,7 +22,7 @@ import ( "text/template" "unicode" - "dawn.googlesource.com/tint/tools/src/cmd/builtin-gen/sem" + "dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/sem" ) type generator struct { diff --git a/tools/src/cmd/builtin-gen/gen/permutate.go b/tools/src/cmd/builtin-gen/gen/permutate.go index 814fcbcb63..e9a5644f26 100644 --- a/tools/src/cmd/builtin-gen/gen/permutate.go +++ b/tools/src/cmd/builtin-gen/gen/permutate.go @@ -20,8 +20,8 @@ import ( "fmt" "strings" - "dawn.googlesource.com/tint/tools/src/cmd/builtin-gen/sem" - "dawn.googlesource.com/tint/tools/src/fileutils" + "dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/sem" + "dawn.googlesource.com/dawn/tools/src/fileutils" ) // Permuter generates permutations of intrinsic overloads diff --git a/tools/src/cmd/builtin-gen/lexer/lexer.go b/tools/src/cmd/builtin-gen/lexer/lexer.go index fa50b22cf6..db8d92e88b 100644 --- a/tools/src/cmd/builtin-gen/lexer/lexer.go +++ b/tools/src/cmd/builtin-gen/lexer/lexer.go @@ -20,7 +20,7 @@ import ( "fmt" "unicode" - "dawn.googlesource.com/tint/tools/src/cmd/builtin-gen/tok" + "dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/tok" ) // Lex produces a list of tokens for the given source code diff --git a/tools/src/cmd/builtin-gen/lexer/lexer_test.go b/tools/src/cmd/builtin-gen/lexer/lexer_test.go index 940163df5a..bfd512859d 100644 --- a/tools/src/cmd/builtin-gen/lexer/lexer_test.go +++ b/tools/src/cmd/builtin-gen/lexer/lexer_test.go @@ -18,8 +18,8 @@ import ( "fmt" "testing" - "dawn.googlesource.com/tint/tools/src/cmd/builtin-gen/lexer" - "dawn.googlesource.com/tint/tools/src/cmd/builtin-gen/tok" + "dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/lexer" + "dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/tok" ) func TestLexTokens(t *testing.T) { diff --git a/tools/src/cmd/builtin-gen/main.go b/tools/src/cmd/builtin-gen/main.go index cc8d8e6a05..eba8995736 100644 --- a/tools/src/cmd/builtin-gen/main.go +++ b/tools/src/cmd/builtin-gen/main.go @@ -25,11 +25,11 @@ import ( "path/filepath" "strings" - "dawn.googlesource.com/tint/tools/src/cmd/builtin-gen/gen" - "dawn.googlesource.com/tint/tools/src/cmd/builtin-gen/parser" - "dawn.googlesource.com/tint/tools/src/cmd/builtin-gen/resolver" - "dawn.googlesource.com/tint/tools/src/fileutils" - "dawn.googlesource.com/tint/tools/src/glob" + "dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/gen" + "dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/parser" + "dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/resolver" + "dawn.googlesource.com/dawn/tools/src/fileutils" + "dawn.googlesource.com/dawn/tools/src/glob" ) const defProjectRelPath = "src/tint/builtins.def" @@ -82,8 +82,8 @@ func run() error { // Recursively find all the template files in the /src directory files, err := glob.Scan(projectRoot, glob.MustParseConfig(`{ "paths": [{"include": [ - "src/**.tmpl", - "test/**.tmpl" + "src/tint/**.tmpl", + "test/tint/**.tmpl" ]}] }`)) if err != nil { diff --git a/tools/src/cmd/builtin-gen/parser/parser.go b/tools/src/cmd/builtin-gen/parser/parser.go index 4709bca2f4..d0343a505a 100644 --- a/tools/src/cmd/builtin-gen/parser/parser.go +++ b/tools/src/cmd/builtin-gen/parser/parser.go @@ -19,9 +19,9 @@ package parser import ( "fmt" - "dawn.googlesource.com/tint/tools/src/cmd/builtin-gen/ast" - "dawn.googlesource.com/tint/tools/src/cmd/builtin-gen/lexer" - "dawn.googlesource.com/tint/tools/src/cmd/builtin-gen/tok" + "dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/ast" + "dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/lexer" + "dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/tok" ) // Parse produces a list of tokens for the given source code diff --git a/tools/src/cmd/builtin-gen/parser/parser_test.go b/tools/src/cmd/builtin-gen/parser/parser_test.go index 3d229c0ac3..10f355d08c 100644 --- a/tools/src/cmd/builtin-gen/parser/parser_test.go +++ b/tools/src/cmd/builtin-gen/parser/parser_test.go @@ -17,8 +17,8 @@ package parser_test import ( "testing" - "dawn.googlesource.com/tint/tools/src/cmd/builtin-gen/ast" - "dawn.googlesource.com/tint/tools/src/cmd/builtin-gen/parser" + "dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/ast" + "dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/parser" ) func TestParser(t *testing.T) { diff --git a/tools/src/cmd/builtin-gen/resolver/resolve.go b/tools/src/cmd/builtin-gen/resolver/resolve.go index fbd9c9d684..b9c701479f 100644 --- a/tools/src/cmd/builtin-gen/resolver/resolve.go +++ b/tools/src/cmd/builtin-gen/resolver/resolve.go @@ -18,9 +18,9 @@ import ( "fmt" "sort" - "dawn.googlesource.com/tint/tools/src/cmd/builtin-gen/ast" - "dawn.googlesource.com/tint/tools/src/cmd/builtin-gen/sem" - "dawn.googlesource.com/tint/tools/src/cmd/builtin-gen/tok" + "dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/ast" + "dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/sem" + "dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/tok" ) type resolver struct { diff --git a/tools/src/cmd/builtin-gen/resolver/resolver_test.go b/tools/src/cmd/builtin-gen/resolver/resolver_test.go index 11359dd34c..d331a12c91 100644 --- a/tools/src/cmd/builtin-gen/resolver/resolver_test.go +++ b/tools/src/cmd/builtin-gen/resolver/resolver_test.go @@ -19,8 +19,8 @@ import ( "strings" "testing" - "dawn.googlesource.com/tint/tools/src/cmd/builtin-gen/parser" - "dawn.googlesource.com/tint/tools/src/cmd/builtin-gen/resolver" + "dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/parser" + "dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/resolver" ) func TestResolver(t *testing.T) { diff --git a/tools/src/cmd/builtin-gen/sem/sem.go b/tools/src/cmd/builtin-gen/sem/sem.go index 16a8c3ee30..8db6fb07fb 100644 --- a/tools/src/cmd/builtin-gen/sem/sem.go +++ b/tools/src/cmd/builtin-gen/sem/sem.go @@ -17,7 +17,7 @@ package sem import ( "fmt" - "dawn.googlesource.com/tint/tools/src/cmd/builtin-gen/ast" + "dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/ast" ) // Sem is the root of the semantic tree diff --git a/tools/src/cmd/fix-tests/main.go b/tools/src/cmd/fix-tests/main.go index fd6958ca5b..80ea12f6b2 100644 --- a/tools/src/cmd/fix-tests/main.go +++ b/tools/src/cmd/fix-tests/main.go @@ -26,7 +26,7 @@ import ( "regexp" "strings" - "dawn.googlesource.com/tint/tools/src/substr" + "dawn.googlesource.com/dawn/tools/src/substr" ) func main() { diff --git a/tools/src/cmd/gerrit-stats/main.go b/tools/src/cmd/gerrit-stats/main.go index 33e30fda6d..0b157090eb 100644 --- a/tools/src/cmd/gerrit-stats/main.go +++ b/tools/src/cmd/gerrit-stats/main.go @@ -23,7 +23,7 @@ import ( "regexp" "time" - "dawn.googlesource.com/tint/tools/src/gerrit" + "dawn.googlesource.com/dawn/tools/src/gerrit" ) const yyyymmdd = "2006-01-02" diff --git a/tools/src/cmd/perfmon/main.go b/tools/src/cmd/perfmon/main.go index f01fcff8b9..c8d1716c8e 100644 --- a/tools/src/cmd/perfmon/main.go +++ b/tools/src/cmd/perfmon/main.go @@ -32,8 +32,8 @@ import ( "strings" "time" - "dawn.googlesource.com/tint/tools/src/bench" - "dawn.googlesource.com/tint/tools/src/git" + "dawn.googlesource.com/dawn/tools/src/bench" + "dawn.googlesource.com/dawn/tools/src/git" "github.com/andygrunwald/go-gerrit" "github.com/go-git/go-git/v5/plumbing/transport" "github.com/go-git/go-git/v5/plumbing/transport/http" diff --git a/tools/src/cmd/snippets/main.go b/tools/src/cmd/snippets/main.go index a8b94fc0cb..a8ce846611 100644 --- a/tools/src/cmd/snippets/main.go +++ b/tools/src/cmd/snippets/main.go @@ -22,7 +22,7 @@ import ( "strings" "time" - "dawn.googlesource.com/tint/tools/src/gerrit" + "dawn.googlesource.com/dawn/tools/src/gerrit" ) const yyyymmdd = "2006-01-02" diff --git a/tools/src/cmd/test-runner/main.go b/tools/src/cmd/test-runner/main.go index f1eeedc0b2..37deeceb90 100644 --- a/tools/src/cmd/test-runner/main.go +++ b/tools/src/cmd/test-runner/main.go @@ -30,8 +30,8 @@ import ( "time" "unicode/utf8" - "dawn.googlesource.com/tint/tools/src/fileutils" - "dawn.googlesource.com/tint/tools/src/glob" + "dawn.googlesource.com/dawn/tools/src/fileutils" + "dawn.googlesource.com/dawn/tools/src/glob" "github.com/fatih/color" "github.com/sergi/go-diff/diffmatchpatch" ) diff --git a/tools/src/cmd/trim-includes/main.go b/tools/src/cmd/trim-includes/main.go index 146a6fc06c..fb9e24e0c6 100644 --- a/tools/src/cmd/trim-includes/main.go +++ b/tools/src/cmd/trim-includes/main.go @@ -34,8 +34,8 @@ import ( "sync" "time" - "dawn.googlesource.com/tint/tools/src/fileutils" - "dawn.googlesource.com/tint/tools/src/glob" + "dawn.googlesource.com/dawn/tools/src/fileutils" + "dawn.googlesource.com/dawn/tools/src/glob" ) var ( diff --git a/tools/src/fileutils/fileutils_test.go b/tools/src/fileutils/fileutils_test.go index 696353eed5..a012424ac4 100644 --- a/tools/src/fileutils/fileutils_test.go +++ b/tools/src/fileutils/fileutils_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - "dawn.googlesource.com/tint/tools/src/fileutils" + "dawn.googlesource.com/dawn/tools/src/fileutils" ) func TestGoSourcePath(t *testing.T) { diff --git a/tools/src/glob/glob.go b/tools/src/glob/glob.go index b9790b2b3c..829f923238 100644 --- a/tools/src/glob/glob.go +++ b/tools/src/glob/glob.go @@ -24,7 +24,7 @@ import ( "path/filepath" "strings" - "dawn.googlesource.com/tint/tools/src/match" + "dawn.googlesource.com/dawn/tools/src/match" ) // Scan walks all files and subdirectories from root, returning those diff --git a/tools/src/go.mod b/tools/src/go.mod index c55a6ee075..1e2ce79e3b 100644 --- a/tools/src/go.mod +++ b/tools/src/go.mod @@ -2,6 +2,30 @@ module dawn.googlesource.com/dawn/tools/src go 1.18 -require github.com/google/go-cmp v0.5.6 +require ( + github.com/andygrunwald/go-gerrit v0.0.0-20220404064545-525eecd29744 + github.com/fatih/color v1.13.0 + github.com/go-git/go-git/v5 v5.4.2 + github.com/google/go-cmp v0.5.6 + github.com/sergi/go-diff v1.2.0 + github.com/shirou/gopsutil v3.21.11+incompatible + golang.org/x/net v0.0.0-20220403103023-749bd193bc2b +) -require golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect +require ( + github.com/acomagu/bufpipe v1.0.3 // indirect + github.com/go-git/gcfg v1.5.0 // indirect + github.com/go-git/go-billy/v5 v5.3.1 // indirect + github.com/go-ole/go-ole v1.2.6 // indirect + github.com/google/go-querystring v1.1.0 // indirect + github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect + github.com/mattn/go-colorable v0.1.9 // indirect + github.com/mattn/go-isatty v0.0.14 // indirect + github.com/mitchellh/go-homedir v1.1.0 // indirect + github.com/tklauser/go-sysconf v0.3.10 // indirect + github.com/tklauser/numcpus v0.4.0 // indirect + github.com/yusufpapurcu/wmi v1.2.2 // indirect + golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27 // indirect + golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect + gopkg.in/warnings.v0 v0.1.2 // indirect +) diff --git a/tools/src/go.sum b/tools/src/go.sum index 58b75a45fd..e0bdc5a054 100644 --- a/tools/src/go.sum +++ b/tools/src/go.sum @@ -1,5 +1,120 @@ +github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= +github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0= +github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo= +github.com/acomagu/bufpipe v1.0.3 h1:fxAGrHZTgQ9w5QqVItgzwj235/uYZYgbXitB+dLupOk= +github.com/acomagu/bufpipe v1.0.3/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4= +github.com/andygrunwald/go-gerrit v0.0.0-20220404064545-525eecd29744 h1:IMdsOeMJS4c1R8SvLeyay1qVbUywc1WUX+q2TcSBtjQ= +github.com/andygrunwald/go-gerrit v0.0.0-20220404064545-525eecd29744/go.mod h1:aqcjwEnmLLSalFNYR0p2ttnEXOVVRctIzsUMHbEcruU= +github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= +github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= +github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= +github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= +github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= +github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4= +github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4ua+E= +github.com/go-git/go-billy/v5 v5.2.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0= +github.com/go-git/go-billy/v5 v5.3.1 h1:CPiOUAzKtMRvolEKw+bG1PLRpT7D3LIs3/3ey4Aiu34= +github.com/go-git/go-billy/v5 v5.3.1/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0= +github.com/go-git/go-git-fixtures/v4 v4.2.1 h1:n9gGL1Ct/yIw+nfsfr8s4+sbhT+Ncu2SubfXjIWgci8= +github.com/go-git/go-git-fixtures/v4 v4.2.1/go.mod h1:K8zd3kDUAykwTdDCr+I0per6Y6vMiRR/nnVTBtavnB0= +github.com/go-git/go-git/v5 v5.4.2 h1:BXyZu9t0VkbiHtqrsvdq39UDhGJTl1h55VW6CSC4aY4= +github.com/go-git/go-git/v5 v5.4.2/go.mod h1:gQ1kArt6d+n+BGd+/B/I74HwRTLhth2+zti4ihgckDc= +github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= +github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= +github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= +github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= +github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= +github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= +github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= +github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= +github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/matryer/is v1.2.0 h1:92UTHpy8CDwaJ08GqLDzhhuixiBUUD1p3AU6PHddz4A= +github.com/matryer/is v1.2.0/go.mod h1:2fLPjFQM9rhQ15aVEtbuwhJinnOqrmgXPNdZsdwlWXA= +github.com/mattn/go-colorable v0.1.9 h1:sqDoxXbdeALODt0DAeJCVp38ps9ZogZEAXjus69YV3U= +github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= +github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= +github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= +github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ= +github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= +github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI= +github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= +github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw= +github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk= +github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o= +github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ= +github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0= +github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg= +github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210326060303-6b1517762897/go.mod h1:uSPa2vr4CLtc/ILN5odXGNXS6mhrKVzTaCXzk9m6W3k= +golang.org/x/net v0.0.0-20220403103023-749bd193bc2b h1:vI32FkLJNAWtGD4BwkThwEy6XS7ZLLMHkSkYfF8M0W0= +golang.org/x/net v0.0.0-20220403103023-749bd193bc2b/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210502180810-71e4cd670f79/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27 h1:XDXtA5hveEEV8JB2l7nhMTp3t3cHp9ZpwcdjqyEWLlo= +golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +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/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= +gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/tools/src/list/list_test.go b/tools/src/list/list_test.go index 04503ede4d..7392e63005 100644 --- a/tools/src/list/list_test.go +++ b/tools/src/list/list_test.go @@ -18,7 +18,7 @@ import ( "reflect" "testing" - "dawn.googlesource.com/tint/tools/src/list" + "dawn.googlesource.com/dawn/tools/src/list" ) // A simple implementation of list.List. Many methods are just stubs diff --git a/tools/src/lut/lut.go b/tools/src/lut/lut.go index d811a1e236..9961545409 100644 --- a/tools/src/lut/lut.go +++ b/tools/src/lut/lut.go @@ -18,7 +18,7 @@ package lut import ( "sort" - "dawn.googlesource.com/tint/tools/src/list" + "dawn.googlesource.com/dawn/tools/src/list" ) // LUT is a look up table. diff --git a/tools/src/lut/lut_test.go b/tools/src/lut/lut_test.go index fa74522d38..65bef50ec5 100644 --- a/tools/src/lut/lut_test.go +++ b/tools/src/lut/lut_test.go @@ -17,8 +17,8 @@ package lut_test import ( "testing" - "dawn.googlesource.com/tint/tools/src/list" - "dawn.googlesource.com/tint/tools/src/lut" + "dawn.googlesource.com/dawn/tools/src/list" + "dawn.googlesource.com/dawn/tools/src/lut" ) func TestCompactWithFragments(t *testing.T) { diff --git a/tools/src/match/match_test.go b/tools/src/match/match_test.go index a46515e512..0089d38b1a 100644 --- a/tools/src/match/match_test.go +++ b/tools/src/match/match_test.go @@ -18,7 +18,7 @@ import ( "strings" "testing" - "dawn.googlesource.com/tint/tools/src/match" + "dawn.googlesource.com/dawn/tools/src/match" ) func TestMatch(t *testing.T) {