diff options
| author | Russ Cox <rsc@golang.org> | 2021-08-25 12:48:26 -0400 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2021-10-28 18:17:57 +0000 |
| commit | f229e7031a6efb2f23241b5da000c3b3203081d6 (patch) | |
| tree | 69664f4f4b37d9256133addc8f0328590b70a055 /src/net/http | |
| parent | ed475fe53ba41c0c15b11565f8b9d00165345bc2 (diff) | |
| download | go-f229e7031a6efb2f23241b5da000c3b3203081d6.tar.xz | |
all: go fix -fix=buildtag std cmd (except for bootstrap deps, vendor)
When these packages are released as part of Go 1.18,
Go 1.16 will no longer be supported, so we can remove
the +build tags in these files.
Ran go fix -fix=buildtag std cmd and then reverted the bootstrapDirs
as defined in src/cmd/dist/buildtool.go, which need to continue
to build with Go 1.4 for now.
Also reverted src/vendor and src/cmd/vendor, which will need
to be updated in their own repos first.
Manual changes in runtime/pprof/mprof_test.go to adjust line numbers.
For #41184.
Change-Id: Ic0f93f7091295b6abc76ed5cd6e6746e1280861e
Reviewed-on: https://go-review.googlesource.com/c/go/+/344955
Trust: Russ Cox <rsc@golang.org>
Run-TryBot: Russ Cox <rsc@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Bryan C. Mills <bcmills@google.com>
Diffstat (limited to 'src/net/http')
| -rw-r--r-- | src/net/http/cgi/plan9_test.go | 1 | ||||
| -rw-r--r-- | src/net/http/cgi/posix_test.go | 1 | ||||
| -rw-r--r-- | src/net/http/h2_bundle.go | 1 | ||||
| -rw-r--r-- | src/net/http/omithttp2.go | 1 | ||||
| -rw-r--r-- | src/net/http/roundtrip.go | 1 | ||||
| -rw-r--r-- | src/net/http/roundtrip_js.go | 1 | ||||
| -rw-r--r-- | src/net/http/triv.go | 1 |
7 files changed, 0 insertions, 7 deletions
diff --git a/src/net/http/cgi/plan9_test.go b/src/net/http/cgi/plan9_test.go index f998bac6ea..b7ace3f81c 100644 --- a/src/net/http/cgi/plan9_test.go +++ b/src/net/http/cgi/plan9_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build plan9 -// +build plan9 package cgi diff --git a/src/net/http/cgi/posix_test.go b/src/net/http/cgi/posix_test.go index bc58ea94cc..49b9470d4a 100644 --- a/src/net/http/cgi/posix_test.go +++ b/src/net/http/cgi/posix_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !plan9 -// +build !plan9 package cgi diff --git a/src/net/http/h2_bundle.go b/src/net/http/h2_bundle.go index 29226d4065..df98232824 100644 --- a/src/net/http/h2_bundle.go +++ b/src/net/http/h2_bundle.go @@ -1,5 +1,4 @@ //go:build !nethttpomithttp2 -// +build !nethttpomithttp2 // Code generated by golang.org/x/tools/cmd/bundle. DO NOT EDIT. // $ bundle -o=h2_bundle.go -prefix=http2 -tags=!nethttpomithttp2 golang.org/x/net/http2 diff --git a/src/net/http/omithttp2.go b/src/net/http/omithttp2.go index 79599d006a..63c0e92d6a 100644 --- a/src/net/http/omithttp2.go +++ b/src/net/http/omithttp2.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build nethttpomithttp2 -// +build nethttpomithttp2 package http diff --git a/src/net/http/roundtrip.go b/src/net/http/roundtrip.go index eef7c79293..c4c5d3b6eb 100644 --- a/src/net/http/roundtrip.go +++ b/src/net/http/roundtrip.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !js || !wasm -// +build !js !wasm package http diff --git a/src/net/http/roundtrip_js.go b/src/net/http/roundtrip_js.go index 4a8595ebcf..dd042e9a01 100644 --- a/src/net/http/roundtrip_js.go +++ b/src/net/http/roundtrip_js.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build js && wasm -// +build js,wasm package http diff --git a/src/net/http/triv.go b/src/net/http/triv.go index 4dc62407c6..11b19ab30c 100644 --- a/src/net/http/triv.go +++ b/src/net/http/triv.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build ignore -// +build ignore package main |