Switch from x/net/context -> context

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

View File

@@ -3,6 +3,7 @@ package main
import (
"bufio"
"bytes"
"context"
"fmt"
"io"
"io/ioutil"
@@ -17,7 +18,6 @@ import (
"github.com/docker/docker/internal/test/request"
"github.com/docker/docker/pkg/stdcopy"
"github.com/go-check/check"
"golang.org/x/net/context"
)
func (s *DockerSuite) TestLogsAPIWithStdout(c *check.C) {