Skip to content

Commit 97fe3a2

Browse files
prattmicgopherbot
authored andcommitted
[release-branch.go1.19] all: update vendored golang.org/x/net
Update golang.org/x/net to the tip of internal-branch.go1.19-vendor to include CL 468335. The contents of that CL were already merged into this branch in CL 468118, so this CL just brings go.mod back in line to matching the actual vendored content. For #58355 For #57855 Change-Id: Ie952744a5b2249f0c05afb7f86bebf872734b09a Reviewed-on: https://go-review.googlesource.com/c/go/+/468303 Run-TryBot: Michael Pratt <[email protected]> TryBot-Result: Gopher Robot <[email protected]> Reviewed-by: Than McIntosh <[email protected]> Auto-Submit: Michael Pratt <[email protected]>
1 parent 8656c03 commit 97fe3a2

File tree

4 files changed

+4
-6
lines changed

4 files changed

+4
-6
lines changed

src/cmd/internal/moddeps/moddeps_test.go

-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ import (
3333
// See issues 36852, 41409, and 43687.
3434
// (Also see golang.org/issue/27348.)
3535
func TestAllDependencies(t *testing.T) {
36-
t.Skip("TODO(#58355): 1.19.4 contains unreleased changes from vendored modules")
37-
3836
goBin := testenv.GoToolPath(t)
3937

4038
// Ensure that all packages imported within GOROOT

src/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.19
44

55
require (
66
golang.org/x/crypto v0.0.0-20220516162934-403b01795ae8
7-
golang.org/x/net v0.0.0-20221214163817-183621ab9c4e
7+
golang.org/x/net v0.0.0-20230214200805-d99f623d45a4
88
)
99

1010
require (

src/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
golang.org/x/crypto v0.0.0-20220516162934-403b01795ae8 h1:y+mHpWoQJNAHt26Nhh6JP7hvM71IRZureyvZhoVALIs=
22
golang.org/x/crypto v0.0.0-20220516162934-403b01795ae8/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
3-
golang.org/x/net v0.0.0-20221214163817-183621ab9c4e h1:ny/17Y8U4fgn9XOKSWpD8Fgz3CD+msKsE74LF845pIg=
4-
golang.org/x/net v0.0.0-20221214163817-183621ab9c4e/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
3+
golang.org/x/net v0.0.0-20230214200805-d99f623d45a4 h1:iaVaPFITmD6a3T5kPUYNWiaNrPvSEl6s+xvx6B9yfR0=
4+
golang.org/x/net v0.0.0-20230214200805-d99f623d45a4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
55
golang.org/x/sys v0.0.0-20220614162138-6c1b26c55098 h1:PgOr27OhUx2IRqGJ2RxAWI4dJQ7bi9cSrB82uzFzfUA=
66
golang.org/x/sys v0.0.0-20220614162138-6c1b26c55098/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
77
golang.org/x/text v0.3.8-0.20220509174342-b4bca84b0361 h1:h+pU/hCb7sEApigI6eII3/Emx5ZHaFWS+nulUp0Az/k=

src/vendor/modules.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ golang.org/x/crypto/curve25519/internal/field
99
golang.org/x/crypto/hkdf
1010
golang.org/x/crypto/internal/poly1305
1111
golang.org/x/crypto/internal/subtle
12-
# golang.org/x/net v0.0.0-20221214163817-183621ab9c4e
12+
# golang.org/x/net v0.0.0-20230214200805-d99f623d45a4
1313
## explicit; go 1.17
1414
golang.org/x/net/dns/dnsmessage
1515
golang.org/x/net/http/httpguts

0 commit comments

Comments
 (0)