go/types: update generate_test.go (cleanup)

Adjust some rewrite code to match current code base.

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

diff --git a/src/go/types/generate_test.go b/src/go/types/generate_test.go
index 75fda025ee1e31f216e96a2f664f6a518a8568f6..7f338270aafbcfc80d4aa4f4bc970306fcea9d48 100644 (file)
--- a/src/go/types/generate_test.go
+++ b/src/go/types/generate_test.go
@@ -211,7 +211,7 @@ func fixInferSig(f *ast.File) {
        ast.Inspect(f, func(n ast.Node) bool {
                switch n := n.(type) {
                case *ast.FuncDecl:
-                       if n.Name.Name == "infer" || n.Name.Name == "infer1" || n.Name.Name == "infer2" {
+                       if n.Name.Name == "infer" {
                                // rewrite (pos token.Pos, ...) to (posn positioner, ...)
                                par := n.Type.Params.List[0]
                                if len(par.Names) == 1 && par.Names[0].Name == "pos" {
@@ -232,10 +232,8 @@ func fixInferSig(f *ast.File) {
                                                n.Args[0] = arg
                                                return false
                                        }
-                               case "errorf", "infer1", "infer2":
+                               case "errorf":
                                        // rewrite check.errorf(pos, ...) to check.errorf(posn, ...)
-                                       // rewrite check.infer1(pos, ...) to check.infer1(posn, ...)
-                                       // rewrite check.infer2(pos, ...) to check.infer2(posn, ...)
                                        if ident, _ := n.Args[0].(*ast.Ident); ident != nil && ident.Name == "pos" {
                                                pos := n.Args[0].Pos()
                                                arg := newIdent(pos, "posn")