x/tools: remove some dead functions

Change-Id: I3f313881123b7ecdb7937cd78424be23ea04fea2
Reviewed-on: https://go-review.googlesource.com/c/tools/+/703875
LUCI-TryBot-Result: Go LUCI <[email protected]>
Commit-Queue: Alan Donovan <[email protected]>
Auto-Submit: Alan Donovan <[email protected]>
Reviewed-by: Robert Findley <[email protected]>

Author: adonovan

gopls/internal/analysis/unusedparams/unusedparams.go

@@ -179,7 +179,7 @@ funcloop:
 							// Edge case: _ = func() {...}
 							// has no local var. Fake one.
 							v := types.NewVar(id.Pos(), pass.Pkg, id.Name, pass.TypesInfo.TypeOf(n))
-							typesinternal.SetVarKind(v, typesinternal.LocalVar)
+							v.SetKind(types.LocalVar)
 							fn = v
 						}
 					}

gopls/internal/golang/completion/util.go

@@ -15,7 +15,6 @@ import (
 	"golang.org/x/tools/gopls/internal/util/safetoken"
 	"golang.org/x/tools/internal/diff"
 	"golang.org/x/tools/internal/typeparams"
-	"golang.org/x/tools/internal/typesinternal"
 )
 
 // exprAtPos returns the index of the expression containing pos.
@@ -128,7 +127,7 @@ func resolveInvalid(fset *token.FileSet, obj types.Object, node ast.Node, info *
 	typename := golang.FormatNode(fset, resultExpr)
 	typ := types.NewNamed(types.NewTypeName(token.NoPos, obj.Pkg(), typename, nil), types.Typ[types.Invalid], nil)
 	v := types.NewVar(obj.Pos(), obj.Pkg(), obj.Name(), typ)
-	typesinternal.SetVarKind(v, typesinternal.PackageVar)
+	v.SetKind(types.PackageVar)
 	return v
 }
 

imports/forward.go

@@ -69,9 +69,3 @@ func Process(filename string, src []byte, opt *Options) ([]byte, error) {
 	}
 	return intimp.Process(filename, src, intopt)
 }
-
-// VendorlessPath returns the devendorized version of the import path ipath.
-// For example, VendorlessPath("foo/bar/vendor/a/b") returns "a/b".
-func VendorlessPath(ipath string) string {
-	return intimp.VendorlessPath(ipath)
-}

internal/analysisinternal/analysis.go

@@ -74,25 +74,6 @@ func TypeErrorEndPos(fset *token.FileSet, src []byte, start token.Pos) token.Pos
 	return end
 }
 
-// WalkASTWithParent walks the AST rooted at n. The semantics are
-// similar to ast.Inspect except it does not call f(nil).
-func WalkASTWithParent(n ast.Node, f func(n ast.Node, parent ast.Node) bool) {
-	var ancestors []ast.Node
-	ast.Inspect(n, func(n ast.Node) (recurse bool) {
-		if n == nil {
-			ancestors = ancestors[:len(ancestors)-1]
-			return false
-		}
-
-		var parent ast.Node
-		if len(ancestors) > 0 {
-			parent = ancestors[len(ancestors)-1]
-		}
-		ancestors = append(ancestors, n)
-		return f(n, parent)
-	})
-}
-
 // MatchingIdents finds the names of all identifiers in 'node' that match any of the given types.
 // 'pos' represents the position at which the identifiers may be inserted. 'pos' must be within
 // the scope of each of identifier we select. Otherwise, we will insert a variable at 'pos' that

internal/goroot/importcfg.go

@@ -4,37 +4,18 @@
 
 // Package goroot is a copy of package internal/goroot
 // in the main GO repot. It provides a utility to produce
-// an importcfg and import path to package file map mapping
+// an import path to package file map mapping
 // standard library packages to the locations of their export
 // data files.
 package goroot
 
 import (
-	"bytes"
 	"fmt"
 	"os/exec"
 	"strings"
 	"sync"
 )
 
-// Importcfg returns an importcfg file to be passed to the
-// Go compiler that contains the cached paths for the .a files for the
-// standard library.
-func Importcfg() (string, error) {
-	var icfg bytes.Buffer
-
-	m, err := PkgfileMap()
-	if err != nil {
-		return "", err
-	}
-	fmt.Fprintf(&icfg, "# import config")
-	for importPath, export := range m {
-		fmt.Fprintf(&icfg, "\npackagefile %s=%s", importPath, export)
-	}
-	s := icfg.String()
-	return s, nil
-}
-
 var (
 	stdlibPkgfileMap map[string]string
 	stdlibPkgfileErr error

internal/mcp/internal/util/util.go

@@ -5,39 +5,11 @@
 package util
 
 import (
-	"cmp"
 	"fmt"
-	"iter"
 	"reflect"
-	"slices"
 	"strings"
 )
 
-// Helpers below are copied from gopls' moremaps package.
-
-// Sorted returns an iterator over the entries of m in key order.
-func Sorted[M ~map[K]V, K cmp.Ordered, V any](m M) iter.Seq2[K, V] {
-	// TODO(adonovan): use maps.Sorted if proposal #68598 is accepted.
-	return func(yield func(K, V) bool) {
-		keys := KeySlice(m)
-		slices.Sort(keys)
-		for _, k := range keys {
-			if !yield(k, m[k]) {
-				break
-			}
-		}
-	}
-}
-
-// KeySlice returns the keys of the map M, like slices.Collect(maps.Keys(m)).
-func KeySlice[M ~map[K]V, K comparable, V any](m M) []K {
-	r := make([]K, 0, len(m))
-	for k := range m {
-		r = append(r, k)
-	}
-	return r
-}
-
 type JSONInfo struct {
 	Omit     bool            // unexported or first tag element is "-"
 	Name     string          // Go field name or first tag element. Empty if Omit is true.

internal/testenv/testenv.go

@@ -25,7 +25,6 @@ import (
 
 	"golang.org/x/mod/modfile"
 	"golang.org/x/tools/internal/gocommand"
-	"golang.org/x/tools/internal/goroot"
 )
 
 // packageMainIsDevel reports whether the module containing package main
@@ -423,23 +422,6 @@ func Deadline(t testing.TB) (time.Time, bool) {
 	return td.Deadline()
 }
 
-// WriteImportcfg writes an importcfg file used by the compiler or linker to
-// dstPath containing entries for the packages in std and cmd in addition
-// to the package to package file mappings in additionalPackageFiles.
-func WriteImportcfg(t testing.TB, dstPath string, additionalPackageFiles map[string]string) {
-	importcfg, err := goroot.Importcfg()
-	for k, v := range additionalPackageFiles {
-		importcfg += fmt.Sprintf("\npackagefile %s=%s", k, v)
-	}
-	if err != nil {
-		t.Fatalf("preparing the importcfg failed: %s", err)
-	}
-	os.WriteFile(dstPath, []byte(importcfg), 0655)
-	if err != nil {
-		t.Fatalf("writing the importcfg failed: %s", err)
-	}
-}
-
 var (
 	gorootOnce sync.Once
 	gorootPath string