Use std context instead of golang.org/x/net/context.

go4org · May 17, 2017 · 32ab3eb · 32ab3eb
1 parent a2c8171
commit 32ab3eb
Show file tree

Hide file tree

Showing 52 changed files with 62 additions and 62 deletions.
diff --git a/Documentation/server-reflection-tutorial.md b/Documentation/server-reflection-tutorial.md
@@ -16,7 +16,7 @@ For example, to enable server reflection in `example/helloworld`, we need to mak
 --- a/examples/helloworld/greeter_server/main.go
 +++ b/examples/helloworld/greeter_server/main.go
 @@ -40,6 +40,7 @@ import (
-        "golang.org/x/net/context"
+        "context"
         "go4.org/grpc"
         pb "go4.org/grpc/examples/helloworld/helloworld"
 +       "go4.org/grpc/reflection"

diff --git a/benchmark/benchmark.go b/benchmark/benchmark.go
@@ -41,7 +41,7 @@ import (
 	"io"
 	"net"
 
-	"golang.org/x/net/context"
+	"context"
 	"go4.org/grpc"
 	testpb "go4.org/grpc/benchmark/grpc_testing"
 	"go4.org/grpc/grpclog"

diff --git a/benchmark/benchmark_test.go b/benchmark/benchmark_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"golang.org/x/net/context"
+	"context"
 	"go4.org/grpc"
 	testpb "go4.org/grpc/benchmark/grpc_testing"
 	"go4.org/grpc/benchmark/stats"

diff --git a/benchmark/client/main.go b/benchmark/client/main.go
@@ -9,7 +9,7 @@ import (
 	"sync"
 	"time"
 
-	"golang.org/x/net/context"
+	"context"
 	"go4.org/grpc"
 	"go4.org/grpc/benchmark"
 	testpb "go4.org/grpc/benchmark/grpc_testing"

diff --git a/benchmark/grpc_testing/services.pb.go b/benchmark/grpc_testing/services.pb.go
diff --git a/benchmark/worker/benchmark_client.go b/benchmark/worker/benchmark_client.go
@@ -39,7 +39,7 @@ import (
 	"sync"
 	"time"
 
-	"golang.org/x/net/context"
+	"context"
 	"go4.org/grpc"
 	"go4.org/grpc/benchmark"
 	testpb "go4.org/grpc/benchmark/grpc_testing"

diff --git a/benchmark/worker/main.go b/benchmark/worker/main.go
@@ -42,7 +42,7 @@ import (
 	"strconv"
 	"time"
 
-	"golang.org/x/net/context"
+	"context"
 	"go4.org/grpc"
 	testpb "go4.org/grpc/benchmark/grpc_testing"
 	"go4.org/grpc/codes"

diff --git a/call.go b/call.go
@@ -40,11 +40,11 @@ import (
 	"strings"
 	"time"
 
-	"golang.org/x/net/context"
-	"golang.org/x/net/trace"
+	"context"
 	"go4.org/grpc/codes"
 	"go4.org/grpc/metadata"
 	"go4.org/grpc/stats"
+	"golang.org/x/net/trace"
 )
 
 // Invoke sends a non-streaming RPC request on the wire and returns

diff --git a/call_test.go b/call_test.go
@@ -44,7 +44,7 @@ import (
 	"testing"
 	"time"
 
-	"golang.org/x/net/context"
+	"context"
 	"go4.org/grpc/codes"
 	"go4.org/grpc/transport"
 )

diff --git a/clientconn_test.go b/clientconn_test.go
@@ -38,7 +38,7 @@ import (
 	"testing"
 	"time"
 
-	"golang.org/x/net/context"
+	"context"
 
 	"go4.org/grpc/credentials"
 )

diff --git a/credentials/credentials.go b/credentials/credentials.go
@@ -46,7 +46,7 @@ import (
 	"net"
 	"strings"
 
-	"golang.org/x/net/context"
+	"context"
 )
 
 var (

diff --git a/credentials/credentials_test.go b/credentials/credentials_test.go
@@ -38,7 +38,7 @@ import (
 	"net"
 	"testing"
 
-	"golang.org/x/net/context"
+	"context"
 )
 
 func TestTLSOverrideServerName(t *testing.T) {

diff --git a/credentials/oauth/oauth.go b/credentials/oauth/oauth.go
@@ -38,11 +38,11 @@ import (
 	"fmt"
 	"io/ioutil"
 
-	"golang.org/x/net/context"
+	"context"
+	"go4.org/grpc/credentials"
 	"golang.org/x/oauth2"
 	"golang.org/x/oauth2/google"
 	"golang.org/x/oauth2/jwt"
-	"go4.org/grpc/credentials"
 )
 
 // TokenSource supplies PerRPCCredentials from an oauth2.TokenSource.

diff --git a/examples/helloworld/greeter_client/main.go b/examples/helloworld/greeter_client/main.go
@@ -37,7 +37,7 @@ import (
 	"log"
 	"os"
 
-	"golang.org/x/net/context"
+	"context"
 	"go4.org/grpc"
 	pb "go4.org/grpc/examples/helloworld/helloworld"
 )

diff --git a/examples/helloworld/greeter_server/main.go b/examples/helloworld/greeter_server/main.go
@@ -37,7 +37,7 @@ import (
 	"log"
 	"net"
 
-	"golang.org/x/net/context"
+	"context"
 	"go4.org/grpc"
 	pb "go4.org/grpc/examples/helloworld/helloworld"
 	"go4.org/grpc/reflection"

diff --git a/examples/helloworld/helloworld/helloworld.pb.go b/examples/helloworld/helloworld/helloworld.pb.go
diff --git a/examples/route_guide/client/client.go b/examples/route_guide/client/client.go
@@ -43,7 +43,7 @@ import (
 	"math/rand"
 	"time"
 
-	"golang.org/x/net/context"
+	"context"
 	"go4.org/grpc"
 	"go4.org/grpc/credentials"
 	pb "go4.org/grpc/examples/route_guide/routeguide"

diff --git a/examples/route_guide/routeguide/route_guide.pb.go b/examples/route_guide/routeguide/route_guide.pb.go
diff --git a/examples/route_guide/server/server.go b/examples/route_guide/server/server.go
@@ -47,7 +47,7 @@ import (
 	"net"
 	"time"
 
-	"golang.org/x/net/context"
+	"context"
 	"go4.org/grpc"
 
 	"go4.org/grpc/credentials"

diff --git a/grpclb/grpc_lb_v1/grpclb.pb.go b/grpclb/grpc_lb_v1/grpclb.pb.go
diff --git a/grpclb/grpclb.go b/grpclb/grpclb.go
@@ -42,7 +42,7 @@ import (
 	"sync"
 	"time"
 
-	"golang.org/x/net/context"
+	"context"
 	"go4.org/grpc"
 	"go4.org/grpc/codes"
 	lbpb "go4.org/grpc/grpclb/grpc_lb_v1"

diff --git a/grpclb/grpclb_test.go b/grpclb/grpclb_test.go
@@ -43,7 +43,7 @@ import (
 	"testing"
 	"time"
 
-	"golang.org/x/net/context"
+	"context"
 	"go4.org/grpc"
 	"go4.org/grpc/codes"
 	"go4.org/grpc/credentials"

diff --git a/health/grpc_health_v1/health.pb.go b/health/grpc_health_v1/health.pb.go
diff --git a/health/health.go b/health/health.go
@@ -5,7 +5,7 @@ package health
 import (
 	"sync"
 
-	"golang.org/x/net/context"
+	"context"
 	"go4.org/grpc"
 	"go4.org/grpc/codes"
 	healthpb "go4.org/grpc/health/grpc_health_v1"

diff --git a/interceptor.go b/interceptor.go
@@ -34,7 +34,7 @@
 package grpc
 
 import (
-	"golang.org/x/net/context"
+	"context"
 )
 
 // Streamer is called by StreamClientInterceptor to create a ClientStream.

diff --git a/interop/grpc_testing/test.pb.go b/interop/grpc_testing/test.pb.go
diff --git a/interop/test_utils.go b/interop/test_utils.go
@@ -40,15 +40,15 @@ import (
 	"strings"
 	"time"
 
+	"context"
 	"github.com/golang/protobuf/proto"
-	"golang.org/x/net/context"
-	"golang.org/x/oauth2"
-	"golang.org/x/oauth2/google"
 	"go4.org/grpc"
 	"go4.org/grpc/codes"
 	"go4.org/grpc/grpclog"
 	testpb "go4.org/grpc/interop/grpc_testing"
 	"go4.org/grpc/metadata"
+	"golang.org/x/oauth2"
+	"golang.org/x/oauth2/google"
 )
 
 var (

diff --git a/metadata/metadata.go b/metadata/metadata.go
@@ -39,7 +39,7 @@ import (
 	"fmt"
 	"strings"
 
-	"golang.org/x/net/context"
+	"context"
 )
 
 const (

diff --git a/peer/peer.go b/peer/peer.go
@@ -38,7 +38,7 @@ package peer
 import (
 	"net"
 
-	"golang.org/x/net/context"
+	"context"
 	"go4.org/grpc/credentials"
 )
 

diff --git a/reflection/grpc_reflection_v1alpha/reflection.pb.go b/reflection/grpc_reflection_v1alpha/reflection.pb.go
diff --git a/reflection/grpc_testing/test.pb.go b/reflection/grpc_testing/test.pb.go
diff --git a/reflection/serverreflection_test.go b/reflection/serverreflection_test.go
@@ -40,9 +40,9 @@ import (
 	"sort"
 	"testing"
 
+	"context"
 	"github.com/golang/protobuf/proto"
 	dpb "github.com/golang/protobuf/protoc-gen-go/descriptor"
-	"golang.org/x/net/context"
 	"go4.org/grpc"
 	rpb "go4.org/grpc/reflection/grpc_reflection_v1alpha"
 	pb "go4.org/grpc/reflection/grpc_testing"

diff --git a/rpc_util.go b/rpc_util.go
@@ -44,8 +44,8 @@ import (
 	"os"
 	"time"
 
+	"context"
 	"github.com/golang/protobuf/proto"
-	"golang.org/x/net/context"
 	"go4.org/grpc/codes"
 	"go4.org/grpc/metadata"
 	"go4.org/grpc/stats"

diff --git a/rpc_util_test.go b/rpc_util_test.go
@@ -40,8 +40,8 @@ import (
 	"reflect"
 	"testing"
 
+	"context"
 	"github.com/golang/protobuf/proto"
-	"golang.org/x/net/context"
 	"go4.org/grpc/codes"
 	perfpb "go4.org/grpc/test/codec_perf"
 	"go4.org/grpc/transport"

diff --git a/server.go b/server.go
@@ -46,9 +46,7 @@ import (
 	"sync"
 	"time"
 
-	"golang.org/x/net/context"
-	"golang.org/x/net/http2"
-	"golang.org/x/net/trace"
+	"context"
 	"go4.org/grpc/codes"
 	"go4.org/grpc/credentials"
 	"go4.org/grpc/grpclog"
@@ -57,6 +55,8 @@ import (
 	"go4.org/grpc/stats"
 	"go4.org/grpc/tap"
 	"go4.org/grpc/transport"
+	"golang.org/x/net/http2"
+	"golang.org/x/net/trace"
 )
 
 type methodHandler func(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor UnaryServerInterceptor) (interface{}, error)

diff --git a/stats/grpc_testing/test.pb.go b/stats/grpc_testing/test.pb.go
diff --git a/stats/handlers.go b/stats/handlers.go
@@ -36,7 +36,7 @@ package stats
 import (
 	"net"
 
-	"golang.org/x/net/context"
+	"context"
 )
 
 // ConnTagInfo defines the relevant information needed by connection context tagger.

diff --git a/stats/stats_test.go b/stats/stats_test.go
@@ -42,8 +42,8 @@ import (
 	"testing"
 	"time"
 
+	"context"
 	"github.com/golang/protobuf/proto"
-	"golang.org/x/net/context"
 	"go4.org/grpc"
 	"go4.org/grpc/metadata"
 	"go4.org/grpc/stats"

diff --git a/stream.go b/stream.go
@@ -39,12 +39,12 @@ import (
 	"sync"
 	"time"
 
-	"golang.org/x/net/context"
-	"golang.org/x/net/trace"
+	"context"
 	"go4.org/grpc/codes"
 	"go4.org/grpc/metadata"
 	"go4.org/grpc/stats"
 	"go4.org/grpc/transport"
+	"golang.org/x/net/trace"
 )
 
 // StreamHandler defines the handler called by gRPC server to complete the
-Original file line number
+Diff line change
@@ Expand Up / @@ -46,7 +46,7 @@ import ( @@
     	"net"
     	"strings"
-    	"golang.org/x/net/context"
+    	"context"
     )
     var (
@@ Expand Down @@