all: use "context" instead of golang.org/x/net/context
Change-Id: I106c81a16eb5b39ff38c6f896095a27f597b3f8d
Reviewed-on: https://go-review.googlesource.com/99016
Reviewed-by: Ian Lance Taylor <iant@golang.org>
diff --git a/app/appengine/config.go b/app/appengine/config.go
index d32653a..4556a6d 100644
--- a/app/appengine/config.go
+++ b/app/appengine/config.go
@@ -9,7 +9,7 @@
import (
"sync"
- "golang.org/x/net/context"
+ "context"
"google.golang.org/appengine/datastore"
"google.golang.org/appengine/log"
)
diff --git a/app/appengine/handler.go b/app/appengine/handler.go
index 2b75051..8c76c1e 100644
--- a/app/appengine/handler.go
+++ b/app/appengine/handler.go
@@ -8,6 +8,7 @@
import (
"bytes"
+ "context"
"crypto/hmac"
"crypto/md5"
"encoding/json"
@@ -23,7 +24,6 @@
"golang.org/x/build/app/cache"
"golang.org/x/build/app/key"
- "golang.org/x/net/context"
"google.golang.org/appengine"
"google.golang.org/appengine/datastore"
"google.golang.org/appengine/log"
diff --git a/app/appengine/perf_learn.go b/app/appengine/perf_learn.go
index 0321c5c..2354174 100644
--- a/app/appengine/perf_learn.go
+++ b/app/appengine/perf_learn.go
@@ -13,7 +13,7 @@
"net/http"
"sort"
- "golang.org/x/net/context"
+ "context"
"google.golang.org/appengine"
"google.golang.org/appengine/datastore"
)
diff --git a/app/appengine/update.go b/app/appengine/update.go
index 5e958e1..8147839 100644
--- a/app/appengine/update.go
+++ b/app/appengine/update.go
@@ -11,7 +11,7 @@
"fmt"
"net/http"
- "golang.org/x/net/context"
+ "context"
"google.golang.org/appengine"
"google.golang.org/appengine/datastore"
)
diff --git a/buildlet/buildletclient.go b/buildlet/buildletclient.go
index 0e03d83..134ae38 100644
--- a/buildlet/buildletclient.go
+++ b/buildlet/buildletclient.go
@@ -22,7 +22,7 @@
"sync"
"time"
- "golang.org/x/net/context"
+ "context"
"golang.org/x/oauth2"
)
diff --git a/buildlet/kube.go b/buildlet/kube.go
index 503d6fa..af6cef6 100644
--- a/buildlet/kube.go
+++ b/buildlet/kube.go
@@ -5,6 +5,7 @@
package buildlet
import (
+ "context"
"crypto/tls"
"fmt"
"log"
@@ -16,7 +17,6 @@
"golang.org/x/build/dashboard"
"golang.org/x/build/kubernetes"
"golang.org/x/build/kubernetes/api"
- "golang.org/x/net/context"
"golang.org/x/net/context/ctxhttp"
)
diff --git a/cmd/release/upload.go b/cmd/release/upload.go
index 240e629..c63238f 100644
--- a/cmd/release/upload.go
+++ b/cmd/release/upload.go
@@ -6,6 +6,7 @@
import (
"bytes"
+ "context"
"crypto/sha256"
"encoding/json"
"fmt"
@@ -23,7 +24,6 @@
"time"
"cloud.google.com/go/storage"
- "golang.org/x/net/context"
"golang.org/x/oauth2/google"
"golang.org/x/sync/errgroup"
"google.golang.org/api/iterator"
diff --git a/cmd/upload/upload.go b/cmd/upload/upload.go
index 3fbba70..a36c791 100644
--- a/cmd/upload/upload.go
+++ b/cmd/upload/upload.go
@@ -12,6 +12,7 @@
"archive/tar"
"bytes"
"compress/gzip"
+ "context"
"crypto/md5"
"flag"
"fmt"
@@ -28,7 +29,6 @@
"cloud.google.com/go/storage"
"golang.org/x/build/auth"
"golang.org/x/build/envutil"
- "golang.org/x/net/context"
"google.golang.org/api/option"
)
diff --git a/kubernetes/client.go b/kubernetes/client.go
index 9e42b89..d6a6185 100644
--- a/kubernetes/client.go
+++ b/kubernetes/client.go
@@ -8,6 +8,7 @@
import (
"bufio"
"bytes"
+ "context"
"encoding/json"
"fmt"
"io"
@@ -20,7 +21,6 @@
"time"
"golang.org/x/build/kubernetes/api"
- "golang.org/x/net/context"
"golang.org/x/net/context/ctxhttp"
)
diff --git a/kubernetes/client_test.go b/kubernetes/client_test.go
index 91697c9..debf7f5 100644
--- a/kubernetes/client_test.go
+++ b/kubernetes/client_test.go
@@ -1,6 +1,7 @@
package kubernetes_test
import (
+ "context"
"encoding/json"
"fmt"
"net/http"
@@ -9,7 +10,6 @@
"golang.org/x/build/kubernetes"
"golang.org/x/build/kubernetes/api"
- "golang.org/x/net/context"
)
type handlers []func(w http.ResponseWriter, r *http.Request) error
