From 35e54da99640110845086d30ba0b8f69a3ebd3c2 Mon Sep 17 00:00:00 2001 From: Robert Griesemer Date: Tue, 18 Oct 2022 13:33:32 -0700 Subject: [PATCH] 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 Run-TryBot: Robert Griesemer Auto-Submit: Robert Griesemer TryBot-Result: Gopher Robot Reviewed-by: Robert Findley --- src/cmd/compile/internal/types2/issues_test.go | 16 ++-------------- src/go/types/issues_test.go | 16 ++-------------- 2 files changed, 4 insertions(+), 28 deletions(-) diff --git a/src/cmd/compile/internal/types2/issues_test.go b/src/cmd/compile/internal/types2/issues_test.go index afce7e2715..f1d402b792 100644 --- 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 b96f68d575..0045f30148 100644 --- 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 -- 2.51.0