Skip to content

Commit 5cd1683

Browse files
AkihiroSudagopherbot
authored andcommitted
all: update to x/tools@55fb96f
This brings in CL 765402 etc. For #73878 Change-Id: I9ef50fc6bb9beb26e4e3389a49fbc699513884e3 GitHub-Last-Rev: a7bdfea GitHub-Pull-Request: #78744 Reviewed-on: https://go-review.googlesource.com/c/go/+/766880 LUCI-TryBot-Result: golang-scoped@luci-project-accounts.iam.gserviceaccount.com <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: Alan Donovan <adonovan@google.com> Auto-Submit: Alan Donovan <adonovan@google.com> Reviewed-by: David Chase <drchase@google.com>
1 parent dd8efe4 commit 5cd1683

12 files changed

Lines changed: 109 additions & 68 deletions

File tree

src/cmd/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ require (
66
github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83
77
golang.org/x/arch v0.23.1-0.20260109160903-657d90bd6695
88
golang.org/x/build v0.0.0-20260122183339-3ba88df37c64
9-
golang.org/x/mod v0.34.0
9+
golang.org/x/mod v0.35.0
1010
golang.org/x/sync v0.20.0
1111
golang.org/x/sys v0.43.0
12-
golang.org/x/telemetry v0.0.0-20260311193753-579e4da9a98c
12+
golang.org/x/telemetry v0.0.0-20260409153401-be6f6cb8b1fa
1313
golang.org/x/term v0.39.0
14-
golang.org/x/tools v0.43.1-0.20260407202037-f6476fbaabd3
14+
golang.org/x/tools v0.44.1-0.20260414062052-55fb96ff894f
1515
)
1616

