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
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"

View File

@ -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)

View File

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

View File

@ -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

View File

@ -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

View File

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

View File

@ -1,6 +1,7 @@
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"

View File

@ -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.

View File

@ -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"

View File

@ -1,6 +1,7 @@
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"

View File

@ -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"
)

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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/

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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.")

View File

@ -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"

View File

@ -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(