Explorar o código

bump golang.org/x/sync e225da77a7e68af35c70ccbf71af2b83e6acac3c

removes use of golang.org/x/net/context

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn %!s(int64=6) %!d(string=hai) anos
pai
achega
dfa863db45

+ 1 - 1
vendor.conf

@@ -24,7 +24,7 @@ github.com/google/go-cmp v0.2.0
 
 github.com/RackSec/srslog 456df3a81436d29ba874f3590eeeee25d666f8a5
 github.com/imdario/mergo 7c29201646fa3de8506f701213473dd407f19646 # v0.3.7
-golang.org/x/sync 1d60e4601c6fd243af51cc01ddf169918a5407ca
+golang.org/x/sync e225da77a7e68af35c70ccbf71af2b83e6acac3c
 
 # buildkit
 github.com/moby/buildkit b3028967ae6259c9a31c1a1deeccd30fe3469cce

+ 1 - 2
vendor/golang.org/x/sync/errgroup/errgroup.go

@@ -7,9 +7,8 @@
 package errgroup
 
 import (
+	"context"
 	"sync"
-
-	"golang.org/x/net/context"
 )
 
 // A Group is a collection of goroutines working on subtasks that are part of

+ 4 - 8
vendor/golang.org/x/sync/semaphore/semaphore.go

@@ -7,12 +7,8 @@ package semaphore // import "golang.org/x/sync/semaphore"
 
 import (
 	"container/list"
+	"context"
 	"sync"
-
-	// Use the old context because packages that depend on this one
-	// (e.g. cloud.google.com/go/...) must run on Go 1.6.
-	// TODO(jba): update to "context" when possible.
-	"golang.org/x/net/context"
 )
 
 type waiter struct {
@@ -36,9 +32,9 @@ type Weighted struct {
 	waiters list.List
 }
 
-// Acquire acquires the semaphore with a weight of n, blocking only until ctx
-// is done. On success, returns nil. On failure, returns ctx.Err() and leaves
-// the semaphore unchanged.
+// Acquire acquires the semaphore with a weight of n, blocking until resources
+// are available or ctx is done. On success, returns nil. On failure, returns
+// ctx.Err() and leaves the semaphore unchanged.
 //
 // If ctx is already done, Acquire may still succeed without blocking.
 func (s *Weighted) Acquire(ctx context.Context, n int64) error {