go/types, types2: simplify test setup in a couple of places (cleanup)

Change-Id: I4e7a0ffad49f1c3b50520648d66f18dd4c9bde55
Reviewed-on: https://go-review.googlesource.com/c/go/+/443779
Reviewed-by: Robert Griesemer <gri@google.com>
Run-TryBot: Robert Griesemer <gri@google.com>
Auto-Submit: Robert Griesemer <gri@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Robert Findley <rfindley@google.com>

diff --git a/src/cmd/compile/internal/types2/issues_test.go b/src/cmd/compile/internal/types2/issues_test.go
index afce7e27159d27f3d4140de2c10ef8eebdb04327..f1d402b7926efe9d7429e475a95bb1663ae4e40a 100644 (file)
--- a/src/cmd/compile/internal/types2/issues_test.go
+++ b/src/cmd/compile/internal/types2/issues_test.go
@@ -46,14 +46,8 @@ var (
        _ = (interface{})("foo")
        _ = (interface{})(nil)
 )`
-       f := mustParse(t, src)
-
-       var conf Config
        types := make(map[syntax.Expr]TypeAndValue)
-       _, err := conf.Check(f.PkgName.Value, []*syntax.File{f}, &Info{Types: types})
-       if err != nil {
-               t.Fatal(err)
-       }
+       mustTypecheck(t, "p", src, &Info{Types: types})
 
        for x, tv := range types {
                var want Type
@@ -91,14 +85,8 @@ func f() int {
        return 0
 }
 `
-       f := mustParse(t, src)
-
-       var conf Config
        types := make(map[syntax.Expr]TypeAndValue)
-       _, err := conf.Check(f.PkgName.Value, []*syntax.File{f}, &Info{Types: types})
-       if err != nil {
-               t.Fatal(err)
-       }
+       mustTypecheck(t, "p", src, &Info{Types: types})
 
        want := Typ[Int]
        n := 0

diff --git a/src/go/types/issues_test.go b/src/go/types/issues_test.go
index b96f68d57543c796cd03d9b76cdbeaa6c38b12fd..0045f30148942f46df5c05c273c6f99c24fd5c4e 100644 (file)
--- a/src/go/types/issues_test.go
+++ b/src/go/types/issues_test.go
@@ -49,14 +49,8 @@ var (
        _ = (interface{})("foo")
        _ = (interface{})(nil)
 )`
-       f := mustParse(t, src)
-
-       var conf Config
        types := make(map[ast.Expr]TypeAndValue)
-       _, err := conf.Check(f.Name.Name, fset, []*ast.File{f}, &Info{Types: types})
-       if err != nil {
-               t.Fatal(err)
-       }
+       mustTypecheck(t, "p", src, &Info{Types: types})
 
        for x, tv := range types {
                var want Type
@@ -94,14 +88,8 @@ func f() int {
        return 0
 }
 `
-       f := mustParse(t, src)
-
-       var conf Config
        types := make(map[ast.Expr]TypeAndValue)
-       _, err := conf.Check(f.Name.Name, fset, []*ast.File{f}, &Info{Types: types})
-       if err != nil {
-               t.Fatal(err)
-       }
+       mustTypecheck(t, "p", src, &Info{Types: types})
 
        want := Typ[Int]
        n := 0