From 13b2bd50ab829614145d106ae2e39ab0f34a3282 Mon Sep 17 00:00:00 2001 From: Alan Donovan Date: Wed, 8 Nov 2023 10:32:12 -0500 Subject: [PATCH] internal/packagesinternal: delete GoCmdRunner var (unused) Change-Id: I1ddd0a28b97f0b70d18d0f188d77f1390c6bb291 Reviewed-on: https://go-review.googlesource.com/c/tools/+/540716 Reviewed-by: Robert Findley LUCI-TryBot-Result: Go LUCI --- go/packages/packages.go | 6 ------ go/packages/packagestest/modules.go | 9 ++------- gopls/internal/lsp/cache/snapshot.go | 1 - internal/packagesinternal/packages.go | 8 -------- 4 files changed, 2 insertions(+), 22 deletions(-) diff --git a/go/packages/packages.go b/go/packages/packages.go index 6cbd3de83..fd7ecf77e 100644 --- a/go/packages/packages.go +++ b/go/packages/packages.go @@ -432,12 +432,6 @@ func init() { packagesinternal.GetDepsErrors = func(p interface{}) []*packagesinternal.PackageError { return p.(*Package).depsErrors } - packagesinternal.GetGoCmdRunner = func(config interface{}) *gocommand.Runner { - return config.(*Config).gocmdRunner - } - packagesinternal.SetGoCmdRunner = func(config interface{}, runner *gocommand.Runner) { - config.(*Config).gocmdRunner = runner - } packagesinternal.SetModFile = func(config interface{}, value string) { config.(*Config).modFile = value } diff --git a/go/packages/packagestest/modules.go b/go/packages/packagestest/modules.go index 1299c6c3c..7eff94320 100644 --- a/go/packages/packagestest/modules.go +++ b/go/packages/packagestest/modules.go @@ -14,7 +14,6 @@ import ( "strings" "golang.org/x/tools/internal/gocommand" - "golang.org/x/tools/internal/packagesinternal" "golang.org/x/tools/internal/proxydir" ) @@ -171,8 +170,6 @@ func (modules) Finalize(exported *Exported) error { "GOPROXY="+proxydir.ToURL(modProxyDir), "GOSUMDB=off", ) - gocmdRunner := &gocommand.Runner{} - packagesinternal.SetGoCmdRunner(exported.Config, gocmdRunner) // Run go mod download to recreate the mod cache dir with all the extra // stuff in cache. All the files created by Export should be recreated. @@ -183,10 +180,8 @@ func (modules) Finalize(exported *Exported) error { BuildFlags: exported.Config.BuildFlags, WorkingDir: exported.Config.Dir, } - if _, err := gocmdRunner.Run(context.Background(), inv); err != nil { - return err - } - return nil + _, err := new(gocommand.Runner).Run(context.Background(), inv) + return err } func writeModuleFiles(rootDir, module, ver string, filePaths map[string]string) error { diff --git a/gopls/internal/lsp/cache/snapshot.go b/gopls/internal/lsp/cache/snapshot.go index 47dd1ab71..19483c07d 100644 --- a/gopls/internal/lsp/cache/snapshot.go +++ b/gopls/internal/lsp/cache/snapshot.go @@ -417,7 +417,6 @@ func (s *snapshot) config(ctx context.Context, inv *gocommand.Invocation) *packa if typesinternal.SetUsesCgo(&types.Config{}) { cfg.Mode |= packages.LoadMode(packagesinternal.TypecheckCgo) } - packagesinternal.SetGoCmdRunner(cfg, s.view.gocmdRunner) return cfg } diff --git a/internal/packagesinternal/packages.go b/internal/packagesinternal/packages.go index d9950b1f0..44719de17 100644 --- a/internal/packagesinternal/packages.go +++ b/internal/packagesinternal/packages.go @@ -5,10 +5,6 @@ // Package packagesinternal exposes internal-only fields from go/packages. package packagesinternal -import ( - "golang.org/x/tools/internal/gocommand" -) - var GetForTest = func(p interface{}) string { return "" } var GetDepsErrors = func(p interface{}) []*PackageError { return nil } @@ -18,10 +14,6 @@ type PackageError struct { Err string // the error itself } -var GetGoCmdRunner = func(config interface{}) *gocommand.Runner { return nil } - -var SetGoCmdRunner = func(config interface{}, runner *gocommand.Runner) {} - var TypecheckCgo int var DepsErrors int // must be set as a LoadMode to call GetDepsErrors var ForTest int // must be set as a LoadMode to call GetForTest