Skip to content

Commit a8e4b8c

Browse files
griesemergopherbot
authored andcommitted
go/types: remove pkgForMode in favor of pkgFor (cleanup)
The mode is always 0. Change-Id: I6566383c7724b26f070729041bce203a5afa0989 Reviewed-on: https://go-review.googlesource.com/c/go/+/443776 Reviewed-by: Robert Griesemer <[email protected]> Auto-Submit: Robert Griesemer <[email protected]> Run-TryBot: Robert Griesemer <[email protected]> Reviewed-by: Robert Findley <[email protected]> TryBot-Result: Gopher Robot <[email protected]>
1 parent 54ad7f3 commit a8e4b8c

File tree

4 files changed

+12
-16
lines changed

4 files changed

+12
-16
lines changed

src/go/types/api_test.go

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,8 @@ import (
2424
// pkgFor parses and type checks the package specified by path and source,
2525
// populating info if provided.
2626
func pkgFor(path, source string, info *Info) (*Package, error) {
27-
return pkgForMode(path, source, info, 0)
28-
}
29-
30-
func pkgForMode(path, source string, info *Info, mode parser.Mode) (*Package, error) {
3127
fset := token.NewFileSet()
32-
f, err := parser.ParseFile(fset, path, source, mode)
28+
f, err := parser.ParseFile(fset, path, source, 0)
3329
if err != nil {
3430
return nil, err
3531
}
@@ -1650,7 +1646,7 @@ func TestLookupFieldOrMethod(t *testing.T) {
16501646
}
16511647

16521648
for _, test := range tests {
1653-
pkg, err := pkgForMode("test", "package p;"+test.src, nil, 0)
1649+
pkg, err := pkgFor("test", "package p;"+test.src, nil)
16541650
if err != nil {
16551651
t.Errorf("%s: incorrect test case: %s", test.src, err)
16561652
continue
@@ -1943,7 +1939,7 @@ func TestIdentical(t *testing.T) {
19431939
}
19441940

19451941
for _, test := range tests {
1946-
pkg, err := pkgForMode("test", "package p;"+test.src, nil, 0)
1942+
pkg, err := pkgFor("test", "package p;"+test.src, nil)
19471943
if err != nil {
19481944
t.Errorf("%s: incorrect test case: %s", test.src, err)
19491945
continue
@@ -2241,7 +2237,7 @@ func f(x T) T { return foo.F(x) }
22412237
func TestInstantiate(t *testing.T) {
22422238
// eventually we like more tests but this is a start
22432239
const src = "package p; type T[P any] *T[P]"
2244-
pkg, err := pkgForMode(".", src, nil, 0)
2240+
pkg, err := pkgFor(".", src, nil)
22452241
if err != nil {
22462242
t.Fatal(err)
22472243
}
@@ -2279,7 +2275,7 @@ func TestInstantiateErrors(t *testing.T) {
22792275

22802276
for _, test := range tests {
22812277
src := "package p; " + test.src
2282-
pkg, err := pkgForMode(".", src, nil, 0)
2278+
pkg, err := pkgFor(".", src, nil)
22832279
if err != nil {
22842280
t.Fatal(err)
22852281
}

src/go/types/instantiate_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ func TestInstantiateEquality(t *testing.T) {
109109
}
110110

111111
for _, test := range tests {
112-
pkg, err := pkgForMode(".", test.src, nil, 0)
112+
pkg, err := pkgFor(".", test.src, nil)
113113
if err != nil {
114114
t.Fatal(err)
115115
}
@@ -139,11 +139,11 @@ func TestInstantiateEquality(t *testing.T) {
139139
func TestInstantiateNonEquality(t *testing.T) {
140140
const src = "package p; type T[P any] int"
141141

142-
pkg1, err := pkgForMode(".", src, nil, 0)
142+
pkg1, err := pkgFor(".", src, nil)
143143
if err != nil {
144144
t.Fatal(err)
145145
}
146-
pkg2, err := pkgForMode(".", src, nil, 0)
146+
pkg2, err := pkgFor(".", src, nil)
147147
if err != nil {
148148
t.Fatal(err)
149149
}
@@ -194,7 +194,7 @@ var X T[int]
194194

195195
for _, test := range tests {
196196
src := prefix + test.decl
197-
pkg, err := pkgForMode(".", src, nil, 0)
197+
pkg, err := pkgFor(".", src, nil)
198198
if err != nil {
199199
t.Fatal(err)
200200
}
@@ -219,7 +219,7 @@ func (T[P]) m() {}
219219
220220
var _ T[int]
221221
`
222-
pkg, err := pkgForMode(".", src, nil, 0)
222+
pkg, err := pkgFor(".", src, nil)
223223
if err != nil {
224224
t.Fatal(err)
225225
}

src/go/types/methodset_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ func TestNewMethodSet(t *testing.T) {
8484
}
8585

8686
check := func(src string, methods []method, generic bool) {
87-
pkg, err := pkgForMode("test", "package p;"+src, nil, 0)
87+
pkg, err := pkgFor("test", "package p;"+src, nil)
8888
if err != nil {
8989
t.Errorf("%s: incorrect test case: %s", src, err)
9090
return

src/go/types/named_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func (G[P]) N() (p P) { return }
3333
3434
type Inst = G[int]
3535
`
36-
pkg, err := pkgForMode("p", src, nil, 0)
36+
pkg, err := pkgFor("p", src, nil)
3737
if err != nil {
3838
b.Fatal(err)
3939
}

0 commit comments

Comments
 (0)