"golang.org/x/net/context" was replaced to "context" package

tilnl · Dec 3, 2018 · 362bc29 · 362bc29
1 parent df19b5a
commit 362bc29
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/gomock/controller.go b/gomock/controller.go
@@ -56,8 +56,8 @@
 package gomock
 
 import (
+	"context"
 	"fmt"
-	"golang.org/x/net/context"
 	"reflect"
 	"runtime"
 	"sync"

diff --git a/gomock/matchers_test.go b/gomock/matchers_test.go
@@ -29,12 +29,12 @@ func TestMatchers(t *testing.T) {
 		yes, no []e
 	}
 	tests := []testCase{
-		testCase{gomock.Any(), []e{3, nil, "foo"}, nil},
-		testCase{gomock.Eq(4), []e{4}, []e{3, "blah", nil, int64(4)}},
-		testCase{gomock.Nil(),
+		{gomock.Any(), []e{3, nil, "foo"}, nil},
+		{gomock.Eq(4), []e{4}, []e{3, "blah", nil, int64(4)}},
+		{gomock.Nil(),
 			[]e{nil, (error)(nil), (chan bool)(nil), (*int)(nil)},
 			[]e{"", 0, make(chan bool), errors.New("err"), new(int)}},
-		testCase{gomock.Not(gomock.Eq(4)), []e{3, "blah", nil, int64(4)}, []e{4}},
+		{gomock.Not(gomock.Eq(4)), []e{3, "blah", nil, int64(4)}, []e{4}},
 	}
 	for i, test := range tests {
 		for _, x := range test.yes {

diff --git a/sample/concurrent/concurrent_test.go b/sample/concurrent/concurrent_test.go
@@ -3,8 +3,8 @@ package concurrent
 import (
 	"testing"
 
+	"context"
 	"github.com/golang/mock/gomock"
-	"golang.org/x/net/context"
 
 	mock "github.com/golang/mock/sample/concurrent/mock"
 )