Update context imports

dgkh1975 · Jan 31, 2018 · eb448d1 · eb448d1
1 parent 64c40a4
commit eb448d1
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/fs/filenode.go b/fs/filenode.go
@@ -1,9 +1,10 @@
 package torrentfs
 
 import (
+	"context"
+
 	"bazil.org/fuse"
 	fusefs "bazil.org/fuse/fs"
-	"golang.org/x/net/context"
 
 	"github.com/anacrolix/torrent"
 )

diff --git a/fs/torrentfs.go b/fs/torrentfs.go
@@ -1,14 +1,14 @@
 package torrentfs
 
 import (
+	"context"
 	"expvar"
 	"os"
 	"strings"
 	"sync"
 
 	"bazil.org/fuse"
 	fusefs "bazil.org/fuse/fs"
-	"golang.org/x/net/context"
 
 	"github.com/anacrolix/torrent"
 	"github.com/anacrolix/torrent/metainfo"

diff --git a/fs/torrentfs_test.go b/fs/torrentfs_test.go
@@ -2,6 +2,7 @@ package torrentfs
 
 import (
 	"context"
+	netContext "context"
 	"fmt"
 	"io/ioutil"
 	"log"
@@ -18,7 +19,6 @@ import (
 	"github.com/anacrolix/missinggo"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	netContext "golang.org/x/net/context"
 
 	"github.com/anacrolix/torrent"
 	"github.com/anacrolix/torrent/internal/testutil"

diff --git a/reader.go b/reader.go
@@ -1,13 +1,13 @@
 package torrent
 
 import (
+	"context"
 	"errors"
 	"io"
 	"log"
 	"sync"
 
 	"github.com/anacrolix/missinggo"
-	"golang.org/x/net/context"
 )
 
 type Reader interface {

diff --git a/reader_test.go b/reader_test.go
@@ -1,11 +1,11 @@
 package torrent
 
 import (
+	"context"
 	"testing"
 	"time"
 
 	"github.com/stretchr/testify/require"
-	"golang.org/x/net/context"
 
 	"github.com/anacrolix/torrent/internal/testutil"
 )