x/tools: drop go1.18 support

Updates golang/go#64407 Change-Id: I247a7ff7f07613674f8e31e4cb9c5a68762d2203 Reviewed-on: https://go-review.googlesource.com/c/tools/+/567418 Reviewed-by: Robert Findley <[email protected]> Auto-Submit: Alan Donovan <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]>
golang · Feb 29, 2024 · 283fce2 · 283fce2
1 parent 7f348c7
commit 283fce2
Show file tree

Hide file tree

Showing 118 changed files with 186 additions and 1,584 deletions.
diff --git a/cmd/bisect/main_test.go b/cmd/bisect/main_test.go
@@ -17,7 +17,6 @@ import (
 	"testing"
 
 	"golang.org/x/tools/internal/bisect"
-	"golang.org/x/tools/internal/compat"
 	"golang.org/x/tools/internal/diffp"
 	"golang.org/x/tools/txtar"
 )
@@ -82,7 +81,7 @@ func Test(t *testing.T) {
 						have[color] = true
 					}
 					if m.ShouldReport(uint64(i)) {
-						out = compat.Appendf(out, "%s %s\n", color, bisect.Marker(uint64(i)))
+						out = fmt.Appendf(out, "%s %s\n", color, bisect.Marker(uint64(i)))
 					}
 				}
 				err = nil

diff --git a/copyright/copyright.go b/copyright/copyright.go
@@ -2,9 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build go1.18
-// +build go1.18
-
 // Package copyright checks that files have the correct copyright notices.
 package copyright
 

