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

geesefs-0-30-9
Arran Walker 2018-02-07 15:12:44 +00:00
parent c4e473376f
commit 5ee7049312
21 changed files with 22 additions and 36 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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