From: Alan Donovan Date: Thu, 11 Sep 2025 17:40:24 +0000 (-0400) Subject: cmd/go/internal/work: remove deps[1]="fmt" vet hack X-Git-Tag: go1.26rc1~897 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=84e9ab3984;p=gostls13.git cmd/go/internal/work: remove deps[1]="fmt" vet hack The Builder.vet operation has not needed an artificial dependency on the fmt package since CL 176439 in 2019. Remove it now. Change-Id: I398a6d2d57175c12843520d9f19ffd023e676123 Reviewed-on: https://go-review.googlesource.com/c/go/+/702856 Auto-Submit: Alan Donovan Reviewed-by: Michael Matloob Reviewed-by: Michael Matloob LUCI-TryBot-Result: Go LUCI --- diff --git a/src/cmd/go/internal/work/action.go b/src/cmd/go/internal/work/action.go index 2030f8cb04..bbd2245844 100644 --- a/src/cmd/go/internal/work/action.go +++ b/src/cmd/go/internal/work/action.go @@ -716,25 +716,15 @@ func (b *Builder) vetAction(mode, depMode BuildMode, p *load.Package) *Action { a := b.cacheAction("vet", p, func() *Action { a1 := b.CompileAction(mode|ModeVetOnly, depMode, p) - // vet expects to be able to import "fmt". - var stk load.ImportStack - stk.Push(load.NewImportInfo("vet", nil)) - p1, err := load.LoadImportWithFlags("fmt", p.Dir, p, &stk, nil, 0) - if err != nil { - base.Fatalf("unexpected error loading fmt package from package %s: %v", p.ImportPath, err) - } - stk.Pop() - aFmt := b.CompileAction(ModeBuild, depMode, p1) - var deps []*Action if a1.buggyInstall { - // (*Builder).vet expects deps[0] to be the package - // and deps[1] to be "fmt". If we see buggyInstall + // (*Builder).vet expects deps[0] to be the package. + // If we see buggyInstall // here then a1 is an install of a shared library, // and the real package is a1.Deps[0]. - deps = []*Action{a1.Deps[0], aFmt, a1} + deps = []*Action{a1.Deps[0], a1} } else { - deps = []*Action{a1, aFmt} + deps = []*Action{a1} } for _, p1 := range p.Internal.Imports { deps = append(deps, b.vetAction(mode, depMode, p1)) diff --git a/src/cmd/go/internal/work/exec.go b/src/cmd/go/internal/work/exec.go index a49268cba2..6e3ad00e05 100644 --- a/src/cmd/go/internal/work/exec.go +++ b/src/cmd/go/internal/work/exec.go @@ -1306,7 +1306,6 @@ var VetExplicit bool func (b *Builder) vet(ctx context.Context, a *Action) error { // a.Deps[0] is the build of the package being vetted. - // a.Deps[1] is the build of the "fmt" package. a.Failed = nil // vet of dependency may have failed but we can still succeed