Merge pull request #15 from ipfs/chore/cleanup

chore: remove xerrors
ipfs · May 26, 2020 · 14b474c · 14b474c
2 parents 3f12a5e + 19ca55e
commit 14b474c
Show file tree

Hide file tree

Showing 3 changed files with 248 additions and 26 deletions.
diff --git a/fslock.go b/fslock.go
@@ -1,6 +1,7 @@
 package fslock
 
 import (
+	"errors"
 	"io"
 	"os"
 	"path/filepath"
@@ -10,7 +11,6 @@ import (
 	util "github.com/ipfs/go-ipfs-util"
 	logging "github.com/ipfs/go-log"
 	lock "go4.org/lock"
-	"golang.org/x/xerrors"
 )
 
 // log is the fsrepo logger
@@ -78,7 +78,7 @@ func Locked(confdir, lockFile string) (bool, error) {
 
 	log.Debug(err)
 
-	if xerrors.As(err, new(LockedError)) {
+	if errors.As(err, new(LockedError)) {
 		return true, nil
 	}
 	return false, err

diff --git a/go.mod b/go.mod
@@ -2,9 +2,8 @@ module github.com/ipfs/go-fs-lock
 
 require (
 	github.com/ipfs/go-ipfs-util v0.0.1
-	github.com/ipfs/go-log v1.0.2
-	go4.org v0.0.0-20200104003542-c7e774b10ea0
-	golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543
+	github.com/ipfs/go-log v1.0.4
+	go4.org v0.0.0-20200411211856-f5505b9728dd
 )
 
-go 1.12
+go 1.13