InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch from x/net/context -> context

Browse Source 
Since Go 1.7, context is a standard package. Since Go 1.9, everything
that is provided by "x/net/context" is a couple of type aliases to
types in "context".

Many vendored packages still use x/net/context, so vendor entry remains
for now.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This commit is contained in:
Kir Kolyshkin
2018-04-19 15:30:59 -07:00
parent 5c233cf431
commit 7d62e40f7e
346 changed files with 369 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/authorization/middleware.go
View File

@@ -1,12 +1,12 @@
package authorization // import "github.com/docker/docker/pkg/authorization"
import (
"context"
"net/http"
"sync"
"github.com/docker/docker/pkg/plugingetter"
"github.com/sirupsen/logrus"
"golang.org/x/net/context"
)
// Middleware uses a list of plugins to

2
pkg/authorization/middleware_unix_test.go
View File

@@ -3,6 +3,7 @@
package authorization // import "github.com/docker/docker/pkg/authorization"
import (
"context"
"net/http"
"net/http/httptest"
"testing"
@@ -10,7 +11,6 @@ import (
"github.com/docker/docker/pkg/plugingetter"
"github.com/gotestyourself/gotestyourself/assert"
is "github.com/gotestyourself/gotestyourself/assert/cmp"
"golang.org/x/net/context"
)
func TestMiddlewareWrapHandler(t *testing.T) {