Skip to content

Commit d23d9bc

Browse files
dmitshurgopherbot
dmitshur
authored and
gopherbot
committed
all: update go directive to 1.18
Done with: go get go@1.18 go mod tidy go fix ./... Using go1.21.3. With a manual change to keep golang.org/x/net/context testing itself, not context in the standard library. For golang/go#60268. Change-Id: I00682bf7cf1e3ba4370e2a3e7f63dc245b294a36 Reviewed-on: https://go-review.googlesource.com/c/net/+/534241 LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: Dmitri Shuralyov <dmitshur@google.com> Reviewed-by: Damien Neil <dneil@google.com> Auto-Submit: Dmitri Shuralyov <dmitshur@golang.org>
1 parent 92728b3 commit d23d9bc

File tree

192 files changed

+1
-231
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

192 files changed

+1
-231
lines changed

‎context/context_test.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build !go1.7
6-
// +build !go1.7
76

87
package context
98

‎context/ctxhttp/ctxhttp_test.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build !plan9
6-
// +build !plan9
76

87
package ctxhttp
98

‎context/go17.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build go1.7
6-
// +build go1.7
76

87
package context
98

‎context/go19.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build go1.9
6-
// +build go1.9
76

87
package context
98

‎context/pre_go17.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build !go1.7
6-
// +build !go1.7
76

87
package context
98

‎context/pre_go19.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build !go1.9
6-
// +build !go1.9
76

87
package context
98

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module golang.org/x/net
22

3-
go 1.17
3+
go 1.18
44

55
require (
66
golang.org/x/crypto v0.14.0

‎go.sum

-34
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,8 @@
1-
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
2-
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
3-
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
41
golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
52
golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
6-
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
7-
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
8-
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
9-
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
10-
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
11-
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
12-
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
13-
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
14-
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
15-
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
16-
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
17-
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
18-
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
19-
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
20-
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
21-
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
22-
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
233
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
244
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
25-
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
26-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
27-
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
28-
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
295
golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
306
golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
31-
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
32-
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
33-
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
34-
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
35-
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
367
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
378
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
38-
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
39-
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
40-
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
41-
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
42-
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎html/atom/gen.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build ignore
6-
// +build ignore
76

87
//go:generate go run gen.go
98
//go:generate go run gen.go -test

‎http/httpproxy/go19_test.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build go1.9
6-
// +build go1.9
76

87
package httpproxy_test
98

‎http2/go111.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build go1.11
6-
// +build go1.11
76

87
package http2
98

‎http2/go115.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build go1.15
6-
// +build go1.15
76

87
package http2
98

‎http2/go118.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build go1.18
6-
// +build go1.18
76

87
package http2
98

‎http2/h2i/h2i.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || windows
6-
// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris windows
76

87
/*
98
The h2i command is an interactive HTTP/2 console.

‎http2/hpack/gen.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build ignore
6-
// +build ignore
76

87
package main
98

‎http2/not_go111.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build !go1.11
6-
// +build !go1.11
76

87
package http2
98

‎http2/not_go115.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build !go1.15
6-
// +build !go1.15
76

87
package http2
98

‎http2/not_go118.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build !go1.18
6-
// +build !go1.18
76

87
package http2
98

‎http2/transport_go117_test.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build go1.17
6-
// +build go1.17
76

87
package http2
98

‎icmp/helper_posix.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || windows
6-
// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris windows
76

87
package icmp
98

‎icmp/listen_posix.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || windows
6-
// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris windows
76

87
package icmp
98

‎icmp/listen_stub.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build !aix && !darwin && !dragonfly && !freebsd && !linux && !netbsd && !openbsd && !solaris && !windows
6-
// +build !aix,!darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd,!solaris,!windows
76

87
package icmp
98

‎idna/go118.go

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎idna/idna10.0.0.go

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎idna/idna9.0.0.go

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎idna/pre_go118.go

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎idna/tables10.0.0.go

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎idna/tables11.0.0.go

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎idna/tables12.0.0.go

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎idna/tables13.0.0.go

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎idna/tables15.0.0.go

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎idna/tables9.0.0.go

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎idna/trie12.0.0.go

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎idna/trie13.0.0.go

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/iana/gen.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build ignore
6-
// +build ignore
76

87
//go:generate go run gen.go
98

‎internal/socket/cmsghdr.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos
6-
// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris zos
76

87
package socket
98

‎internal/socket/cmsghdr_bsd.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build aix || darwin || dragonfly || freebsd || netbsd || openbsd
6-
// +build aix darwin dragonfly freebsd netbsd openbsd
76

87
package socket
98

‎internal/socket/cmsghdr_linux_32bit.go

-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build (arm || mips || mipsle || 386 || ppc) && linux
6-
// +build arm mips mipsle 386 ppc
7-
// +build linux
86

97
package socket
108

‎internal/socket/cmsghdr_linux_64bit.go

-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build (arm64 || amd64 || loong64 || ppc64 || ppc64le || mips64 || mips64le || riscv64 || s390x) && linux
6-
// +build arm64 amd64 loong64 ppc64 ppc64le mips64 mips64le riscv64 s390x
7-
// +build linux
86

97
package socket
108

‎internal/socket/cmsghdr_solaris_64bit.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build amd64 && solaris
6-
// +build amd64,solaris
76

87
package socket
98

‎internal/socket/cmsghdr_stub.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build !aix && !darwin && !dragonfly && !freebsd && !linux && !netbsd && !openbsd && !solaris && !zos
6-
// +build !aix,!darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd,!solaris,!zos
76

87
package socket
98

‎internal/socket/cmsghdr_unix.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos
6-
// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris zos
76

87
package socket
98

‎internal/socket/complete_dontwait.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
6-
// +build darwin dragonfly freebsd linux netbsd openbsd solaris
76

87
package socket
98

‎internal/socket/complete_nodontwait.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build aix || windows || zos
6-
// +build aix windows zos
76

87
package socket
98

‎internal/socket/defs_aix.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build ignore
6-
// +build ignore
76

87
package socket
98

0 commit comments

Comments
 (0)