[go] cmd: update to x/tools@4df13e3
2 views
Skip to first unread message
Alan Donovan (Gerrit)
Sep 26, 2025, 1:05:31 PMSep 26
to goph...@pubsubhelper.golang.org, golang-co...@googlegroups.com
Alan Donovan has uploaded the change for review![]( "Open in Gerrit")
Commit message
cmd: update to x/tools@4df13e3
go get golang.org/x/tools@master
go mod tidy
go mod vendor
This will enable use of modernize and inline.
On branch revendor
Changes not staged for commit:
modified: go.mod
modified: go.s
Change-Id: I6348dd97ec2c41437b3ca899ed91f10815f2fe26
Change diff
diff --git a/src/cmd/go.mod b/src/cmd/go.mod
index 017883a..b8ec066 100644
--- a/src/cmd/go.mod
+++ b/src/cmd/go.mod
@@ -11,7 +11,7 @@
golang.org/x/sys v0.36.0
golang.org/x/telemetry v0.0.0-20250908211612-aef8a434d053
golang.org/x/term v0.34.0
- golang.org/x/tools v0.37.1-0.20250924232827-4df13e317ce4
+ golang.org/x/tools v0.37.1-0.20250926142134-e90843045cbb
)
require (
diff --git a/src/cmd/go.sum b/src/cmd/go.sum
index 0906ffc..da94abb 100644
--- a/src/cmd/go.sum
+++ b/src/cmd/go.sum
@@ -22,7 +22,7 @@
golang.org/x/term v0.34.0/go.mod h1:5jC53AEywhIVebHgPVeg0mj8OD3VO9OzclacVrqpaAw=
golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk=
golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4=
-golang.org/x/tools v0.37.1-0.20250924232827-4df13e317ce4 h1:IcXDtHggZZo+GzNzvVRPyNFLnOc2/Z1gg3ZVIWF2uCU=
-golang.org/x/tools v0.37.1-0.20250924232827-4df13e317ce4/go.mod h1:MBN5QPQtLMHVdvsbtarmTNukZDdgwdwlO5qGacAzF0w=
+golang.org/x/tools v0.37.1-0.20250926142134-e90843045cbb h1:Ot2mS7bIzGm604crIWkHNcDm9l6GFM67+XMo/us4gkw=
+golang.org/x/tools v0.37.1-0.20250926142134-e90843045cbb/go.mod h1:MBN5QPQtLMHVdvsbtarmTNukZDdgwdwlO5qGacAzF0w=
rsc.io/markdown v0.0.0-20240306144322-0bf8f97ee8ef h1:mqLYrXCXYEZOop9/Dbo6RPX11539nwiCNBb1icVPmw8=
rsc.io/markdown v0.0.0-20240306144322-0bf8f97ee8ef/go.mod h1:8xcPgWmwlZONN1D9bjxtHEjrUtSEa3fakVF8iaewYKQ=
diff --git a/src/cmd/vendor/golang.org/x/tools/go/analysis/passes/buildtag/buildtag.go b/src/cmd/vendor/golang.org/x/tools/go/analysis/passes/buildtag/buildtag.go
index 6e32f29..91aac67 100644
--- a/src/cmd/vendor/golang.org/x/tools/go/analysis/passes/buildtag/buildtag.go
+++ b/src/cmd/vendor/golang.org/x/tools/go/analysis/passes/buildtag/buildtag.go
@@ -15,6 +15,8 @@
"golang.org/x/tools/go/analysis"
"golang.org/x/tools/go/analysis/passes/internal/analysisutil"
+ "golang.org/x/tools/internal/analysisinternal"
+ "golang.org/x/tools/internal/versions"
)
const Doc = "check //go:build and // +build directives"
@@ -55,7 +57,6 @@
func checkGoFile(pass *analysis.Pass, f *ast.File) {
var check checker
check.init(pass)
- defer check.finish()
for _, group := range f.Comments {
// A +build comment is ignored after or adjoining the package declaration.
@@ -77,6 +78,27 @@
check.comment(c.Slash, c.Text)
}
}
+
+ check.finish()
+
+ // For Go 1.18+ files, offer a fix to remove the +build lines
+ // if they passed all consistency checks.
+ if check.crossCheck && !versions.Before(pass.TypesInfo.FileVersions[f], "go1.18") {
+ for _, rng := range check.plusBuildRanges {
+ check.pass.Report(analysis.Diagnostic{
+ Pos: rng.Pos(),
+ End: rng.End(),
+ Message: "+build line is no longer needed",
+ SuggestedFixes: []analysis.SuggestedFix{{
+ Message: "Remove obsolete +build line",
+ TextEdits: []analysis.TextEdit{{
+ Pos: rng.Pos(),
+ End: rng.End(),
+ }},
+ }},
+ })
+ }
+ }
}
func checkOtherFile(pass *analysis.Pass, filename string) error {
@@ -96,15 +118,15 @@
}
type checker struct {
- pass *analysis.Pass
- plusBuildOK bool // "+build" lines still OK
- goBuildOK bool // "go:build" lines still OK
- crossCheck bool // cross-check go:build and +build lines when done reading file
- inStar bool // currently in a /* */ comment
- goBuildPos token.Pos // position of first go:build line found
- plusBuildPos token.Pos // position of first "+build" line found
- goBuild constraint.Expr // go:build constraint found
- plusBuild constraint.Expr // AND of +build constraints found
+ pass *analysis.Pass
+ plusBuildOK bool // "+build" lines still OK
+ goBuildOK bool // "go:build" lines still OK
+ crossCheck bool // cross-check go:build and +build lines when done reading file
+ inStar bool // currently in a /* */ comment
+ goBuildPos token.Pos // position of first go:build line found
+ plusBuildRanges []analysis.Range // range of each "+build" line found
+ goBuild constraint.Expr // go:build constraint found
+ plusBuild constraint.Expr // AND of +build constraints found
}
func (check *checker) init(pass *analysis.Pass) {
@@ -272,6 +294,8 @@
}
func (check *checker) plusBuildLine(pos token.Pos, line string) {
+ plusBuildRange := analysisinternal.Range(pos, pos+token.Pos(len(line)))
+
line = strings.TrimSpace(line)
if !constraint.IsPlusBuild(line) {
// Comment with +build but not at beginning.
@@ -286,9 +310,7 @@
check.crossCheck = false
}
- if check.plusBuildPos == token.NoPos {
- check.plusBuildPos = pos
- }
+ check.plusBuildRanges = append(check.plusBuildRanges, plusBuildRange)
// testing hack: stop at // ERROR
if i := strings.Index(line, " // ERROR "); i >= 0 {
@@ -336,19 +358,19 @@
}
func (check *checker) finish() {
- if !check.crossCheck || check.plusBuildPos == token.NoPos || check.goBuildPos == token.NoPos {
+ if !check.crossCheck || len(check.plusBuildRanges) == 0 || check.goBuildPos == token.NoPos {
return
}
// Have both //go:build and // +build,
// with no errors found (crossCheck still true).
// Check they match.
- var want constraint.Expr
lines, err := constraint.PlusBuildLines(check.goBuild)
if err != nil {
check.pass.Reportf(check.goBuildPos, "%v", err)
return
}
+ var want constraint.Expr
for _, line := range lines {
y, err := constraint.Parse(line)
if err != nil {
@@ -363,7 +385,8 @@
}
}
if want.String() != check.plusBuild.String() {
- check.pass.Reportf(check.plusBuildPos, "+build lines do not match //go:build condition")
+ check.pass.ReportRangef(check.plusBuildRanges[0], "+build lines do not match //go:build condition")
+ check.crossCheck = false // don't offer fix to remove +build
return
}
}
diff --git a/src/cmd/vendor/modules.txt b/src/cmd/vendor/modules.txt
index 1332713..8203a31 100644
--- a/src/cmd/vendor/modules.txt
+++ b/src/cmd/vendor/modules.txt
@@ -73,7 +73,7 @@
golang.org/x/text/language
golang.org/x/text/transform
golang.org/x/text/unicode/norm
-# golang.org/x/tools v0.37.1-0.20250924232827-4df13e317ce4
+# golang.org/x/tools v0.37.1-0.20250926142134-e90843045cbb
## explicit; go 1.24.0
golang.org/x/tools/cmd/bisect
golang.org/x/tools/cover
Change information
Files:
- M src/cmd/go.mod
- M src/cmd/go.sum
- M src/cmd/vendor/golang.org/x/tools/go/analysis/passes/buildtag/buildtag.go
- M src/cmd/vendor/modules.txt
Change size: M
Delta: 4 files changed, 43 insertions(+), 20 deletions(-)
Related details
Attention set is empty
Submit Requirements:
Code-Review
No-Unresolved-Comments
Review-Enforcement
TryBots-Pass
| Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings. |
Alan Donovan (Gerrit)
Sep 26, 2025, 1:05:49 PMSep 26
to goph...@pubsubhelper.golang.org, Robert Findley, Dmitri Shuralyov, Go LUCI, golang-co...@googlegroups.com
Attention needed from Robert Findley
Alan Donovan voted Auto-Submit+1![]( "Open in Gerrit")
Submit Requirements:
Code-Review
No-Unresolved-Comments
Review-Enforcement
TryBots-Pass
| Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings. |
Alan Donovan (Gerrit)
Sep 26, 2025, 1:06:06 PMSep 26
to goph...@pubsubhelper.golang.org, golang-co...@googlegroups.com
Attention needed from Alan Donovan and Robert Findley
Alan Donovan uploaded new patchset![]( "Open in Gerrit")
Attention is currently required from:
- Alan Donovan
- Robert Findley
Submit Requirements:
Code-Review
No-Unresolved-Comments
Review-Enforcement
TryBots-Pass
| Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings. |
Alan Donovan (Gerrit)
Sep 26, 2025, 1:08:15 PMSep 26
to goph...@pubsubhelper.golang.org, golang-co...@googlegroups.com
Attention needed from Alan Donovan and Robert Findley
Alan Donovan uploaded new patchset![]( "Open in Gerrit")
Alan Donovan uploaded patch set #3 to this change.
Related details
Attention is currently required from:
- Alan Donovan
- Robert Findley
Submit Requirements:
Code-Review
No-Unresolved-Comments
Review-Enforcement
TryBots-Pass
| Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings. |
Robert Findley (Gerrit)
Sep 29, 2025, 1:23:34 PMSep 29
to Alan Donovan, goph...@pubsubhelper.golang.org, Go LUCI, Dmitri Shuralyov, golang-co...@googlegroups.com
Attention needed from Alan Donovan
Robert Findley added 1 comment![]( "Open in Gerrit")
Patchset-level comments
File-level comment, Patchset 3 (Latest):
Robert Findley . resolved
Thanks. Will review when trybot failures are sorted.
Related details
Attention is currently required from:
- Alan Donovan
Submit Requirements:
Code-Review
No-Unresolved-Comments
Review-Enforcement
TryBots-Pass
| Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings. |
Alan Donovan (Gerrit)
3:48 PM (8 hours ago) 3:48 PM
to goph...@pubsubhelper.golang.org, golang-co...@googlegroups.com
Attention needed from Alan Donovan
Alan Donovan uploaded new patchset![]( "Open in Gerrit")
Alan Donovan uploaded patch set #4 to this change.
Following approvals got outdated and were removed:
- TryBots-Pass: LUCI-TryBot-Result-1 by Go LUCI
Related details
Attention is currently required from:
- Alan Donovan
Submit Requirements:
Code-Review
No-Unresolved-Comments
Review-Enforcement
TryBots-Pass
| Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings. |
Alan Donovan (Gerrit)
3:48 PM (8 hours ago) 3:48 PM
to goph...@pubsubhelper.golang.org, Michael Matloob, Robert Findley, Go LUCI, Dmitri Shuralyov, golang-co...@googlegroups.com
Attention needed from Michael Matloob
Alan Donovan added 1 comment![]( "Open in Gerrit")
Patchset-level comments
File-level comment, Patchset 4 (Latest):
Alan Donovan . resolved
This patchset includes the reversion of the buildtag checker that was breaking tests before.
Related details
Attention is currently required from:
- Michael Matloob
Submit Requirements:
Code-Review
No-Unresolved-Comments
Review-Enforcement
TryBots-Pass
| Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings. |
Alan Donovan (Gerrit)
3:53 PM (8 hours ago) 3:53 PM
to goph...@pubsubhelper.golang.org, golang-co...@googlegroups.com
Attention needed from Alan Donovan and Michael Matloob
Alan Donovan uploaded new patchset![]( "Open in Gerrit")
Attention is currently required from:
- Alan Donovan
- Michael Matloob
Submit Requirements:
Code-Review
No-Unresolved-Comments
Review-Enforcement
TryBots-Pass
| Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings. |
Alan Donovan (Gerrit)
3:54 PM (8 hours ago) 3:54 PM
to goph...@pubsubhelper.golang.org, Go LUCI, Michael Matloob, Robert Findley, Dmitri Shuralyov, golang-co...@googlegroups.com
Attention needed from Michael Matloob
Alan Donovan voted and added 1 comment![]( "Open in Gerrit")
Votes added by Alan Donovan
| Auto-Submit | +1 |
Alan Donovan . resolved
This patchset includes the reversion of the buildtag checker that was breaking tests before.
Attention is currently required from:
- Michael Matloob
Submit Requirements:
Code-Review
No-Unresolved-Comments
Review-Enforcement
TryBots-Pass
| Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings. |
Alan Donovan (Gerrit)
3:56 PM (8 hours ago) 3:56 PM
to goph...@pubsubhelper.golang.org, golang-co...@googlegroups.com
Attention needed from Alan Donovan and Michael Matloob
Alan Donovan uploaded new patchset![]( "Open in Gerrit")
Attention is currently required from:
- Alan Donovan
- Michael Matloob
Submit Requirements:
Code-Review
No-Unresolved-Comments
Review-Enforcement
TryBots-Pass
| Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings. |
Alan Donovan (Gerrit)
3:59 PM (8 hours ago) 3:59 PM
to goph...@pubsubhelper.golang.org, golang-co...@googlegroups.com
Attention needed from Alan Donovan and Michael Matloob
Alan Donovan uploaded new patchset![]( "Open in Gerrit")
Alan Donovan uploaded patch set #7 to this change.
Related details
Attention is currently required from:
- Alan Donovan
- Michael Matloob
Submit Requirements:
Code-Review
No-Unresolved-Comments
Review-Enforcement
TryBots-Pass
| Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings. |
Alan Donovan (Gerrit)
4:09 PM (8 hours ago) 4:09 PM
to goph...@pubsubhelper.golang.org, golang-co...@googlegroups.com
Attention needed from Alan Donovan and Michael Matloob
Alan Donovan uploaded new patchset![]( "Open in Gerrit")
Alan Donovan uploaded patch set #8 to this change.
Following approvals got outdated and were removed:
- TryBots-Pass: LUCI-TryBot-Result-1 by Go LUCI
Related details
Attention is currently required from:
- Alan Donovan
- Michael Matloob
Submit Requirements:
Code-Review
No-Unresolved-Comments
Review-Enforcement
TryBots-Pass
| Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings. |
Michael Matloob (Gerrit)
4:12 PM (8 hours ago) 4:12 PM
to Alan Donovan, goph...@pubsubhelper.golang.org, Go LUCI, Robert Findley, Dmitri Shuralyov, golang-co...@googlegroups.com
Attention needed from Alan Donovan
Michael Matloob voted and added 1 comment![]( "Open in Gerrit")
Votes added by Michael Matloob
| Code-Review | +2 |
1 comment
Commit Message
Line 7, Patchset 8 (Latest):
cmd: update to x/tools@7d9453ccMichael Matloob . unresolved
i think we should mention that we also vendored into std for consistency since that required an additional command
Related details
Attention is currently required from:
- Alan Donovan
Submit Requirements:
Code-Review
No-Unresolved-Comments
Review-Enforcement
TryBots-Pass
| Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings. |
Michael Matloob (Gerrit)
4:13 PM (8 hours ago) 4:13 PM
to Alan Donovan, goph...@pubsubhelper.golang.org, Michael Matloob, Go LUCI, Robert Findley, Dmitri Shuralyov, golang-co...@googlegroups.com
Attention needed from Alan Donovan
Michael Matloob voted Code-Review+1![]( "Open in Gerrit")
| Code-Review | +1 |
Related details
Attention is currently required from:
- Alan Donovan
Submit Requirements:
Code-Review
No-Unresolved-Comments
Review-Enforcement
TryBots-Pass
| Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings. |
Alan Donovan (Gerrit)
4:15 PM (8 hours ago) 4:15 PM
to goph...@pubsubhelper.golang.org, golang-co...@googlegroups.com
Attention needed from Alan Donovan
Alan Donovan uploaded new patchset![]( "Open in Gerrit")
Alan Donovan uploaded patch set #9 to this change.
Related details
Attention is currently required from:
- Alan Donovan
Submit Requirements:
Code-Review
No-Unresolved-Comments
Review-Enforcement
TryBots-Pass
| Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings. |
Alan Donovan (Gerrit)
4:15 PM (8 hours ago) 4:15 PM
to goph...@pubsubhelper.golang.org, Go LUCI, Michael Matloob, Michael Matloob, Robert Findley, Dmitri Shuralyov, golang-co...@googlegroups.com
Alan Donovan voted and added 1 comment![]( "Open in Gerrit")
Votes added by Alan Donovan
| Auto-Submit | +1 |
| Commit-Queue | +1 |
i think we should mention that we also vendored into std for consistency since that required an additional command
Alan Donovan
Done
Related details
Attention set is empty
Submit Requirements:
Code-Review
No-Unresolved-Comments
Review-Enforcement
TryBots-Pass
| Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings. |
Alan Donovan (Gerrit)
4:29 PM (7 hours ago) 4:29 PM
to goph...@pubsubhelper.golang.org, golang-co...@googlegroups.com
Attention needed from Alan Donovan
Alan Donovan uploaded new patchset![]( "Open in Gerrit")
Alan Donovan uploaded patch set #10 to this change.
Following approvals got outdated and were removed:
- TryBots-Pass: LUCI-TryBot-Result-1 by Go LUCI
Related details
Attention is currently required from:
- Alan Donovan
Submit Requirements:
Code-Review
No-Unresolved-Comments
Review-Enforcement
TryBots-Pass
| Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings. |
Alan Donovan (Gerrit)
4:34 PM (7 hours ago) 4:34 PM
to goph...@pubsubhelper.golang.org, golang-co...@googlegroups.com
Attention needed from Alan Donovan, Michael Matloob and Michael Matloob
Alan Donovan uploaded new patchset![]( "Open in Gerrit")
Alan Donovan uploaded patch set #11 to this change.
Following approvals got outdated and were removed:
Attention is currently required from:
- Alan Donovan
- Michael Matloob
- Michael Matloob
Submit Requirements:
Code-Review
No-Unresolved-Comments
Review-Enforcement
TryBots-Pass
| Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings. |
Alan Donovan (Gerrit)
4:34 PM (7 hours ago) 4:34 PM
to goph...@pubsubhelper.golang.org, Go LUCI, Michael Matloob, Michael Matloob, Robert Findley, Dmitri Shuralyov, golang-co...@googlegroups.com
Attention needed from Michael Matloob and Michael Matloob
Alan Donovan voted and added 1 comment![]( "Open in Gerrit")
Votes added by Alan Donovan
| Commit-Queue | +1 |
1 comment
Patchset-level comments
File-level comment, Patchset 10:
Alan Donovan . resolved
Sorry for the noise... why is vendoring always such a pain in the arse?
Related details
Attention is currently required from:
- Michael Matloob
- Michael Matloob
Submit Requirements:
Code-Review
No-Unresolved-Comments
Review-Enforcement
TryBots-Pass
| Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings. |
Alan Donovan (Gerrit)
4:54 PM (7 hours ago) 4:54 PM
to goph...@pubsubhelper.golang.org, Go LUCI, Michael Matloob, Michael Matloob, Robert Findley, Dmitri Shuralyov, golang-co...@googlegroups.com
Attention needed from Michael Matloob and Michael Matloob
Alan Donovan voted and added 1 comment![]( "Open in Gerrit")
Votes added by Alan Donovan
| Auto-Submit | +1 |
| Commit-Queue | +1 |
1 comment
Patchset-level comments
File-level comment, Patchset 11 (Latest):
Alan Donovan . resolved
The StandaloneFiles test failure is spurious; see CL 712182.
Related details
Attention is currently required from:
- Michael Matloob
- Michael Matloob
Submit Requirements:
Code-Review
No-Unresolved-Comments
Review-Enforcement
TryBots-Pass
| Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings. |
Alan Donovan (Gerrit)
5:30 PM (6 hours ago) 5:30 PM
to goph...@pubsubhelper.golang.org, Go LUCI, Michael Matloob, Michael Matloob, Robert Findley, Dmitri Shuralyov, golang-co...@googlegroups.com
Attention needed from Michael Matloob and Michael Matloob
Alan Donovan voted Auto-Submit+1![]( "Open in Gerrit")
| Auto-Submit | +1 |
Related details
Attention is currently required from:
- Michael Matloob
- Michael Matloob
Submit Requirements:
Code-Review
No-Unresolved-Comments
Review-Enforcement
TryBots-Pass
| Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings. |
Reply all
Reply to author
Forward
0 new messages