diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2023-05-30 17:56:18 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-30 17:56:18 +1000 |
| commit | 33789d67f072e1284fe79dbe78507d2ad3069ada (patch) | |
| tree | f6a3e2b0d1f09ca6d7f7f3ca29006078d52a8da8 /vendor | |
| parent | cc0edd42bb9a341aaf329357666b06e9b5ad24e1 (diff) | |
| parent | e842548fc89bdd72f757ba88ee85ec22e78304b2 (diff) | |
Merge pull request #2490 from jesseduffield/dependabot/go_modules/golang.org/x/net-0.7.0
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/golang.org/x/net/context/go17.go | 4 | ||||
| -rw-r--r-- | vendor/modules.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vendor/golang.org/x/net/context/go17.go b/vendor/golang.org/x/net/context/go17.go index 0a54bdbcc..2cb9c408f 100644 --- a/vendor/golang.org/x/net/context/go17.go +++ b/vendor/golang.org/x/net/context/go17.go @@ -32,7 +32,7 @@ var DeadlineExceeded = context.DeadlineExceeded // call cancel as soon as the operations running in this Context complete. func WithCancel(parent Context) (ctx Context, cancel CancelFunc) { ctx, f := context.WithCancel(parent) - return ctx, CancelFunc(f) + return ctx, f } // WithDeadline returns a copy of the parent context with the deadline adjusted @@ -46,7 +46,7 @@ func WithCancel(parent Context) (ctx Context, cancel CancelFunc) { // call cancel as soon as the operations running in this Context complete. func WithDeadline(parent Context, deadline time.Time) (Context, CancelFunc) { ctx, f := context.WithDeadline(parent, deadline) - return ctx, CancelFunc(f) + return ctx, f } // WithTimeout returns WithDeadline(parent, time.Now().Add(timeout)). diff --git a/vendor/modules.txt b/vendor/modules.txt index 4d13d781e..8459ec6ee 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -288,7 +288,7 @@ golang.org/x/crypto/ssh/knownhosts ## explicit; go 1.18 golang.org/x/exp/constraints golang.org/x/exp/slices -# golang.org/x/net v0.0.0-20220722155237-a158d28d115b +# golang.org/x/net v0.7.0 ## explicit; go 1.17 golang.org/x/net/context golang.org/x/net/internal/socks |