diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2022-09-30 06:45:24 -0400 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2022-09-30 06:45:24 -0400 |
| commit | fe3c91d581ed8044fdd0cf07542965b5daed255b (patch) | |
| tree | 2ecc9d29cb45c708885fd06217d308df2bf81221 /vendor/golang.org/x/net/context | |
| parent | d88acd83a1bdd260fc69e0ff115ff99d55bb7760 (diff) | |
| download | podman-fe3c91d581ed8044fdd0cf07542965b5daed255b.tar.gz podman-fe3c91d581ed8044fdd0cf07542965b5daed255b.tar.bz2 podman-fe3c91d581ed8044fdd0cf07542965b5daed255b.zip | |
Update vendor containers/(common,image)
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'vendor/golang.org/x/net/context')
| -rw-r--r-- | vendor/golang.org/x/net/context/go17.go | 4 |
1 files changed, 2 insertions, 2 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)). |