Upgrade org_golang_x_tools to 0.5.0 (bazelbuild#3356)

cockroachdb · Feb 17, 2023 · 5e71d13 · 5e71d13
1 parent 5728de0
commit 5e71d13
Show file tree

Hide file tree

Showing 8 changed files with 118,234 additions and 15,452 deletions.
diff --git a/go/private/repositories.bzl b/go/private/repositories.bzl
@@ -64,13 +64,13 @@ def go_rules_dependencies(force = False):
     wrapper(
         http_archive,
         name = "org_golang_x_tools",
-        # v0.1.12, latest as of 2022-09-10
+        # v0.5.0, latest as of 2023-01-14
         urls = [
-            "https://mirror.bazel.build/github.com/golang/tools/archive/refs/tags/v0.1.12.zip",
-            "https://github.com/golang/tools/archive/refs/tags/v0.1.12.zip",
+            "https://mirror.bazel.build/github.com/golang/tools/archive/refs/tags/v0.5.0.zip",
+            "https://github.com/golang/tools/archive/refs/tags/v0.5.0.zip",
         ],
-        sha256 = "4e3d94e7bf8dde5dad681c5ddddda6e634f8c8c500683fdf3d2f77a9c086702d",
-        strip_prefix = "tools-0.1.12",
+        sha256 = "7b22a085a24e9da2fb9db9b97e9e7325387e66153997f17e44129df2943ddee7",
+        strip_prefix = "tools-0.5.0",
         patches = [
             # deletegopls removes the gopls subdirectory. It contains a nested
             # module with additional dependencies. It's not needed by rules_go.

diff --git a/go/tools/builders/BUILD.bazel b/go/tools/builders/BUILD.bazel
@@ -94,8 +94,8 @@ go_source(
     deps = [
         "@co_honnef_go_tools//unused",
         "@org_golang_x_tools//go/analysis",
-        "@org_golang_x_tools//go/analysis/internal/facts:go_default_library",
         "@org_golang_x_tools//go/gcexportdata",
+        "@org_golang_x_tools//internal/facts",
     ],
 )
 

diff --git a/go/tools/builders/nogo_main.go b/go/tools/builders/nogo_main.go
@@ -41,8 +41,8 @@ import (
 	"sync"
 
 	"golang.org/x/tools/go/analysis"
-	"golang.org/x/tools/go/analysis/internal/facts"
 	"golang.org/x/tools/go/gcexportdata"
+	"golang.org/x/tools/internal/facts"
 	"honnef.co/go/tools/unused"
 )
 
@@ -140,7 +140,7 @@ func run(args []string) error {
 		if err != nil {
 			return err
 		}
-		if err := ioutil.WriteFile(abs(*unusedPath), encoded, 0666); err != nil {
+		if err := ioutil.WriteFile(abs(*unusedPath), encoded, 0o666); err != nil {
 			return fmt.Errorf("error writing unused out: %v", err)
 		}
 	}
@@ -445,7 +445,7 @@ func load(packagePath string, imp *importer, filenames []string) (*goPackage, er
 	}
 	pkg.types, pkg.typesInfo = types, info
 
-	pkg.facts, err = facts.Decode(pkg.types, imp.readFacts)
+	pkg.facts, err = facts.NewDecoder(pkg.types).Decode(imp.readFacts)
 	if err != nil {
 		return nil, fmt.Errorf("internal error decoding facts: %v", err)
 	}
@@ -658,8 +658,8 @@ func (i *importer) Import(path string) (*types.Package, error) {
 	return gcexportdata.Read(r, i.fset, i.packageCache, path)
 }
 
-func (i *importer) readFacts(path string) ([]byte, error) {
-	archive := i.factMap[path]
+func (i *importer) readFacts(pkg *types.Package) ([]byte, error) {
+	archive := i.factMap[pkg.Path()]
 	if archive == "" {
 		// Packages that were not built with the nogo toolchain will not be
 		// analyzed, so there's no opportunity to store facts. This includes

diff --git a/tests/integration/popular_repos/BUILD.bazel b/tests/integration/popular_repos/BUILD.bazel
@@ -175,28 +175,29 @@ test_suite(
         "@org_golang_x_tools//godoc/vfs:vfs_test",
         "@org_golang_x_tools//godoc/vfs/gatefs:gatefs_test",
         "@org_golang_x_tools//godoc/vfs/mapfs:mapfs_test",
+        "@org_golang_x_tools//internal/bug:bug_test",
+        "@org_golang_x_tools//internal/diff:diff_test",
+        "@org_golang_x_tools//internal/diff/lcs:lcs_test",
+        "@org_golang_x_tools//internal/diff/myers:myers_test",
         "@org_golang_x_tools//internal/event:event_test",
         "@org_golang_x_tools//internal/event/export:export_test",
         "@org_golang_x_tools//internal/event/export/ocagent:ocagent_test",
         "@org_golang_x_tools//internal/event/export/ocagent/wire:wire_test",
         "@org_golang_x_tools//internal/event/label:label_test",
         "@org_golang_x_tools//internal/fastwalk:fastwalk_test",
+        "@org_golang_x_tools//internal/fuzzy:fuzzy_test",
         "@org_golang_x_tools//internal/gopathwalk:gopathwalk_test",
         "@org_golang_x_tools//internal/jsonrpc2:jsonrpc2_test",
         "@org_golang_x_tools//internal/jsonrpc2/servertest:servertest_test",
         "@org_golang_x_tools//internal/jsonrpc2_v2:jsonrpc2_v2_test",
-        "@org_golang_x_tools//internal/lsp/bug:bug_test",
-        "@org_golang_x_tools//internal/lsp/debug:debug_test",
-        "@org_golang_x_tools//internal/lsp/lsppos:lsppos_test",
-        "@org_golang_x_tools//internal/lsp/progress:progress_test",
-        "@org_golang_x_tools//internal/lsp/regtest:regtest_test",
-        "@org_golang_x_tools//internal/lsp/source/completion:completion_test",
-        "@org_golang_x_tools//internal/lsp/template:template_test",
         "@org_golang_x_tools//internal/memoize:memoize_test",
+        "@org_golang_x_tools//internal/persistent:persistent_test",
         "@org_golang_x_tools//internal/proxydir:proxydir_test",
-        "@org_golang_x_tools//internal/span:span_test",
+        "@org_golang_x_tools//internal/robustio:robustio_test",
         "@org_golang_x_tools//internal/stack:stack_test",
+        "@org_golang_x_tools//internal/typesinternal:typesinternal_test",
         "@org_golang_x_tools//playground/socket:socket_test",
+        "@org_golang_x_tools//refactor/satisfy:satisfy_test",
         "@org_golang_x_tools//txtar:txtar_test",
     ],
 )

diff --git a/tests/integration/popular_repos/README.rst b/tests/integration/popular_repos/README.rst
@@ -174,28 +174,29 @@ This runs tests from the repository `golang.org/x/tools <https://golang.org/x/to
 * @org_golang_x_tools//godoc/vfs:vfs_test
 * @org_golang_x_tools//godoc/vfs/gatefs:gatefs_test
 * @org_golang_x_tools//godoc/vfs/mapfs:mapfs_test
+* @org_golang_x_tools//internal/bug:bug_test
+* @org_golang_x_tools//internal/diff:diff_test
+* @org_golang_x_tools//internal/diff/lcs:lcs_test
+* @org_golang_x_tools//internal/diff/myers:myers_test
 * @org_golang_x_tools//internal/event:event_test
 * @org_golang_x_tools//internal/event/export:export_test
 * @org_golang_x_tools//internal/event/export/ocagent:ocagent_test
 * @org_golang_x_tools//internal/event/export/ocagent/wire:wire_test
 * @org_golang_x_tools//internal/event/label:label_test
 * @org_golang_x_tools//internal/fastwalk:fastwalk_test
+* @org_golang_x_tools//internal/fuzzy:fuzzy_test
 * @org_golang_x_tools//internal/gopathwalk:gopathwalk_test
 * @org_golang_x_tools//internal/jsonrpc2:jsonrpc2_test
 * @org_golang_x_tools//internal/jsonrpc2/servertest:servertest_test
 * @org_golang_x_tools//internal/jsonrpc2_v2:jsonrpc2_v2_test
-* @org_golang_x_tools//internal/lsp/bug:bug_test
-* @org_golang_x_tools//internal/lsp/debug:debug_test
-* @org_golang_x_tools//internal/lsp/lsppos:lsppos_test
-* @org_golang_x_tools//internal/lsp/progress:progress_test
-* @org_golang_x_tools//internal/lsp/regtest:regtest_test
-* @org_golang_x_tools//internal/lsp/source/completion:completion_test
-* @org_golang_x_tools//internal/lsp/template:template_test
 * @org_golang_x_tools//internal/memoize:memoize_test
+* @org_golang_x_tools//internal/persistent:persistent_test
 * @org_golang_x_tools//internal/proxydir:proxydir_test
-* @org_golang_x_tools//internal/span:span_test
+* @org_golang_x_tools//internal/robustio:robustio_test
 * @org_golang_x_tools//internal/stack:stack_test
+* @org_golang_x_tools//internal/typesinternal:typesinternal_test
 * @org_golang_x_tools//playground/socket:socket_test
+* @org_golang_x_tools//refactor/satisfy:satisfy_test
 * @org_golang_x_tools//txtar:txtar_test
 
 

diff --git a/tests/integration/popular_repos/popular_repos.py b/tests/integration/popular_repos/popular_repos.py
@@ -15,6 +15,7 @@
 
 from subprocess import check_output, call
 from sys import exit
+from os import path
 
 POPULAR_REPOS = [
     dict(
@@ -103,7 +104,6 @@
             "go/analysis/analysistest:analysistest_test", # requires build cache
             "go/analysis/internal/analysisflags:analysisflags_test", # calls os.Exit(0) in a test
             "go/analysis/internal/checker:checker_test", # loads test package with go/packages, which probably needs go list
-            "go/analysis/internal/facts:facts_test", # loads test package with go/packages, which probably needs go list
             "go/analysis/multichecker:multichecker_test", # requires go vet
             "go/analysis/passes/asmdecl:asmdecl_test", # Needs testdata directory
             "go/analysis/passes/assign:assign_test", # Needs testdata directory
@@ -149,6 +149,7 @@
             "go/analysis/passes/unsafeptr:unsafeptr_test", # Needs testdata directory
             "go/analysis/passes/unusedresult:unusedresult_test", # Needs testdata directory
             "go/analysis/passes/unusedwrite:unusedwrite_test", # Needs testdata directory
+            "go/analysis/passes/timeformat:timeformat_test", # Needs go tool
             "go/analysis/passes/usesgenerics:usesgenerics_test", # Needs go tool
             "go/analysis/unitchecker:unitchecker_test", # requires go vet
             "go/ast/inspector:inspector_test", # requires GOROOT and GOPATH
@@ -160,7 +161,6 @@
             "go/gccgoexportdata:gccgoexportdata_test", # Needs testdata directory
             "go/gcexportdata:gcexportdata_test", # Needs testdata directory
             "go/internal/gccgoimporter:gccgoimporter_test", # Needs testdata directory
-            "go/internal/gcimporter:gcimporter_test", # Needs testdata directory
             "go/loader:loader_test", # Needs testdata directory
             "go/packages/packagestest/testdata/groups/two/primarymod/expect:expect_test", # Is testdata
             "go/packages/packagestest/testdata:testdata_test", # Is testdata
@@ -176,46 +176,11 @@
             "godoc/vfs/zipfs:zipfs_test", # requires GOROOT
             "godoc:godoc_test", # requires GOROOT and GOPATH
             "internal/apidiff:apidiff_test", # Needs testdata directory
+            "internal/diff/difftest:difftest_test", # Needs diff tool
+            "internal/facts:facts_test", # loads test package with go/packages, which probably needs go list
+            "internal/gcimporter:gcimporter_test", # Needs testdata directory
             "internal/gocommand:gocommand_test", # Needs go tool
             "internal/imports:imports_test", # Needs testdata directory
-            "internal/lsp/analysis/embeddirective:embeddirective_test", # requires GOROOT
-            "internal/lsp/analysis/fillreturns:fillreturns_test", # Needs go tool
-            "internal/lsp/analysis/fillstruct:fillstruct_test", # Needs go tool
-            "internal/lsp/analysis/infertypeargs:infertypeargs_test", # Needs go tool
-            "internal/lsp/analysis/nonewvars:nonewvars_test", # Needs GOROOT
-            "internal/lsp/analysis/noresultvalues:noresultvalues_test", # Needs GOROOT
-            "internal/lsp/analysis/simplifycompositelit:simplifycompositelit_test", # Needs go tool
-            "internal/lsp/analysis/simplifyrange:simplifyrange_test", # Needs GOROOT
-            "internal/lsp/analysis/simplifyslice:simplifyslice_test", # Needs GOROOT
-            "internal/lsp/analysis/undeclaredname:undeclaredname_test", # Needs GOROOT
-            "internal/lsp/analysis/unusedparams:unusedparams_test", # Needs go tool
-            "internal/lsp/analysis/useany:useany_test", # Needs go tool
-            "internal/lsp/cache:cache_test", # has additional deps
-            "internal/lsp/cmd:cmd_test", # panics?
-            "internal/lsp/command:command_test", # Needs go tool
-            "internal/lsp/diff/difftest:difftest_test", # has additional deps
-            "internal/lsp/diff/myers:myers_test", # has additional deps
-            "internal/lsp/diff:diff_test", # has additional deps
-            "internal/lsp/fake:fake_test", # has additional deps
-            "internal/lsp/fuzzy:fuzzy_test", # has additional deps
-            "internal/lsp/lsprpc:lsprpc_test", # has additional deps
-            "internal/lsp/mod:mod_test", # has additional deps
-            "internal/lsp/safetoken:safetoken_test", # requires build cache
-            "internal/lsp/snippet:snippet_test", # has additional deps
-            "internal/lsp/source:source_test", # Needs testdata directory
-            "internal/lsp/testdata/analyzer:analyzer_test", # is testdata
-            "internal/lsp/testdata/codelens:codelens_test", # is testdata
-            "internal/lsp/testdata/godef/a:a_test", # is testdata
-            "internal/lsp/testdata/implementation/other:other_test", # is testdata
-            "internal/lsp/testdata/references:references_test", # is testdata
-            "internal/lsp/testdata/rename/testy:testy_test", # is testdata
-            "internal/lsp/testdata/semantic:semantic_test", # is testdata
-            "internal/lsp/testdata/signature:signature_test", # is testdata
-            "internal/lsp/testdata/statements:statements_test", # is testdata
-            "internal/lsp/testdata/testy:testy_test", # is testdata
-            "internal/lsp/testdata/unimported:unimported_test", # is testdata
-            "internal/lsp/testdata/workspacesymbol/a:a_test", # is testdata
-            "internal/lsp:lsp_test", # Needs testdata directory
             "internal/typeparams:typeparams_test", # Needs go tool
             "present:present_test", # Needs goldmark
             "refactor/eg:eg_test", # Needs testdata directory
@@ -294,7 +259,7 @@ def popular_repos():
 """.lstrip()
 
 def popular_repos_bzl():
-  with open("popular_repos.bzl", "w") as f:
+  with open(path.join(path.dirname(__file__), "popular_repos.bzl"), "w") as f:
     f.write(BZL_HEADER)
     for repo in POPULAR_REPOS:
       f.write("    _maybe(\n        go_repository,\n")
@@ -305,7 +270,7 @@ def popular_repos_bzl():
       f.write("    )\n")
 
 def build_bazel():
-  with open("BUILD.bazel", "w") as f:
+  with open(path.join(path.dirname(__file__), "BUILD.bazel"), "w") as f:
     f.write(BUILD_HEADER)
     for repo in POPULAR_REPOS:
       name = repo["name"]
@@ -331,7 +296,7 @@ def build_bazel():
       repo["actual"] = actual
 
 def readme_rst():
-  with open("README.rst", "w") as f:
+  with open(path.join(path.dirname(__file__), "README.rst"), "w") as f:
     f.write(DOCUMENTATION_HEADER)
     for repo in POPULAR_REPOS:
       name = repo["name"]