fs/filenode.go | 3 ++- fs/torrentfs.go | 2 +- fs/torrentfs_test.go | 2 +- reader.go | 2 +- reader_test.go | 2 +- diff --git a/fs/filenode.go b/fs/filenode.go index 7d6555afa5f1301cca49a4873a00185a7ea1d5a0..a7c807b4fe897d0f50d2c649cb6566f66706cd7b 100644 --- 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 index 52b5ff5989e330bde799481b3ab9e0755b1b78f4..e143eca2e15c90a9b128ff633922739221e2dc08 100644 --- a/fs/torrentfs.go +++ b/fs/torrentfs.go @@ -1,6 +1,7 @@ package torrentfs import ( + "context" "expvar" "os" "strings" @@ -8,7 +9,6 @@ "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 index dd49303101967b164db0933e5936cc032277fcb9..06f4c8888a372bcf19cbd5eef527e3836a13f832 100644 --- 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 @@ _ "github.com/anacrolix/envpprof" "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 index 4b96414c89ba0b549423d8b431a5a3ba02a1f189..40241e070fd133d44928d0a44c4d370c869b8f04 100644 --- 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 index 5378efc5c515ea7a69d4c8dd986eb5d7e48069ae..1cb0c4fdf8a0746255229473dfdb7fce2b0e4b5b 100644 --- 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" )