Skip to content

Commit 84e9ab3

Browse files
adonovangopherbot
authored andcommitted
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 <[email protected]> Reviewed-by: Michael Matloob <[email protected]> Reviewed-by: Michael Matloob <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]>
1 parent cf5e993 commit 84e9ab3

File tree

2 files changed

+4
-15
lines changed

2 files changed

+4
-15
lines changed

src/cmd/go/internal/work/action.go

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -716,25 +716,15 @@ func (b *Builder) vetAction(mode, depMode BuildMode, p *load.Package) *Action {
716716
a := b.cacheAction("vet", p, func() *Action {
717717
a1 := b.CompileAction(mode|ModeVetOnly, depMode, p)
718718

719-
// vet expects to be able to import "fmt".
720-
var stk load.ImportStack
721-
stk.Push(load.NewImportInfo("vet", nil))
722-
p1, err := load.LoadImportWithFlags("fmt", p.Dir, p, &stk, nil, 0)
723-
if err != nil {
724-
base.Fatalf("unexpected error loading fmt package from package %s: %v", p.ImportPath, err)
725-
}
726-
stk.Pop()
727-
aFmt := b.CompileAction(ModeBuild, depMode, p1)
728-
729719
var deps []*Action
730720
if a1.buggyInstall {
731-
// (*Builder).vet expects deps[0] to be the package
732-
// and deps[1] to be "fmt". If we see buggyInstall
721+
// (*Builder).vet expects deps[0] to be the package.
722+
// If we see buggyInstall
733723
// here then a1 is an install of a shared library,
734724
// and the real package is a1.Deps[0].
735-
deps = []*Action{a1.Deps[0], aFmt, a1}
725+
deps = []*Action{a1.Deps[0], a1}
736726
} else {
737-
deps = []*Action{a1, aFmt}
727+
deps = []*Action{a1}
738728
}
739729
for _, p1 := range p.Internal.Imports {
740730
deps = append(deps, b.vetAction(mode, depMode, p1))

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1306,7 +1306,6 @@ var VetExplicit bool
13061306

13071307
func (b *Builder) vet(ctx context.Context, a *Action) error {
13081308
// a.Deps[0] is the build of the package being vetted.
1309-
// a.Deps[1] is the build of the "fmt" package.
13101309

13111310
a.Failed = nil // vet of dependency may have failed but we can still succeed
13121311

0 commit comments

Comments
 (0)