From eb448d132ddd4ad00925473a0b79b0aac5501529 Mon Sep 17 00:00:00 2001 From: Matt Joiner Date: Wed, 31 Jan 2018 16:42:26 +1100 Subject: [PATCH] Update context imports --- fs/filenode.go | 3 ++- fs/torrentfs.go | 2 +- fs/torrentfs_test.go | 2 +- reader.go | 2 +- reader_test.go | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/fs/filenode.go b/fs/filenode.go index 7d6555af..a7c807b4 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 52b5ff59..e143eca2 100644 --- a/fs/torrentfs.go +++ b/fs/torrentfs.go @@ -1,6 +1,7 @@ package torrentfs import ( + "context" "expvar" "os" "strings" @@ -8,7 +9,6 @@ import ( "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 dd493031..06f4c888 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 @@ 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 index 4b96414c..40241e07 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 5378efc5..1cb0c4fd 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" )