cmd/rebuild, internal/task: delete copies of go/version code

We can use go/version directly from the standard library now that it
exists there, and because Go 1.22 or newer is always used in x/build.

Change-Id: I5fc65eefa552c9b457691fe0cea6a1cffc2ac871
Reviewed-on: https://go-review.googlesource.com/c/build/+/611976
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Auto-Submit: Dmitri Shuralyov <dmitshur@golang.org>
Reviewed-by: Hongxiang Jiang <hxjiang@golang.org>

cmd/gorebuild/build.go

@@ -6,6 +6,7 @@ package main
 
 import (
 	"fmt"
+	goversion "go/version"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -17,24 +18,27 @@ import (
 // for the named version of Go. If the version needs no bootstrap
 // (that is, if it's before Go 1.5), BootstrapVersion returns an empty version.
 func BootstrapVersion(version string) (string, error) {
-	if Compare(version, Go(1, 5)) < 0 {
+	// go1 returns the version string for Go 1.N ("go1.N").
+	go1 := func(N int) string { return fmt.Sprintf("go1.%d", N) }
+
+	if goversion.Compare(version, go1(5)) < 0 {
 		return "", nil
 	}
-	if Compare(version, Go(1, 20)) < 0 {
-		return Go(1, 4), nil
+	if goversion.Compare(version, go1(20)) < 0 {
+		return go1(4), nil
 	}
-	if Compare(version, Go(1, 22)) < 0 {
-		return Go(1, 17), nil
+	if goversion.Compare(version, go1(22)) < 0 {
+		return go1(17), nil
 	}
-	if Compare(version, Go(1, 1000)) > 0 {
+	if goversion.Compare(version, go1(1000)) > 0 {
 		return "", fmt.Errorf("invalid version %q", version)
 	}
 	for i := 24; ; i += 2 {
-		if Compare(version, Go(1, i)) < 0 {
+		if goversion.Compare(version, go1(i)) < 0 {
 			// 1.24 will switch to 1.22; before that we used 1.20
 			// 1.26 will switch to 1.24; before that we used 1.22
 			// ...
-			return Go(1, i-4), nil
+			return go1(i - 4), nil
 		}
 	}
 }

cmd/gorebuild/report.go

@@ -7,6 +7,7 @@ package main
 import (
 	"bytes"
 	"fmt"
+	goversion "go/version"
 	"log"
 	"os"
 	"path/filepath"
@@ -243,7 +244,7 @@ func Run(args []string) *Report {
 	if r.Log.Status != FAIL {
 		r.Log.Status = PASS
 	}
-	sort.Slice(r.Releases, func(i, j int) bool { return Compare(r.Releases[i].Version, r.Releases[j].Version) > 0 })
+	sort.Slice(r.Releases, func(i, j int) bool { return goversion.Compare(r.Releases[i].Version, r.Releases[j].Version) > 0 })
 	for _, rel := range r.Releases {
 		if rel.Log.Status != FAIL {
 			rel.Log.Status = PASS

internal/relui/workflows.go

@@ -15,6 +15,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	goversion "go/version"
 	"io"
 	"io/fs"
 	"net/http"
@@ -1644,7 +1645,7 @@ func (tasks *BuildReleaseTasks) publishArtifacts(ctx *wf.TaskContext, version st
 			if a.Target.GOOS == "linux" && a.Target.GOARCH == "arm" && slices.Contains(a.Target.ExtraEnv, "GOARM=6") {
 				f.Arch = "armv6l"
 			}
-			if task.CompareGoVersions(version, "go1.23") == -1 { // TODO: Delete this after Go 1.24.0 is out and this becomes dead code.
+			if goversion.Compare(version, "go1.23") == -1 { // TODO: Delete this after Go 1.24.0 is out and this becomes dead code.
 				// Due to an oversight, we've been inadvertently setting the "arch" field
 				// of published download metadata to "armv6l" for all arm ports, not just
 				// linux/arm port as intended. Keep doing it for the rest of Go 1.22/1.21

internal/task/announce.go

@@ -9,6 +9,7 @@ import (
 	"embed"
 	"errors"
 	"fmt"
+	goversion "go/version"
 	"io"
 	"mime"
 	"net/http"
@@ -456,7 +457,7 @@ var announceTmpl = template.Must(template.New("").Funcs(template.FuncMap{
 	},
 	// atLeast reports whether v1 >= v2.
 	"atLeast": func(v1, v2 string) bool {
-		return CompareGoVersions(v1, v2) >= 0
+		return goversion.Compare(v1, v2) >= 0
 	},
 	// build extracts the pre-release build number of a valid Go version.
 	// For example, build("go1.19beta2") == "2".