all: upgrade go directive to at least 1.23.0 [generated]

gopherbot · gopherbot · commit 94db71079453 · 2025-02-18T06:38:13.000-08:00
By now Go 1.24.0 has been released, and Go 1.22 is no longer supported per the Go Release Policy (https://go.dev/doc/devel/release#policy). For golang/go#69095. [git-generate] (cd . && go get go@1.23.0 && go mod tidy && go fix ./... && go mod edit -toolchain=none) (cd gopls/doc/assets && go get go@1.23.0 && go mod tidy && go fix ./... && go mod edit -toolchain=none) (cd gopls && echo 'skipping because it already has go1.23.4 >= go1.23.0, nothing to do') Change-Id: I37dad9abd1457a8a8aa940809b7ee6664fba006d Reviewed-on: https://go-review.googlesource.com/c/tools/+/649321 Auto-Submit: Gopher Robot <gobot@golang.org> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: Dmitri Shuralyov <dmitshur@google.com> Reviewed-by: Cherry Mui <cherryyz@google.com> Reviewed-by: Robert Findley <rfindley@google.com>
diff --git a/cmd/callgraph/main_test.go b/cmd/callgraph/main_test.go
@@ -5,7 +5,6 @@
 // No testdata on Android.
 
 //go:build !android && go1.11
-// +build !android,go1.11
 
 package main
 
diff --git a/cmd/fiximports/main_test.go b/cmd/fiximports/main_test.go
@@ -5,7 +5,6 @@
 // No testdata on Android.
 
 //go:build !android
-// +build !android
 
 package main
 
diff --git a/cmd/godex/isAlias18.go b/cmd/godex/isAlias18.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !go1.9
-// +build !go1.9
 
 package main
 
diff --git a/cmd/godex/isAlias19.go b/cmd/godex/isAlias19.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build go1.9
-// +build go1.9
 
 package main
 
diff --git a/cmd/goimports/goimports_gc.go b/cmd/goimports/goimports_gc.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build gc
-// +build gc
 
 package main
 
diff --git a/cmd/goimports/goimports_not_gc.go b/cmd/goimports/goimports_not_gc.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !gc
-// +build !gc
 
 package main
 
diff --git a/cmd/gotype/sizesFor18.go b/cmd/gotype/sizesFor18.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !go1.9
-// +build !go1.9
 
 // This file contains a copy of the implementation of types.SizesFor
 // since this function is not available in go/types before Go 1.9.
diff --git a/cmd/gotype/sizesFor19.go b/cmd/gotype/sizesFor19.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build go1.9
-// +build go1.9
 
 package main
 
diff --git a/cmd/splitdwarf/splitdwarf.go b/cmd/splitdwarf/splitdwarf.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd
-// +build aix darwin dragonfly freebsd linux netbsd openbsd
 
 /*
 Splitdwarf uncompresses and copies the DWARF segment of a Mach-O
diff --git a/cmd/stress/stress.go b/cmd/stress/stress.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build unix || aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || windows
-// +build unix aix darwin dragonfly freebsd linux netbsd openbsd solaris windows
 
 // The stress utility is intended for catching sporadic failures.
 // It runs a given process in parallel in a loop and collects any failures.
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module golang.org/x/tools
 
-go 1.22.0 // => default GODEBUG has gotypesalias=0
+go 1.23.0 // => default GODEBUG has gotypesalias=0
 
 require (
 	github.com/google/go-cmp v0.6.0
diff --git a/go/analysis/multichecker/multichecker_test.go b/go/analysis/multichecker/multichecker_test.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build go1.12
-// +build go1.12
 
 package multichecker_test
 
diff --git a/go/analysis/passes/errorsas/errorsas_test.go b/go/analysis/passes/errorsas/errorsas_test.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build go1.13
-// +build go1.13
 
 package errorsas_test
 
diff --git a/go/analysis/passes/stdversion/main.go b/go/analysis/passes/stdversion/main.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
-// +build ignore
 
 package main
 
diff --git a/go/analysis/unitchecker/main.go b/go/analysis/unitchecker/main.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
-// +build ignore
 
 // This file provides an example command for static checkers
 // conforming to the golang.org/x/tools/go/analysis API.
diff --git a/go/buildutil/allpackages_test.go b/go/buildutil/allpackages_test.go
@@ -5,7 +5,6 @@
 // Incomplete source tree on Android.
 
 //go:build !android
-// +build !android
 
 package buildutil_test
 
diff --git a/go/callgraph/cha/cha_test.go b/go/callgraph/cha/cha_test.go
@@ -5,7 +5,6 @@
 // No testdata on Android.
 
 //go:build !android
-// +build !android
 
 package cha_test
 
diff --git a/go/callgraph/rta/rta_test.go b/go/callgraph/rta/rta_test.go
@@ -5,7 +5,6 @@
 // No testdata on Android.
 
 //go:build !android
-// +build !android
 
 package rta_test
 
diff --git a/go/callgraph/vta/internal/trie/bits_test.go b/go/callgraph/vta/internal/trie/bits_test.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build go1.13
-// +build go1.13
 
 package trie
 
diff --git a/go/callgraph/vta/internal/trie/trie_test.go b/go/callgraph/vta/internal/trie/trie_test.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build go1.13
-// +build go1.13
 
 package trie
 
diff --git a/go/gcexportdata/example_test.go b/go/gcexportdata/example_test.go
@@ -3,11 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build go1.7 && gc && !android && !ios && (unix || aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || plan9 || windows)
-// +build go1.7
-// +build gc
-// +build !android
-// +build !ios
-// +build unix aix darwin dragonfly freebsd linux netbsd openbsd solaris plan9 windows
 
 package gcexportdata_test
 
diff --git a/go/gcexportdata/main.go b/go/gcexportdata/main.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
-// +build ignore
 
 // The gcexportdata command is a diagnostic tool that displays the
 // contents of gc export data files.
diff --git a/go/internal/gccgoimporter/newInterface10.go b/go/internal/gccgoimporter/newInterface10.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !go1.11
-// +build !go1.11
 
 package gccgoimporter
 
diff --git a/go/internal/gccgoimporter/newInterface11.go b/go/internal/gccgoimporter/newInterface11.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build go1.11
-// +build go1.11
 
 package gccgoimporter
 
diff --git a/go/loader/loader_test.go b/go/loader/loader_test.go
@@ -5,7 +5,6 @@
 // No testdata on Android.
 
 //go:build !android
-// +build !android
 
 package loader_test
 
diff --git a/go/ssa/example_test.go b/go/ssa/example_test.go
@@ -3,9 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !android && !ios && (unix || aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || plan9 || windows)
-// +build !android
-// +build !ios
-// +build unix aix darwin dragonfly freebsd linux netbsd openbsd solaris plan9 windows
 
 package ssa_test
 
diff --git a/go/ssa/ssautil/switch_test.go b/go/ssa/ssautil/switch_test.go
@@ -5,7 +5,6 @@
 // No testdata on Android.
 
 //go:build !android
-// +build !android
 
 package ssautil_test
 
diff --git a/go/ssa/stdlib_test.go b/go/ssa/stdlib_test.go
@@ -5,7 +5,6 @@
 // Incomplete source tree on Android.
 
 //go:build !android
-// +build !android
 
 package ssa_test
 
diff --git a/godoc/godoc17_test.go b/godoc/godoc17_test.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build go1.7
-// +build go1.7
 
 package godoc
 
diff --git a/godoc/static/makestatic.go b/godoc/static/makestatic.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
-// +build ignore
 
 // Command makestatic writes the generated file buffer to "static.go".
 // It is intended to be invoked via "go generate" (directive in "gen.go").
diff --git a/godoc/vfs/fs.go b/godoc/vfs/fs.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build go1.16
-// +build go1.16
 
 package vfs
 
diff --git a/gopls/doc/assets/go.mod b/gopls/doc/assets/go.mod
@@ -4,4 +4,4 @@
 
 module golang.org/x/tools/gopls/doc/assets
 
-go 1.19
+go 1.23.0
diff --git a/internal/gcimporter/israce_test.go b/internal/gcimporter/israce_test.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build race
-// +build race
 
 package gcimporter_test
 
diff --git a/internal/imports/mkindex.go b/internal/imports/mkindex.go
@@ -1,5 +1,4 @@
 //go:build ignore
-// +build ignore
 
 // Copyright 2013 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/internal/jsonrpc2_v2/serve_go116.go b/internal/jsonrpc2_v2/serve_go116.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build go1.16
-// +build go1.16
 
 package jsonrpc2
 
diff --git a/internal/jsonrpc2_v2/serve_pre116.go b/internal/jsonrpc2_v2/serve_pre116.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !go1.16
-// +build !go1.16
 
 package jsonrpc2
 
diff --git a/internal/pprof/main.go b/internal/pprof/main.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
-// +build ignore
 
 // The pprof command prints the total time in a pprof profile provided
 // through the standard input.
diff --git a/internal/robustio/copyfiles.go b/internal/robustio/copyfiles.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
-// +build ignore
 
 // The copyfiles script copies the contents of the internal cmd/go robustio
 // package to the current directory, with adjustments to make it build.
diff --git a/internal/robustio/robustio_flaky.go b/internal/robustio/robustio_flaky.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build windows || darwin
-// +build windows darwin
 
 package robustio
 
diff --git a/internal/robustio/robustio_other.go b/internal/robustio/robustio_other.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !windows && !darwin
-// +build !windows,!darwin
 
 package robustio
 
diff --git a/internal/robustio/robustio_plan9.go b/internal/robustio/robustio_plan9.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build plan9
-// +build plan9
 
 package robustio
 
diff --git a/internal/robustio/robustio_posix.go b/internal/robustio/robustio_posix.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !windows && !plan9
-// +build !windows,!plan9
 
 package robustio
 
diff --git a/internal/stdlib/generate.go b/internal/stdlib/generate.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
-// +build ignore
 
 // The generate command reads all the GOROOT/api/go1.*.txt files and
 // generates a single combined manifest.go file containing the Go
diff --git a/internal/testenv/testenv_notunix.go b/internal/testenv/testenv_notunix.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !(unix || aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris)
-// +build !unix,!aix,!darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd,!solaris
 
 package testenv
 
diff --git a/internal/testenv/testenv_unix.go b/internal/testenv/testenv_unix.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build unix || aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build unix aix darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package testenv
 
diff --git a/internal/typeparams/copytermlist.go b/internal/typeparams/copytermlist.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
-// +build ignore
 
 // copytermlist.go copies the term list algorithm from GOROOT/src/go/types.
 
diff --git a/playground/socket/socket.go b/playground/socket/socket.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !appengine
-// +build !appengine
 
 // Package socket implements a WebSocket-based playground backend.
 // Clients connect to a websocket handler and send run/kill commands, and
diff --git a/refactor/eg/eg_test.go b/refactor/eg/eg_test.go
@@ -5,7 +5,6 @@
 // No testdata on Android.
 
 //go:build !android
-// +build !android
 
 package eg_test
 
diff --git a/refactor/importgraph/graph_test.go b/refactor/importgraph/graph_test.go
@@ -5,7 +5,6 @@
 // Incomplete std lib sources on Android.
 
 //go:build !android
-// +build !android
 
 package importgraph_test
 

Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,4 @@`
`4`	`4`
`5`	`5`	`module golang.org/x/tools/gopls/doc/assets`
`6`	`6`
`7`		`-go 1.19`
	`7`	`+go 1.23.0`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build ignore`
`2`		`-// +build ignore`
`3`	`2`
`4`	`3`	`// Copyright 2013 The Go Authors. All rights reserved.`
`5`	`4`	`// Use of this source code is governed by a BSD-style`