1717
require (

src/cmd/go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@ golang.org/x/arch v0.23.1-0.20260109160903-657d90bd6695 h1:q45HsUyFzBjBk4mHGgUew
1010
golang.org/x/arch v0.23.1-0.20260109160903-657d90bd6695/go.mod h1:dNHoOeKiyja7GTvF9NJS1l3Z2yntpQNzgrjh1cU103A=
1111
golang.org/x/build v0.0.0-20260122183339-3ba88df37c64 h1:BNhBATNmH/VtzGolB+ksQPPvn6ZyffiR8TmKenqNo+A=
1212
golang.org/x/build v0.0.0-20260122183339-3ba88df37c64/go.mod h1:3QmSbNil8ZWqC94m80Glej1v8b92gYzPIQPTtSa0c+4=
13-
golang.org/x/mod v0.34.0 h1:xIHgNUUnW6sYkcM5Jleh05DvLOtwc6RitGHbDk4akRI=
14-
golang.org/x/mod v0.34.0/go.mod h1:ykgH52iCZe79kzLLMhyCUzhMci+nQj+0XkbXpNYtVjY=
13+
golang.org/x/mod v0.35.0 h1:Ww1D637e6Pg+Zb2KrWfHQUnH2dQRLBQyAtpr/haaJeM=
14+
golang.org/x/mod v0.35.0/go.mod h1:+GwiRhIInF8wPm+4AoT6L0FA1QWAad3OMdTRx4tFYlU=
1515
golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
1616
golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
1717
golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI=
1818
golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
19-
golang.org/x/telemetry v0.0.0-20260311193753-579e4da9a98c h1:6a8FdnNk6bTXBjR4AGKFgUKuo+7GnR3FX5L7CbveeZc=
20-
golang.org/x/telemetry v0.0.0-20260311193753-579e4da9a98c/go.mod h1:TpUTTEp9frx7rTdLpC9gFG9kdI7zVLFTFFlqaH2Cncw=
19+
golang.org/x/telemetry v0.0.0-20260409153401-be6f6cb8b1fa h1:efT73AJZfAAUV7SOip6pWGkwJDzIGiKBZGVzHYa+ve4=
20+
golang.org/x/telemetry v0.0.0-20260409153401-be6f6cb8b1fa/go.mod h1:kHjTxDEnAu6/Nl9lDkzjWpR+bmKfxeiRuSDlsMb70gE=
2121
golang.org/x/term v0.39.0 h1:RclSuaJf32jOqZz74CkPA9qFuVTX7vhLlpfj/IGWlqY=
2222
golang.org/x/term v0.39.0/go.mod h1:yxzUCTP/U+FzoxfdKmLaA0RV1WgE0VY7hXBwKtY/4ww=
2323
golang.org/x/text v0.36.0 h1:JfKh3XmcRPqZPKevfXVpI1wXPTqbkE5f7JA92a55Yxg=
2424
golang.org/x/text v0.36.0/go.mod h1:NIdBknypM8iqVmPiuco0Dh6P5Jcdk8lJL0CUebqK164=
25-
golang.org/x/tools v0.43.1-0.20260407202037-f6476fbaabd3 h1:kKxxg32Xl95dav6werhfwQpDWpSGWR4G43Dj1bkDqlQ=
26-
golang.org/x/tools v0.43.1-0.20260407202037-f6476fbaabd3/go.mod h1:uHkMso649BX2cZK6+RpuIPXS3ho2hZo4FVwfoy1vIk0=
25+
golang.org/x/tools v0.44.1-0.20260414062052-55fb96ff894f h1:OsDhJTPRMdqueEUhZ6K1sdC07K6rj9i4RYTQGF6zSHA=
26+
golang.org/x/tools v0.44.1-0.20260414062052-55fb96ff894f/go.mod h1:KA0AfVErSdxRZIsOVipbv3rQhVXTnlU6UhKxHd1seDI=
2727
rsc.io/markdown v0.0.0-20240306144322-0bf8f97ee8ef h1:mqLYrXCXYEZOop9/Dbo6RPX11539nwiCNBb1icVPmw8=
2828
rsc.io/markdown v0.0.0-20240306144322-0bf8f97ee8ef/go.mod h1:8xcPgWmwlZONN1D9bjxtHEjrUtSEa3fakVF8iaewYKQ=

src/cmd/go/internal/work/exec.go

Lines changed: 36 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,15 @@ import (
3939
"cmd/go/internal/fsys"
4040
"cmd/go/internal/gover"
4141
"cmd/go/internal/load"
42+
"cmd/go/internal/modinfo"
4243
"cmd/go/internal/modload"
4344
"cmd/go/internal/str"
4445
"cmd/go/internal/trace"
4546
"cmd/internal/buildid"
4647
"cmd/internal/quoted"
4748
"cmd/internal/sys"
49+
50+
"golang.org/x/tools/go/analysis"
4851
)
4952

5053
const DefaultCFlags = "-O2 -g"
@@ -1190,21 +1193,42 @@ type vetConfig struct {
11901193
NonGoFiles []string // absolute paths to package non-Go files
11911194
IgnoredFiles []string // absolute paths to ignored source files
11921195

1193-
ModulePath string // module path (may be "" on module error)
1194-
ModuleVersion string // module version (may be "" on main module or module error)
1195-
ImportMap map[string]string // map import path in source code to package path
1196-
PackageFile map[string]string // map package path to .a file with export data
1197-
Standard map[string]bool // map package path to whether it's in the standard library
1198-
PackageVetx map[string]string // map package path to vetx data from earlier vet run
1199-
VetxOnly bool // only compute vetx data; don't report detected problems
1200-
VetxOutput string // write vetx data to this output file
1201-
Stdout string // write stdout (JSON, unified diff) to this output file
1202-
GoVersion string // Go version for package
1203-
FixArchive string // write fixed files to this zip archive, if non-empty
1196+
Module *analysis.Module // module information, if any
1197+
ImportMap map[string]string // map import path in source code to package path
1198+
PackageFile map[string]string // map package path to .a file with export data
1199+
Standard map[string]bool // map package path to whether it's in the standard library
1200+
PackageVetx map[string]string // map package path to vetx data from earlier vet run
1201+
VetxOnly bool // only compute vetx data; don't report detected problems
1202+
VetxOutput string // write vetx data to this output file
1203+
Stdout string // write stdout (JSON, unified diff) to this output file
1204+
GoVersion string // Go version for package
1205+
FixArchive string // write fixed files to this zip archive, if non-empty
12041206

12051207
SucceedOnTypecheckFailure bool // awful hack; see #18395 and below
12061208
}
12071209

1210+
// analysisModuleFromModulePublic converts a modinfo.ModulePublic to a analysis.Module.
1211+
func analysisModuleFromModulePublic(m *modinfo.ModulePublic) *analysis.Module {
1212+
if m == nil {
1213+
return nil
1214+
}
1215+
vm := &analysis.Module{
1216+
Path: m.Path,
1217+
Version: m.Version,
1218+
Replace: analysisModuleFromModulePublic(m.Replace),
1219+
Time: m.Time,
1220+
Main: m.Main,
1221+
Indirect: m.Indirect,
1222+
Dir: m.Dir,
1223+
GoMod: m.GoMod,
1224+
GoVersion: m.GoVersion,
1225+
}
1226+
if m.Error != nil {
1227+
vm.Error = &analysis.ModuleError{Err: m.Error.Err}
1228+
}
1229+
return vm
1230+
}
1231+
12081232
func buildVetConfig(a *Action, srcfiles []string, vetDeps []*Action) {
12091233
// Classify files based on .go extension.
12101234
// srcfiles does not include raw cgo files.
@@ -1242,11 +1266,7 @@ func buildVetConfig(a *Action, srcfiles []string, vetDeps []*Action) {
12421266
v = gover.DefaultGoModVersion
12431267
}
12441268
vcfg.GoVersion = "go" + v
1245-
1246-
if a.Package.Module.Error == nil {
1247-
vcfg.ModulePath = a.Package.Module.Path
1248-
vcfg.ModuleVersion = a.Package.Module.Version
1249-
}
1269+
vcfg.Module = analysisModuleFromModulePublic(a.Package.Module)
12501270
}
12511271
a.vetCfg = vcfg
12521272
for i, raw := range a.Package.Internal.RawImports {

src/cmd/vendor/golang.org/x/tools/go/analysis/passes/httpresponse/httpresponse.go

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/cmd/vendor/golang.org/x/tools/go/analysis/passes/modernize/modernize.go

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/cmd/vendor/golang.org/x/tools/go/analysis/passes/modernize/rangeint.go

Lines changed: 32 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/cmd/vendor/golang.org/x/tools/go/analysis/passes/modernize/unsafefuncs.go

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/cmd/vendor/golang.org/x/tools/go/analysis/unitchecker/unitchecker.go

Lines changed: 11 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/cmd/vendor/golang.org/x/tools/internal/bisect/bisect.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/cmd/vendor/golang.org/x/tools/internal/refactor/inline/inline.go

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)