x/tools: modernize interface{} -> any

Produced with a patched version of modernize containing only
the efaceany pass:

$ go run ./gopls/internal/analysis/modernize/cmd/modernize/main.go -test -fix ./... ./gopls/...

This is very safe and forms the bulk of the modernize diff,
isolating the other changes for ease of review.

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

Author: adonovan

blog/blog.go

@@ -420,7 +420,7 @@ type rootData struct {
 	BasePath      string
 	GodocURL      string
 	AnalyticsHTML template.HTML
-	Data          interface{}
+	Data          any
 }
 
 // ServeHTTP serves the front, index, and article pages

container/intsets/sparse.go

@@ -267,7 +267,7 @@ func (s *Sparse) init() {
 		// loop.  Fail fast before this occurs.
 		// We don't want to call panic here because it prevents the
 		// inlining of this function.
-		_ = (interface{}(nil)).(to_copy_a_sparse_you_must_call_its_Copy_method)
+		_ = (any(nil)).(to_copy_a_sparse_you_must_call_its_Copy_method)
 	}
 }
 

go/analysis/analysis.go

@@ -45,7 +45,7 @@ type Analyzer struct {
 	// To pass analysis results between packages (and thus
 	// potentially between address spaces), use Facts, which are
 	// serializable.
-	Run func(*Pass) (interface{}, error)
+	Run func(*Pass) (any, error)
 
 	// RunDespiteErrors allows the driver to invoke
 	// the Run method of this analyzer even on a
@@ -112,7 +112,7 @@ type Pass struct {
 	// The map keys are the elements of Analysis.Required,
 	// and the type of each corresponding value is the required
 	// analysis's ResultType.
-	ResultOf map[*Analyzer]interface{}
+	ResultOf map[*Analyzer]any
 
 	// ReadFile returns the contents of the named file.
 	//
@@ -186,7 +186,7 @@ type ObjectFact struct {
 
 // Reportf is a helper function that reports a Diagnostic using the
 // specified position and formatted error message.
-func (pass *Pass) Reportf(pos token.Pos, format string, args ...interface{}) {
+func (pass *Pass) Reportf(pos token.Pos, format string, args ...any) {
 	msg := fmt.Sprintf(format, args...)
 	pass.Report(Diagnostic{Pos: pos, Message: msg})
 }
@@ -201,7 +201,7 @@ type Range interface {
 // ReportRangef is a helper function that reports a Diagnostic using the
 // range provided. ast.Node values can be passed in as the range because
 // they satisfy the Range interface.
-func (pass *Pass) ReportRangef(rng Range, format string, args ...interface{}) {
+func (pass *Pass) ReportRangef(rng Range, format string, args ...any) {
 	msg := fmt.Sprintf(format, args...)
 	pass.Report(Diagnostic{Pos: rng.Pos(), End: rng.End(), Message: msg})
 }

go/analysis/analysistest/analysistest.go

@@ -76,7 +76,7 @@ var TestData = func() string {
 
 // Testing is an abstraction of a *testing.T.
 type Testing interface {
-	Errorf(format string, args ...interface{})
+	Errorf(format string, args ...any)
 }
 
 // RunWithSuggestedFixes behaves like Run, but additionally applies

go/analysis/analysistest/analysistest_test.go

@@ -262,6 +262,6 @@ type T string
 
 type errorfunc func(string)
 
-func (f errorfunc) Errorf(format string, args ...interface{}) {
+func (f errorfunc) Errorf(format string, args ...any) {
 	f(fmt.Sprintf(format, args...))
 }

go/analysis/internal/analysisflags/flags.go

@@ -201,7 +201,7 @@ func addVersionFlag() {
 type versionFlag struct{}
 
 func (versionFlag) IsBoolFlag() bool { return true }
-func (versionFlag) Get() interface{} { return nil }
+func (versionFlag) Get() any         { return nil }
 func (versionFlag) String() string   { return "" }
 func (versionFlag) Set(s string) error {
 	if s != "full" {
@@ -252,7 +252,7 @@ const (
 
 // triState implements flag.Value, flag.Getter, and flag.boolFlag.
 // They work like boolean flags: we can say vet -printf as well as vet -printf=true
-func (ts *triState) Get() interface{} {
+func (ts *triState) Get() any {
 	return *ts == setTrue
 }
 
@@ -340,7 +340,7 @@ func PrintPlain(out io.Writer, fset *token.FileSet, contextLines int, diag analy
 
 // A JSONTree is a mapping from package ID to analysis name to result.
 // Each result is either a jsonError or a list of JSONDiagnostic.
-type JSONTree map[string]map[string]interface{}
+type JSONTree map[string]map[string]any
 
 // A TextEdit describes the replacement of a portion of a file.
 // Start and End are zero-based half-open indices into the original byte
@@ -383,7 +383,7 @@ type JSONRelatedInformation struct {
 // Add adds the result of analysis 'name' on package 'id'.
 // The result is either a list of diagnostics or an error.
 func (tree JSONTree) Add(fset *token.FileSet, id, name string, diags []analysis.Diagnostic, err error) {
-	var v interface{}
+	var v any
 	if err != nil {
 		type jsonError struct {
 			Err string `json:"error"`
@@ -429,7 +429,7 @@ func (tree JSONTree) Add(fset *token.FileSet, id, name string, diags []analysis.
 	if v != nil {
 		m, ok := tree[id]
 		if !ok {
-			m = make(map[string]interface{})
+			m = make(map[string]any)
 			tree[id] = m
 		}
 		m[name] = v

go/analysis/internal/checker/checker_test.go

@@ -107,7 +107,7 @@ func NewT1() *T1 { return &T1{T} }
 		Name:     "noop",
 		Doc:      "noop",
 		Requires: []*analysis.Analyzer{inspect.Analyzer},
-		Run: func(pass *analysis.Pass) (interface{}, error) {
+		Run: func(pass *analysis.Pass) (any, error) {
 			return nil, nil
 		},
 		RunDespiteErrors: true,
@@ -119,7 +119,7 @@ func NewT1() *T1 { return &T1{T} }
 		Name:     "noopfact",
 		Doc:      "noopfact",
 		Requires: []*analysis.Analyzer{inspect.Analyzer},
-		Run: func(pass *analysis.Pass) (interface{}, error) {
+		Run: func(pass *analysis.Pass) (any, error) {
 			return nil, nil
 		},
 		RunDespiteErrors: true,
@@ -185,7 +185,7 @@ func TestURL(t *testing.T) {
 		Name: "pkgname",
 		Doc:  "trivial analyzer that reports package names",
 		URL:  "https://pkg.go.dev/golang.org/x/tools/go/analysis/internal/checker",
-		Run: func(p *analysis.Pass) (interface{}, error) {
+		Run: func(p *analysis.Pass) (any, error) {
 			for _, f := range p.Files {
 				p.ReportRangef(f.Name, "package name is %s", f.Name.Name)
 			}

go/analysis/internal/checker/start_test.go

@@ -62,7 +62,7 @@ var commentAnalyzer = &analysis.Analyzer{
 	Run:      commentRun,
 }
 
-func commentRun(pass *analysis.Pass) (interface{}, error) {
+func commentRun(pass *analysis.Pass) (any, error) {
 	const (
 		from = "/* Package comment */"
 		to   = "// Package comment"

go/analysis/internal/internal.go

@@ -9,4 +9,4 @@ import "golang.org/x/tools/go/analysis"
 // This function is set by the checker package to provide
 // backdoor access to the private Pass field
 // of the checker.Action type, for use by analysistest.
-var Pass func(interface{}) *analysis.Pass
+var Pass func(any) *analysis.Pass

go/analysis/internal/versiontest/version_test.go

@@ -26,7 +26,7 @@ import (
 var analyzer = &analysis.Analyzer{
 	Name: "versiontest",
 	Doc:  "off",
-	Run: func(pass *analysis.Pass) (interface{}, error) {
+	Run: func(pass *analysis.Pass) (any, error) {
 		pass.Reportf(pass.Files[0].Package, "goversion=%s", pass.Pkg.GoVersion())
 		return nil, nil
 	},