Merge pull request #39 from saracen/context

replace imports of "golang.org/x/net/context" with "context"

.travis.yml

@@ -5,7 +5,7 @@ matrix:
   include:
     - os: linux
       language: go
-      go: 1.8.1
+      go: 1.9.3
       # Use the virtualized Trusty beta Travis is running in order to get
       # support for installing fuse.
       #
@@ -14,7 +14,7 @@ matrix:
       sudo: required
     - os: osx
       language: go
-      go: 1.8.1
+      go: 1.9.3
 
 # Install fuse before installing our code.
 before_install:

connection.go

@@ -15,6 +15,7 @@
 package fuse
 
 import (
+	"context"
 	"fmt"
 	"io"
 	"log"
@@ -24,8 +25,6 @@ import (
 	"sync"
 	"syscall"
 
-	"golang.org/x/net/context"
-
 	"github.com/jacobsa/fuse/fuseops"
 	"github.com/jacobsa/fuse/internal/buffer"
 	"github.com/jacobsa/fuse/internal/freelist"

fusetesting/parallel.go

@@ -15,6 +15,7 @@
 package fusetesting
 
 import (
+	"context"
 	"fmt"
 	"io/ioutil"
 	"os"
@@ -25,7 +26,6 @@ import (
 
 	. "github.com/jacobsa/ogletest"
 	"github.com/jacobsa/syncutil"
-	"golang.org/x/net/context"
 )
 
 // Run an ogletest test that checks expectations for parallel calls to open(2)

fuseutil/file_system.go

@@ -15,11 +15,10 @@
 package fuseutil
 
 import (
+	"context"
 	"io"
 	"sync"
 
-	"golang.org/x/net/context"
-
 	"github.com/jacobsa/fuse"
 	"github.com/jacobsa/fuse/fuseops"
 )

fuseutil/not_implemented_file_system.go

@@ -15,9 +15,10 @@
 package fuseutil
 
 import (
+	"context"
+
 	"github.com/jacobsa/fuse"
 	"github.com/jacobsa/fuse/fuseops"
-	"golang.org/x/net/context"
 )
 
 // A FileSystem that responds to all ops with fuse.ENOSYS. Embed this in your

mount.go

@@ -15,10 +15,9 @@
 package fuse
 
 import (
+	"context"
 	"fmt"
 	"os"
-
-	"golang.org/x/net/context"
 )
 
 // Server is an interface for any type that knows how to serve ops read from a

mount_config.go

@@ -15,12 +15,11 @@
 package fuse
 
 import (
+	"context"
 	"fmt"
 	"log"
 	"runtime"
 	"strings"
-
-	"golang.org/x/net/context"
 )
 
 // Optional configuration accepted by Mount.

mount_test.go

 package fuse_test
 
 import (
+	"context"
 	"io/ioutil"
 	"os"
 	"path"
@@ -8,8 +9,6 @@ import (
 	"strings"
 	"testing"
 
-	"golang.org/x/net/context"
-
 	"github.com/jacobsa/fuse"
 	"github.com/jacobsa/fuse/fuseops"
 	"github.com/jacobsa/fuse/fuseutil"

mounted_file_system.go

@@ -14,7 +14,7 @@
 
 package fuse
 
-import "golang.org/x/net/context"
+import "context"
 
 // MountedFileSystem represents the status of a mount operation, with a method
 // that waits for unmounting.

samples/cachingfs/caching_fs.go

@@ -15,14 +15,13 @@
 package cachingfs
 
 import (
+	"context"
 	"crypto/rand"
 	"fmt"
 	"io"
 	"os"
 	"time"
 
-	"golang.org/x/net/context"
-
 	"github.com/jacobsa/fuse"
 	"github.com/jacobsa/fuse/fuseops"
 	"github.com/jacobsa/fuse/fuseutil"

samples/dynamicfs/dynamic_fs.go

 package dynamicfs
 
 import (
+	"context"
 	"fmt"
 	"io"
 	"log"
@@ -9,8 +10,6 @@ import (
 	"sync"
 	"time"
 
-	"golang.org/x/net/context"
-
 	"github.com/jacobsa/fuse"
 	"github.com/jacobsa/fuse/fuseops"
 	"github.com/jacobsa/fuse/fuseutil"

samples/errorfs/error_fs.go

@@ -15,14 +15,13 @@
 package errorfs
 
 import (
+	"context"
 	"fmt"
 	"os"
 	"reflect"
 	"sync"
 	"syscall"
 
-	"golang.org/x/net/context"
-
 	"github.com/jacobsa/fuse/fuseops"
 	"github.com/jacobsa/fuse/fuseutil"
 )

samples/flushfs/flush_fs.go

@@ -15,12 +15,11 @@
 package flushfs
 
 import (
+	"context"
 	"fmt"
 	"os"
 	"sync"
 
-	"golang.org/x/net/context"
-
 	"github.com/jacobsa/fuse"
 	"github.com/jacobsa/fuse/fuseops"
 	"github.com/jacobsa/fuse/fuseutil"

samples/forgetfs/forget_fs.go

@@ -15,11 +15,10 @@
 package forgetfs
 
 import (
+	"context"
 	"fmt"
 	"os"
 
-	"golang.org/x/net/context"
-
 	"github.com/jacobsa/fuse"
 	"github.com/jacobsa/fuse/fuseops"
 	"github.com/jacobsa/fuse/fuseutil"

samples/hellofs/hello_fs.go

@@ -15,12 +15,11 @@
 package hellofs
 
 import (
+	"context"
 	"io"
 	"os"
 	"strings"
 
-	"golang.org/x/net/context"
-
 	"github.com/jacobsa/fuse"
 	"github.com/jacobsa/fuse/fuseops"
 	"github.com/jacobsa/fuse/fuseutil"

samples/in_process.go

@@ -15,6 +15,7 @@
 package samples
 
 import (
+	"context"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -25,7 +26,6 @@ import (
 	"github.com/jacobsa/fuse"
 	"github.com/jacobsa/ogletest"
 	"github.com/jacobsa/timeutil"
-	"golang.org/x/net/context"
 )
 
 // A struct that implements common behavior needed by tests in the samples/

samples/interruptfs/interrupt_fs.go

@@ -15,12 +15,11 @@
 package interruptfs
 
 import (
+	"context"
 	"fmt"
 	"os"
 	"sync"
 
-	"golang.org/x/net/context"
-
 	"github.com/jacobsa/fuse"
 	"github.com/jacobsa/fuse/fuseops"
 	"github.com/jacobsa/fuse/fuseutil"

samples/memfs/memfs.go

@@ -15,14 +15,13 @@
 package memfs
 
 import (
+	"context"
 	"fmt"
 	"io"
 	"os"
 	"syscall"
 	"time"
 
-	"golang.org/x/net/context"
-
 	"github.com/jacobsa/fuse"
 	"github.com/jacobsa/fuse/fuseops"
 	"github.com/jacobsa/fuse/fuseutil"

samples/memfs/posix_test.go

@@ -18,6 +18,7 @@
 package memfs_test
 
 import (
+	"context"
 	"io"
 	"io/ioutil"
 	"os"
@@ -25,8 +26,6 @@ import (
 	"runtime"
 	"testing"
 
-	"golang.org/x/net/context"
-
 	"github.com/jacobsa/fuse/fusetesting"
 	. "github.com/jacobsa/oglematchers"
 	. "github.com/jacobsa/ogletest"

samples/mount_sample/mount.go

@@ -17,6 +17,7 @@
 package main
 
 import (
+	"context"
 	"errors"
 	"flag"
 	"fmt"
@@ -27,7 +28,6 @@ import (
 
 	"github.com/jacobsa/fuse"
 	"github.com/jacobsa/fuse/samples/flushfs"
-	"golang.org/x/net/context"
 )
 
 var fType = flag.String("type", "", "The name of the samples/ sub-dir.")

samples/statfs/statfs.go

@@ -15,11 +15,10 @@
 package statfs
 
 import (
+	"context"
 	"os"
 	"sync"
 
-	"golang.org/x/net/context"
-
 	"github.com/jacobsa/fuse"
 	"github.com/jacobsa/fuse/fuseops"
 	"github.com/jacobsa/fuse/fuseutil"

samples/subprocess.go

@@ -16,6 +16,7 @@ package samples
 
 import (
 	"bytes"
+	"context"
 	"flag"
 	"fmt"
 	"io"
@@ -27,7 +28,6 @@ import (
 	"sync"
 
 	"github.com/jacobsa/ogletest"
-	"golang.org/x/net/context"
 )
 
 var fToolPath = flag.String(