Skip to content

Commit 23c86e8

Browse files
adonovanadonovan
committed
internal/typeparams: delete const Enabled=true and simplify
Change-Id: I8e95226d03d94027aee803a0431320bc7ee83600 Reviewed-on: https://go-review.googlesource.com/c/tools/+/549235 Reviewed-by: Robert Findley <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]>
1 parent e46688f commit 23c86e8

File tree

60 files changed

+93
-665
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+93
-665
lines changed

‎cmd/stringer/endtoend_test.go

-4
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323
"testing"
2424

2525
"golang.org/x/tools/internal/testenv"
26-
"golang.org/x/tools/internal/typeparams"
2726
)
2827

2928
// This file contains a test that compiles and runs each program in testdata
@@ -62,9 +61,6 @@ func TestEndToEnd(t *testing.T) {
6261
if err != nil {
6362
t.Fatalf("Readdirnames: %s", err)
6463
}
65-
if typeparams.Enabled {
66-
names = append(names, moreTests(t, "testdata/typeparams", "typeparams")...)
67-
}
6864
// Generate, compile, and run the test programs.
6965
for _, name := range names {
7066
if name == "typeparams" {

‎cmd/stringer/testdata/typeparams/conv2.go renamed to ‎cmd/stringer/testdata/conv2.go

File renamed without changes.

‎cmd/stringer/testdata/typeparams/prime2.go renamed to ‎cmd/stringer/testdata/prime2.go

File renamed without changes.

‎go/analysis/passes/assign/assign_test.go

+1-6
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,9 @@ import (
99

1010
"golang.org/x/tools/go/analysis/analysistest"
1111
"golang.org/x/tools/go/analysis/passes/assign"
12-
"golang.org/x/tools/internal/typeparams"
1312
)
1413

1514
func Test(t *testing.T) {
1615
testdata := analysistest.TestData()
17-
tests := []string{"a"}
18-
if typeparams.Enabled {
19-
tests = append(tests, "typeparams")
20-
}
21-
analysistest.RunWithSuggestedFixes(t, testdata, assign.Analyzer, tests...)
16+
analysistest.RunWithSuggestedFixes(t, testdata, assign.Analyzer, "a", "typeparams")
2217
}

‎go/analysis/passes/atomic/atomic_test.go

+1-6
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,9 @@ import (
99

1010
"golang.org/x/tools/go/analysis/analysistest"
1111
"golang.org/x/tools/go/analysis/passes/atomic"
12-
"golang.org/x/tools/internal/typeparams"
1312
)
1413

1514
func Test(t *testing.T) {
1615
testdata := analysistest.TestData()
17-
tests := []string{"a"}
18-
if typeparams.Enabled {
19-
tests = append(tests, "typeparams")
20-
}
21-
analysistest.Run(t, testdata, atomic.Analyzer, tests...)
16+
analysistest.Run(t, testdata, atomic.Analyzer, "a", "typeparams")
2217
}

‎go/analysis/passes/bools/bools_test.go

+1-6
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,9 @@ import (
99

1010
"golang.org/x/tools/go/analysis/analysistest"
1111
"golang.org/x/tools/go/analysis/passes/bools"
12-
"golang.org/x/tools/internal/typeparams"
1312
)
1413

1514
func Test(t *testing.T) {
1615
testdata := analysistest.TestData()
17-
tests := []string{"a"}
18-
if typeparams.Enabled {
19-
tests = append(tests, "typeparams")
20-
}
21-
analysistest.Run(t, testdata, bools.Analyzer, tests...)
16+
analysistest.Run(t, testdata, bools.Analyzer, "a", "typeparams")
2217
}

‎go/analysis/passes/buildssa/buildssa_test.go

-7
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111

1212
"golang.org/x/tools/go/analysis/analysistest"
1313
"golang.org/x/tools/go/analysis/passes/buildssa"
14-
"golang.org/x/tools/internal/typeparams"
1514
)
1615

1716
func Test(t *testing.T) {
@@ -30,9 +29,6 @@ func Test(t *testing.T) {
3029
}
3130

3231
func TestGenericDecls(t *testing.T) {
33-
if !typeparams.Enabled {
34-
t.Skip("TestGenericDecls requires type parameters.")
35-
}
3632
testdata := analysistest.TestData()
3733
result := analysistest.Run(t, testdata, buildssa.Analyzer, "b")[0].Result
3834

@@ -48,9 +44,6 @@ func TestGenericDecls(t *testing.T) {
4844
}
4945

5046
func TestImporting(t *testing.T) {
51-
if !typeparams.Enabled {
52-
t.Skip("TestImporting depends on testdata/b/b/go which uses type parameters.")
53-
}
5447
testdata := analysistest.TestData()
5548
result := analysistest.Run(t, testdata, buildssa.Analyzer, "c")[0].Result
5649

‎go/analysis/passes/cgocall/cgocall_test.go

+1-7
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,9 @@ import (
99

1010
"golang.org/x/tools/go/analysis/analysistest"
1111
"golang.org/x/tools/go/analysis/passes/cgocall"
12-
"golang.org/x/tools/internal/typeparams"
1312
)
1413

1514
func Test(t *testing.T) {
1615
testdata := analysistest.TestData()
17-
tests := []string{"a", "b", "c"}
18-
if typeparams.Enabled {
19-
// and testdata/src/typeparams/typeparams.go when possible
20-
tests = append(tests, "typeparams")
21-
}
22-
analysistest.Run(t, testdata, cgocall.Analyzer, tests...)
16+
analysistest.Run(t, testdata, cgocall.Analyzer, "a", "b", "c", "typeparams")
2317
}

‎go/analysis/passes/composite/composite_test.go

+1-6
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,9 @@ import (
99

1010
"golang.org/x/tools/go/analysis/analysistest"
1111
"golang.org/x/tools/go/analysis/passes/composite"
12-
"golang.org/x/tools/internal/typeparams"
1312
)
1413

1514
func Test(t *testing.T) {
1615
testdata := analysistest.TestData()
17-
pkgs := []string{"a"}
18-
if typeparams.Enabled {
19-
pkgs = append(pkgs, "typeparams")
20-
}
21-
analysistest.RunWithSuggestedFixes(t, testdata, composite.Analyzer, pkgs...)
16+
analysistest.RunWithSuggestedFixes(t, testdata, composite.Analyzer, "a", "typeparams")
2217
}

‎go/analysis/passes/copylock/copylock_test.go

+1-6
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,9 @@ import (
99

1010
"golang.org/x/tools/go/analysis/analysistest"
1111
"golang.org/x/tools/go/analysis/passes/copylock"
12-
"golang.org/x/tools/internal/typeparams"
1312
)
1413

1514
func Test(t *testing.T) {
1615
testdata := analysistest.TestData()
17-
pkgs := []string{"a"}
18-
if typeparams.Enabled {
19-
pkgs = append(pkgs, "typeparams")
20-
}
21-
analysistest.Run(t, testdata, copylock.Analyzer, pkgs...)
16+
analysistest.Run(t, testdata, copylock.Analyzer, "a", "typeparams")
2217
}

‎go/analysis/passes/ctrlflow/ctrlflow_test.go

+1-9
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,11 @@ import (
1010

1111
"golang.org/x/tools/go/analysis/analysistest"
1212
"golang.org/x/tools/go/analysis/passes/ctrlflow"
13-
"golang.org/x/tools/internal/typeparams"
1413
)
1514

1615
func Test(t *testing.T) {
1716
testdata := analysistest.TestData()
18-
19-
// load testdata/src/a/a.go
20-
tests := []string{"a"}
21-
if typeparams.Enabled {
22-
// and testdata/src/typeparams/typeparams.go when possible
23-
tests = append(tests, "typeparams")
24-
}
25-
results := analysistest.Run(t, testdata, ctrlflow.Analyzer, tests...)
17+
results := analysistest.Run(t, testdata, ctrlflow.Analyzer, "a", "typeparams")
2618

2719
// Perform a minimal smoke test on
2820
// the result (CFG) computed by ctrlflow.

‎go/analysis/passes/deepequalerrors/deepequalerrors_test.go

+1-6
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,9 @@ import (
99

1010
"golang.org/x/tools/go/analysis/analysistest"
1111
"golang.org/x/tools/go/analysis/passes/deepequalerrors"
12-
"golang.org/x/tools/internal/typeparams"
1312
)
1413

1514
func Test(t *testing.T) {
1615
testdata := analysistest.TestData()
17-
tests := []string{"a"}
18-
if typeparams.Enabled {
19-
tests = append(tests, "typeparams")
20-
}
21-
analysistest.Run(t, testdata, deepequalerrors.Analyzer, tests...)
16+
analysistest.Run(t, testdata, deepequalerrors.Analyzer, "a", "typeparams")
2217
}

‎go/analysis/passes/errorsas/errorsas_test.go

+1-6
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,9 @@ import (
1212

1313
"golang.org/x/tools/go/analysis/analysistest"
1414
"golang.org/x/tools/go/analysis/passes/errorsas"
15-
"golang.org/x/tools/internal/typeparams"
1615
)
1716

1817
func Test(t *testing.T) {
1918
testdata := analysistest.TestData()
20-
tests := []string{"a"}
21-
if typeparams.Enabled {
22-
tests = append(tests, "typeparams")
23-
}
24-
analysistest.Run(t, testdata, errorsas.Analyzer, tests...)
19+
analysistest.Run(t, testdata, errorsas.Analyzer, "a", "typeparams")
2520
}

‎go/analysis/passes/httpresponse/httpresponse_test.go

+1-6
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,9 @@ import (
99

1010
"golang.org/x/tools/go/analysis/analysistest"
1111
"golang.org/x/tools/go/analysis/passes/httpresponse"
12-
"golang.org/x/tools/internal/typeparams"
1312
)
1413

1514
func Test(t *testing.T) {
1615
testdata := analysistest.TestData()
17-
tests := []string{"a"}
18-
if typeparams.Enabled {
19-
tests = append(tests, "typeparams")
20-
}
21-
analysistest.Run(t, testdata, httpresponse.Analyzer, tests...)
16+
analysistest.Run(t, testdata, httpresponse.Analyzer, "a", "typeparams")
2217
}

‎go/analysis/passes/ifaceassert/ifaceassert_test.go

+1-6
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,9 @@ import (
99

1010
"golang.org/x/tools/go/analysis/analysistest"
1111
"golang.org/x/tools/go/analysis/passes/ifaceassert"
12-
"golang.org/x/tools/internal/typeparams"
1312
)
1413

1514
func Test(t *testing.T) {
1615
testdata := analysistest.TestData()
17-
pkgs := []string{"a"}
18-
if typeparams.Enabled {
19-
pkgs = append(pkgs, "typeparams")
20-
}
21-
analysistest.Run(t, testdata, ifaceassert.Analyzer, pkgs...)
16+
analysistest.Run(t, testdata, ifaceassert.Analyzer, "a", "typeparams")
2217
}

‎go/analysis/passes/internal/analysisutil/util_test.go

-4
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,9 @@ import (
1212
"testing"
1313

1414
"golang.org/x/tools/go/analysis/passes/internal/analysisutil"
15-
"golang.org/x/tools/internal/typeparams"
1615
)
1716

1817
func TestHasSideEffects(t *testing.T) {
19-
if !typeparams.Enabled {
20-
t.Skip("type parameters are not enabled")
21-
}
2218
src := `package p
2319
2420
type T int

‎go/analysis/passes/loopclosure/loopclosure_test.go

+2-6
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,13 @@ import (
1313
"golang.org/x/tools/go/analysis/analysistest"
1414
"golang.org/x/tools/go/analysis/passes/loopclosure"
1515
"golang.org/x/tools/internal/testenv"
16-
"golang.org/x/tools/internal/typeparams"
1716
"golang.org/x/tools/txtar"
1817
)
1918

2019
func Test(t *testing.T) {
2120
testdata := analysistest.TestData()
22-
tests := []string{"a", "golang.org/...", "subtests"}
23-
if typeparams.Enabled {
24-
tests = append(tests, "typeparams")
25-
}
26-
analysistest.Run(t, testdata, loopclosure.Analyzer, tests...)
21+
analysistest.Run(t, testdata, loopclosure.Analyzer,
22+
"a", "golang.org/...", "subtests", "typeparams")
2723
}
2824

2925
func TestVersions22(t *testing.T) {

‎go/analysis/passes/lostcancel/lostcancel_test.go

+3-7
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,13 @@
55
package lostcancel_test
66

77
import (
8+
"testing"
9+
810
"golang.org/x/tools/go/analysis/analysistest"
911
"golang.org/x/tools/go/analysis/passes/lostcancel"
10-
"golang.org/x/tools/internal/typeparams"
11-
"testing"
1212
)
1313

1414
func Test(t *testing.T) {
1515
testdata := analysistest.TestData()
16-
tests := []string{"a", "b"}
17-
if typeparams.Enabled {
18-
tests = append(tests, "typeparams")
19-
}
20-
analysistest.Run(t, testdata, lostcancel.Analyzer, tests...)
16+
analysistest.Run(t, testdata, lostcancel.Analyzer, "a", "b", "typeparams")
2117
}

‎go/analysis/passes/nilfunc/nilfunc_test.go

+3-7
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,13 @@
55
package nilfunc_test
66

77
import (
8+
"testing"
9+
810
"golang.org/x/tools/go/analysis/analysistest"
911
"golang.org/x/tools/go/analysis/passes/nilfunc"
10-
"golang.org/x/tools/internal/typeparams"
11-
"testing"
1212
)
1313

1414
func Test(t *testing.T) {
1515
testdata := analysistest.TestData()
16-
tests := []string{"a"}
17-
if typeparams.Enabled {
18-
tests = append(tests, "typeparams")
19-
}
20-
analysistest.Run(t, testdata, nilfunc.Analyzer, tests...)
16+
analysistest.Run(t, testdata, nilfunc.Analyzer, "a", "typeparams")
2117
}

‎go/analysis/passes/nilness/nilness_test.go

-7
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99

1010
"golang.org/x/tools/go/analysis/analysistest"
1111
"golang.org/x/tools/go/analysis/passes/nilness"
12-
"golang.org/x/tools/internal/typeparams"
1312
)
1413

1514
func Test(t *testing.T) {
@@ -18,17 +17,11 @@ func Test(t *testing.T) {
1817
}
1918

2019
func TestInstantiated(t *testing.T) {
21-
if !typeparams.Enabled {
22-
t.Skip("TestInstantiated requires type parameters")
23-
}
2420
testdata := analysistest.TestData()
2521
analysistest.Run(t, testdata, nilness.Analyzer, "c")
2622
}
2723

2824
func TestTypeSet(t *testing.T) {
29-
if !typeparams.Enabled {
30-
t.Skip("TestTypeSet requires type parameters")
31-
}
3225
testdata := analysistest.TestData()
3326
analysistest.Run(t, testdata, nilness.Analyzer, "d")
3427
}

‎go/analysis/passes/printf/printf_test.go

+1-6
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"golang.org/x/tools/go/analysis/analysistest"
1111
"golang.org/x/tools/go/analysis/passes/printf"
1212
"golang.org/x/tools/internal/testenv"
13-
"golang.org/x/tools/internal/typeparams"
1413
)
1514

1615
func Test(t *testing.T) {
@@ -19,9 +18,5 @@ func Test(t *testing.T) {
1918
testdata := analysistest.TestData()
2019
printf.Analyzer.Flags.Set("funcs", "Warn,Warnf")
2120

22-
tests := []string{"a", "b", "nofmt"}
23-
if typeparams.Enabled {
24-
tests = append(tests, "typeparams")
25-
}
26-
analysistest.Run(t, testdata, printf.Analyzer, tests...)
21+
analysistest.Run(t, testdata, printf.Analyzer, "a", "b", "nofmt", "typeparams")
2722
}

‎go/analysis/passes/shift/shift_test.go

+1-6
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,9 @@ import (
99

1010
"golang.org/x/tools/go/analysis/analysistest"
1111
"golang.org/x/tools/go/analysis/passes/shift"
12-
"golang.org/x/tools/internal/typeparams"
1312
)
1413

1514
func Test(t *testing.T) {
1615
testdata := analysistest.TestData()
17-
pkgs := []string{"a"}
18-
if typeparams.Enabled {
19-
pkgs = append(pkgs, "typeparams")
20-
}
21-
analysistest.Run(t, testdata, shift.Analyzer, pkgs...)
16+
analysistest.Run(t, testdata, shift.Analyzer, "a", "typeparams")
2217
}

‎go/analysis/passes/stdmethods/stdmethods_test.go

+1-6
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,11 @@ import (
99

1010
"golang.org/x/tools/go/analysis/analysistest"
1111
"golang.org/x/tools/go/analysis/passes/stdmethods"
12-
"golang.org/x/tools/internal/typeparams"
1312
)
1413

1514
func Test(t *testing.T) {
1615
testdata := analysistest.TestData()
17-
pkgs := []string{"a"}
18-
if typeparams.Enabled {
19-
pkgs = append(pkgs, "typeparams")
20-
}
21-
analysistest.Run(t, testdata, stdmethods.Analyzer, pkgs...)
16+
analysistest.Run(t, testdata, stdmethods.Analyzer, "a", "typeparams")
2217
}
2318

2419
func TestAnalyzeEncodingXML(t *testing.T) {

‎go/analysis/passes/stringintconv/string_test.go

+1-6
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,9 @@ import (
99

1010
"golang.org/x/tools/go/analysis/analysistest"
1111
"golang.org/x/tools/go/analysis/passes/stringintconv"
12-
"golang.org/x/tools/internal/typeparams"
1312
)
1413

1514
func Test(t *testing.T) {
1615
testdata := analysistest.TestData()
17-
pkgs := []string{"a"}
18-
if typeparams.Enabled {
19-
pkgs = append(pkgs, "typeparams")
20-
}
21-
analysistest.RunWithSuggestedFixes(t, testdata, stringintconv.Analyzer, pkgs...)
16+
analysistest.RunWithSuggestedFixes(t, testdata, stringintconv.Analyzer, "a", "typeparams")
2217
}

0 commit comments

Comments
 (0)