cmd/getgo/download.go

@@ -12,6 +12,7 @@ import (
 	"archive/zip"
 	"compress/gzip"
 	"crypto/sha256"
+	"encoding/json"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -22,7 +23,6 @@ import (
 )
 
 const (
-	currentVersionURL = "https://golang.org/VERSION?m=text"
 	downloadURLPrefix = "https://dl.google.com/go"
 )
 
@@ -168,18 +168,24 @@ func unpackZip(src, dest string) error {
 }
 
 func getLatestGoVersion() (string, error) {
-	resp, err := http.Get(currentVersionURL)
+	resp, err := http.Get("https://golang.org/dl/?mode=json")
 	if err != nil {
 		return "", fmt.Errorf("Getting current Go version failed: %v", err)
 	}
 	defer resp.Body.Close()
-	if resp.StatusCode > 299 {
+	if resp.StatusCode != http.StatusOK {
 		b, _ := ioutil.ReadAll(io.LimitReader(resp.Body, 1024))
-		return "", fmt.Errorf("Could not get current Go version: HTTP %d: %q", resp.StatusCode, b)
+		return "", fmt.Errorf("Could not get current Go release: HTTP %d: %q", resp.StatusCode, b)
+	}
+	var releases []struct {
+		Version string
 	}
-	version, err := ioutil.ReadAll(resp.Body)
+	err = json.NewDecoder(resp.Body).Decode(&releases)
 	if err != nil {
 		return "", err
 	}
-	return strings.TrimSpace(string(version)), nil
+	if len(releases) < 1 {
+		return "", fmt.Errorf("Could not get at least one Go release")
+	}
+	return releases[0].Version, nil
 }

go/ast/astutil/rewrite.go

@@ -9,6 +9,8 @@ import (
 	"go/ast"
 	"reflect"
 	"sort"
+
+	"golang.org/x/tools/internal/typeparams"
 )
 
 // An ApplyFunc is invoked by Apply for each node n, even if n is nil,
@@ -437,7 +439,11 @@ func (a *application) apply(parent ast.Node, name string, iter *iterator, n ast.
 		}
 
 	default:
-		panic(fmt.Sprintf("Apply: unexpected node type %T", n))
+		if typeparams.IsListExpr(n) {
+			a.applyList(n, "ElemList")
+		} else {
+			panic(fmt.Sprintf("Apply: unexpected node type %T", n))
+		}
 	}
 
 	if a.post != nil && !a.post(&a.cursor) {

go/ast/astutil/rewrite_test.go

@@ -13,13 +13,16 @@ import (
 	"testing"
 
 	"golang.org/x/tools/go/ast/astutil"
+	"golang.org/x/tools/internal/typeparams"
 )
 
-var rewriteTests = [...]struct {
+type rewriteTest struct {
 	name       string
 	orig, want string
 	pre, post  astutil.ApplyFunc
-}{
+}
+
+var rewriteTests = []rewriteTest{
 	{name: "nop", orig: "package p\n", want: "package p\n"},
 
 	{name: "replace",
@@ -190,6 +193,34 @@ var z int
 	},
 }
 
+func init() {
+	if typeparams.Enabled {
+		rewriteTests = append(rewriteTests, rewriteTest{
+			name: "replace",
+			orig: `package p
+
+type T[P1, P2 any] int
+
+type R T[int, string]
+`,
+			want: `package p
+
+type T[P1, P2 any] int32
+
+type R T[int32, string]
+`,
+			post: func(c *astutil.Cursor) bool {
+				if ident, ok := c.Node().(*ast.Ident); ok {
+					if ident.Name == "int" {
+						c.Replace(ast.NewIdent("int32"))
+					}
+				}
+				return true
+			},
+		})
+	}
+}
+
 func valspec(name, typ string) *ast.ValueSpec {
 	return &ast.ValueSpec{Names: []*ast.Ident{ast.NewIdent(name)},
 		Type: ast.NewIdent(typ),