From 9ffb698c8da59bf5b3bb3c9fbb1bb51d2245972c Mon Sep 17 00:00:00 2001 From: Michael Eischer Date: Mon, 5 Oct 2020 23:09:52 +0200 Subject: [PATCH] Modernize context import in internal/fuse Migrated using `go fix`. --- internal/fuse/dir.go | 2 +- internal/fuse/file.go | 2 +- internal/fuse/fuse_test.go | 3 +-- internal/fuse/link.go | 3 ++- internal/fuse/meta_dir.go | 3 +-- internal/fuse/other.go | 3 ++- internal/fuse/snapshots_dir.go | 3 +-- 7 files changed, 9 insertions(+), 10 deletions(-) diff --git a/internal/fuse/dir.go b/internal/fuse/dir.go index 8ebb63d60..8b217f473 100644 --- a/internal/fuse/dir.go +++ b/internal/fuse/dir.go @@ -3,13 +3,13 @@ package fuse import ( + "context" "os" "path/filepath" "sync" "bazil.org/fuse" "bazil.org/fuse/fs" - "golang.org/x/net/context" "github.com/restic/restic/internal/debug" "github.com/restic/restic/internal/restic" diff --git a/internal/fuse/file.go b/internal/fuse/file.go index b680c9004..def7ae85e 100644 --- a/internal/fuse/file.go +++ b/internal/fuse/file.go @@ -3,6 +3,7 @@ package fuse import ( + "context" "sort" "github.com/restic/restic/internal/debug" @@ -11,7 +12,6 @@ import ( "bazil.org/fuse" "bazil.org/fuse/fs" - "golang.org/x/net/context" ) // The default block size to report in stat diff --git a/internal/fuse/fuse_test.go b/internal/fuse/fuse_test.go index 05e37b630..6a9c3aa8b 100644 --- a/internal/fuse/fuse_test.go +++ b/internal/fuse/fuse_test.go @@ -4,13 +4,12 @@ package fuse import ( "bytes" + "context" "math/rand" "os" "testing" "time" - "golang.org/x/net/context" - "github.com/restic/restic/internal/repository" "github.com/restic/restic/internal/restic" diff --git a/internal/fuse/link.go b/internal/fuse/link.go index 8bf7813d9..23752f781 100644 --- a/internal/fuse/link.go +++ b/internal/fuse/link.go @@ -3,10 +3,11 @@ package fuse import ( + "context" + "bazil.org/fuse" "bazil.org/fuse/fs" "github.com/restic/restic/internal/restic" - "golang.org/x/net/context" ) // Statically ensure that *link implements the given interface diff --git a/internal/fuse/meta_dir.go b/internal/fuse/meta_dir.go index c2d433c33..b3644fca1 100644 --- a/internal/fuse/meta_dir.go +++ b/internal/fuse/meta_dir.go @@ -3,12 +3,11 @@ package fuse import ( + "context" "os" "github.com/restic/restic/internal/debug" - "golang.org/x/net/context" - "bazil.org/fuse" "bazil.org/fuse/fs" ) diff --git a/internal/fuse/other.go b/internal/fuse/other.go index a2aa3b47a..575f0257f 100644 --- a/internal/fuse/other.go +++ b/internal/fuse/other.go @@ -3,9 +3,10 @@ package fuse import ( + "context" + "bazil.org/fuse" "github.com/restic/restic/internal/restic" - "golang.org/x/net/context" ) type other struct { diff --git a/internal/fuse/snapshots_dir.go b/internal/fuse/snapshots_dir.go index 2c007e5ae..bdbdbe60b 100644 --- a/internal/fuse/snapshots_dir.go +++ b/internal/fuse/snapshots_dir.go @@ -3,6 +3,7 @@ package fuse import ( + "context" "fmt" "os" "time" @@ -10,8 +11,6 @@ import ( "github.com/restic/restic/internal/debug" "github.com/restic/restic/internal/restic" - "golang.org/x/net/context" - "bazil.org/fuse" "bazil.org/fuse/fs" )