diff --git a/copyright/copyright_test.go b/copyright/copyright_test.go
@@ -2,9 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build go1.18
-// +build go1.18
-
 package copyright
 
 import (

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module golang.org/x/tools
 
-go 1.18
+go 1.19
 
 require (
 	github.com/yuin/goldmark v1.4.13

diff --git a/go/analysis/passes/asmdecl/arches_go118.go b/go/analysis/passes/asmdecl/arches_go118.go
diff --git a/go/analysis/passes/asmdecl/arches_go119.go b/go/analysis/passes/asmdecl/arches_go119.go
diff --git a/go/analysis/passes/asmdecl/asmdecl.go b/go/analysis/passes/asmdecl/asmdecl.go
@@ -96,6 +96,7 @@ var (
 	asmArchRISCV64  = asmArch{name: "riscv64", bigEndian: false, stack: "SP", lr: true, retRegs: []string{"X10", "F10"}}
 	asmArchS390X    = asmArch{name: "s390x", bigEndian: true, stack: "R15", lr: true}
 	asmArchWasm     = asmArch{name: "wasm", bigEndian: false, stack: "SP", lr: false}
+	asmArchLoong64  = asmArch{name: "loong64", bigEndian: false, stack: "R3", lr: true}
 
 	arches = []*asmArch{
 		&asmArch386,
@@ -111,11 +112,11 @@ var (
 		&asmArchRISCV64,
 		&asmArchS390X,
 		&asmArchWasm,
+		&asmArchLoong64,
 	}
 )
 
 func init() {
-	arches = append(arches, additionalArches()...)
 	for _, arch := range arches {
 		arch.sizes = types.SizesFor("gc", arch.name)
 		if arch.sizes == nil {

diff --git a/go/analysis/passes/assign/testdata/src/typeparams/typeparams.go b/go/analysis/passes/assign/testdata/src/typeparams/typeparams.go
@@ -4,8 +4,6 @@
 
 // This file contains tests for the useless-assignment checker.
 
-//go:build go1.18
-
 package testdata
 
 import "math/rand"

diff --git a/go/analysis/passes/assign/testdata/src/typeparams/typeparams.go.golden b/go/analysis/passes/assign/testdata/src/typeparams/typeparams.go.golden
@@ -4,8 +4,6 @@
 
 // This file contains tests for the useless-assignment checker.
 
-//go:build go1.18
-
 package testdata
 
 import "math/rand"

diff --git a/go/analysis/passes/bools/testdata/src/typeparams/typeparams.go b/go/analysis/passes/bools/testdata/src/typeparams/typeparams.go
@@ -4,8 +4,6 @@
 
 // This file contains tests for the bool checker.
 
-//go:build go1.18
-
 package typeparams
 
 type T[P interface{ ~int }] struct {

diff --git a/go/analysis/passes/composite/testdata/src/a/a_fuzz_test.go b/go/analysis/passes/composite/testdata/src/a/a_fuzz_test.go
@@ -2,9 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build go1.18
-// +build go1.18
-
 package a
 
 import "testing"

diff --git a/go/analysis/passes/composite/testdata/src/a/a_fuzz_test.go.golden b/go/analysis/passes/composite/testdata/src/a/a_fuzz_test.go.golden
@@ -2,9 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build go1.18
-// +build go1.18
-
 package a
 
 import "testing"

diff --git a/go/analysis/passes/httpresponse/testdata/src/typeparams/typeparams.go b/go/analysis/passes/httpresponse/testdata/src/typeparams/typeparams.go
@@ -4,8 +4,6 @@
 
 // This file contains tests for the httpresponse checker.
 
-//go:build go1.18
-
 package typeparams
 
 import (

diff --git a/go/analysis/passes/loopclosure/loopclosure_test.go b/go/analysis/passes/loopclosure/loopclosure_test.go
@@ -33,8 +33,6 @@ func TestVersions22(t *testing.T) {
 }
 
 func TestVersions18(t *testing.T) {
-	testenv.NeedsGo1Point(t, 18)
-
 	testfile := filepath.Join(analysistest.TestData(), "src", "versions", "go18.txtar")
 	runTxtarFile(t, testfile, loopclosure.Analyzer, "golang.org/fake/versions")
 }

diff --git a/go/analysis/passes/loopclosure/testdata/src/typeparams/typeparams.go b/go/analysis/passes/loopclosure/testdata/src/typeparams/typeparams.go
@@ -5,7 +5,7 @@
 // This file contains legacy tests for the loopclosure checker for GoVersion <go1.22.
 // Expectations are incorrect after go1.22.
 
-//go:build go1.18
+//go:build go1.19
 
 package typeparams
 

diff --git a/go/analysis/passes/loopclosure/testdata/src/versions/go18.txtar b/go/analysis/passes/loopclosure/testdata/src/versions/go18.txtar
@@ -1,11 +1,11 @@
-Test loopclosure at go version go1.18.
+Test loopclosure at go version go1.19.
 
 -- go.mod --
 module golang.org/fake/versions
 
-go 1.18
+go 1.19
 -- pre.go --
-//go:build go1.18
+//go:build go1.19
 
 package versions
 

diff --git a/go/analysis/passes/loopclosure/testdata/src/versions/go22.txtar b/go/analysis/passes/loopclosure/testdata/src/versions/go22.txtar
@@ -1,4 +1,7 @@
 Test loopclosure at go version go1.22.
+
+The go1.19 build tag is necessary to force the file version.
+
 -- go.mod --
 module golang.org/fake/versions
 

diff --git a/go/analysis/passes/lostcancel/testdata/src/typeparams/typeparams.go b/go/analysis/passes/lostcancel/testdata/src/typeparams/typeparams.go
@@ -4,8 +4,6 @@
 
 // This file contains tests for the lostcancel checker.
 
-//go:build go1.18
-
 package typeparams
 
 import (
@@ -20,7 +18,7 @@ func _[T any]() {
 	if false {
 		_ = cancel
 	}
-} // want "this return statement may be reached without using the cancel var defined on line 19"
+} // want "this return statement may be reached without using the cancel var defined on line 17"
 
 func _[T any]() {
 	_, cancel := context.WithCancel(bg)

diff --git a/go/analysis/passes/nilfunc/testdata/src/typeparams/typeparams.go b/go/analysis/passes/nilfunc/testdata/src/typeparams/typeparams.go
@@ -4,8 +4,6 @@
 
 // This file contains tests for the lostcancel checker.
 
-//go:build go1.18
-
 package typeparams
 
 func f[P any]() {}
@@ -22,7 +20,7 @@ type T2[P1 any, P2 any] struct {
 	g func(P1) P2
 }
 
-func Comparison[P any](f2 func()T1[P]) {
+func Comparison[P any](f2 func() T1[P]) {
 	var t1 T1[P]
 	var t2 T2[P, int]
 	var fn func()
@@ -40,7 +38,7 @@ func Comparison[P any](f2 func()T1[P]) {
 	}
 }
 
-func Index[P any](a [](func()P)) {
+func Index[P any](a [](func() P)) {
 	if a[1] == nil {
 		// no error
 	}
@@ -49,4 +47,4 @@ func Index[P any](a [](func()P)) {
 	if t1[1].f == nil || t2[0][1].g == nil {
 		// no error
 	}
-}
+}
diff --git a/go/analysis/passes/nilness/nilness_go117_test.go b/go/analysis/passes/nilness/nilness_go117_test.go
diff --git a/go/analysis/passes/nilness/nilness_test.go b/go/analysis/passes/nilness/nilness_test.go
@@ -16,6 +16,11 @@ func Test(t *testing.T) {
 	analysistest.Run(t, testdata, nilness.Analyzer, "a")
 }
 
+func TestNilness(t *testing.T) {
+	testdata := analysistest.TestData()
+	analysistest.Run(t, testdata, nilness.Analyzer, "b")
+}
+
 func TestInstantiated(t *testing.T) {
 	testdata := analysistest.TestData()
 	analysistest.Run(t, testdata, nilness.Analyzer, "c")

diff --git a/go/analysis/passes/printf/printf_test.go b/go/analysis/passes/printf/printf_test.go
@@ -9,12 +9,9 @@ import (
 
 	"golang.org/x/tools/go/analysis/analysistest"
 	"golang.org/x/tools/go/analysis/passes/printf"
-	"golang.org/x/tools/internal/testenv"
 )
 
 func Test(t *testing.T) {
-	testenv.NeedsGo1Point(t, 19) // tests use fmt.Appendf
-
 	testdata := analysistest.TestData()
 	printf.Analyzer.Flags.Set("funcs", "Warn,Warnf")
 

diff --git a/go/analysis/passes/printf/testdata/src/typeparams/diagnostics.go b/go/analysis/passes/printf/testdata/src/typeparams/diagnostics.go
@@ -2,9 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build go1.18
-// +build go1.18
-
 package typeparams
 
 import "fmt"

diff --git a/go/analysis/passes/printf/testdata/src/typeparams/wrappers.go b/go/analysis/passes/printf/testdata/src/typeparams/wrappers.go
@@ -2,9 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build go1.18
-// +build go1.18
-
 package typeparams
 
 import "fmt"

diff --git a/go/analysis/passes/stdmethods/testdata/src/a/b.go b/go/analysis/passes/stdmethods/testdata/src/a/b.go
@@ -2,9 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build go1.18
-// +build go1.18
-
 package a
 
 type H int

diff --git a/go/analysis/passes/testinggoroutine/util.go b/go/analysis/passes/testinggoroutine/util.go
@@ -30,7 +30,7 @@ func localFunctionDecls(info *types.Info, files []*ast.File) func(*types.Func) *
 				}
 			}
 		}
-		// TODO: once we only support go1.19+, set f = f.Origin() here.
+		// TODO: set f = f.Origin() here.
 		return fnDecls[f]
 	}
 }

diff --git a/go/analysis/passes/tests/testdata/src/a/go118_test.go b/go/analysis/passes/tests/testdata/src/a/go118_test.go
@@ -1,6 +1,3 @@
-//go:build go1.18
-// +build go1.18
-
 package a
 
 import (

diff --git a/go/analysis/passes/unusedresult/testdata/src/typeparams/typeparams.go b/go/analysis/passes/unusedresult/testdata/src/typeparams/typeparams.go
@@ -1,8 +1,6 @@
 // Copyright 2015 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
-//
-//go:build go1.18
 
 package typeparams
 

diff --git a/go/analysis/passes/unusedresult/testdata/src/typeparams/userdefs/userdefs.go b/go/analysis/passes/unusedresult/testdata/src/typeparams/userdefs/userdefs.go
@@ -1,8 +1,6 @@
 // Copyright 2015 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
-//
-//go:build go1.18
 
 package userdefs
 
@@ -25,4 +23,4 @@ type MultiTypeParam[T any, U any] struct {
 
 func (_ *MultiTypeParam[T, U]) String() string {
 	return "MultiTypeParam"
-}
+}
diff --git a/go/analysis/unitchecker/separate_test.go b/go/analysis/unitchecker/separate_test.go
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build go1.19
-
 package unitchecker_test
 
 // This file illustrates separate analysis with an example.

diff --git a/go/analysis/unitchecker/unitchecker_test.go b/go/analysis/unitchecker/unitchecker_test.go
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build go1.19
-
 package unitchecker_test
 
 import (

diff --git a/go/callgraph/rta/rta.go b/go/callgraph/rta/rta.go
@@ -46,7 +46,6 @@ import (
 	"golang.org/x/tools/go/ssa"
 	"golang.org/x/tools/go/types/typeutil"
 	"golang.org/x/tools/internal/aliases"
-	"golang.org/x/tools/internal/compat"
 )
 
 // A Result holds the results of Rapid Type Analysis, which includes the
@@ -546,7 +545,7 @@ func fingerprint(mset *types.MethodSet) uint64 {
 	for i := 0; i < mset.Len(); i++ {
 		method := mset.At(i).Obj()
 		sig := method.Type().(*types.Signature)
-		sum := crc32.ChecksumIEEE(compat.Appendf(space[:], "%s/%d/%d",
+		sum := crc32.ChecksumIEEE(fmt.Appendf(space[:], "%s/%d/%d",
 			method.Id(),
 			sig.Params().Len(),
 			sig.Results().Len()))
-Original file line number
+Diff line change
@@ Expand Up @@
     				}
     			}
     		}
-    		// TODO: once we only support go1.19+, set f = f.Origin() here.
+    		// TODO: set f = f.Origin() here.
     		return fnDecls[f]
     	}
     }
@@ Expand Down @@