From 71f6a46884ab564cd242dadf6fa16f76fe0517dd Mon Sep 17 00:00:00 2001 From: Dmitri Shuralyov Date: Tue, 17 Oct 2023 13:55:35 -0400 Subject: [PATCH] cmd/bundle: drop old +build lines The +build to go:build syntax conversion has progressed enough that it's fine to write only the new syntax now. All supported (and many unsupported) Go releases understand it. For golang/go#41184. For golang/go#60268. Change-Id: I8c1600577a21f4c7c89123302ca976d881a69841 Reviewed-on: https://go-review.googlesource.com/c/tools/+/536075 Auto-Submit: Dmitri Shuralyov LUCI-TryBot-Result: Go LUCI Reviewed-by: Robert Findley Reviewed-by: Dmitri Shuralyov --- cmd/bundle/main.go | 1 - cmd/bundle/testdata/out.golden | 1 - 2 files changed, 2 deletions(-) diff --git a/cmd/bundle/main.go b/cmd/bundle/main.go index a5c426d8f88..fa73eb83a0a 100644 --- a/cmd/bundle/main.go +++ b/cmd/bundle/main.go @@ -228,7 +228,6 @@ func bundle(src, dst, dstpkg, prefix, buildTags string) ([]byte, error) { var out bytes.Buffer if buildTags != "" { fmt.Fprintf(&out, "//go:build %s\n", buildTags) - fmt.Fprintf(&out, "// +build %s\n\n", buildTags) } fmt.Fprintf(&out, "// Code generated by golang.org/x/tools/cmd/bundle. DO NOT EDIT.\n") diff --git a/cmd/bundle/testdata/out.golden b/cmd/bundle/testdata/out.golden index a8f0cfeb280..c6f536e643e 100644 --- a/cmd/bundle/testdata/out.golden +++ b/cmd/bundle/testdata/out.golden @@ -1,5 +1,4 @@ //go:build tag -// +build tag // Code generated by golang.org/x/tools/cmd/bundle. DO NOT EDIT. // $ bundle