Merge pull request #73 from Rican7/chore/modern-go

Update build tags and error checking to Go 1.18 standards
adrg · Mar 21, 2024 · 490abf7 · 490abf7
2 parents 4e30025 + 4f22cb2
commit 490abf7
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 12 deletions.
diff --git a/internal/pathutil/pathutil_plan9.go b/internal/pathutil/pathutil_plan9.go
@@ -1,6 +1,8 @@
 package pathutil
 
 import (
+	"errors"
+	"io/fs"
 	"os"
 	"path/filepath"
 	"strings"
@@ -9,7 +11,7 @@ import (
 // Exists returns true if the specified path exists.
 func Exists(path string) bool {
 	_, err := os.Stat(path)
-	return err == nil || os.IsExist(err)
+	return err == nil || errors.Is(err, fs.ErrExist)
 }
 
 // ExpandHome substitutes `~` and `$home` at the start of the specified

diff --git a/internal/pathutil/pathutil_plan9_test.go b/internal/pathutil/pathutil_plan9_test.go
@@ -1,5 +1,4 @@
 //go:build plan9
-// +build plan9
 
 package pathutil_test
 

diff --git a/internal/pathutil/pathutil_unix.go b/internal/pathutil/pathutil_unix.go
@@ -1,9 +1,10 @@
 //go:build aix || darwin || dragonfly || freebsd || (js && wasm) || nacl || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd js,wasm nacl linux netbsd openbsd solaris
 
 package pathutil
 
 import (
+	"errors"
+	"io/fs"
 	"os"
 	"path/filepath"
 	"strings"
@@ -12,7 +13,7 @@ import (
 // Exists returns true if the specified path exists.
 func Exists(path string) bool {
 	_, err := os.Stat(path)
-	return err == nil || os.IsExist(err)
+	return err == nil || errors.Is(err, fs.ErrExist)
 }
 
 // ExpandHome substitutes `~` and `$HOME` at the start of the specified

diff --git a/internal/pathutil/pathutil_unix_test.go b/internal/pathutil/pathutil_unix_test.go
@@ -1,5 +1,4 @@
 //go:build aix || darwin || dragonfly || freebsd || (js && wasm) || nacl || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd js,wasm nacl linux netbsd openbsd solaris
 
 package pathutil_test
 

diff --git a/internal/pathutil/pathutil_windows.go b/internal/pathutil/pathutil_windows.go
@@ -1,6 +1,8 @@
 package pathutil
 
 import (
+	"errors"
+	"io/fs"
 	"os"
 	"path/filepath"
 	"strings"
@@ -15,7 +17,7 @@ func Exists(path string) bool {
 		_, err = filepath.EvalSymlinks(path)
 	}
 
-	return err == nil || os.IsExist(err)
+	return err == nil || errors.Is(err, fs.ErrExist)
 }
 
 // ExpandHome substitutes `%USERPROFILE%` at the start of the specified

diff --git a/internal/pathutil/pathutil_windows_test.go b/internal/pathutil/pathutil_windows_test.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package pathutil_test
 

diff --git a/paths_darwin_test.go b/paths_darwin_test.go
@@ -1,5 +1,4 @@
 //go:build darwin
-// +build darwin
 
 package xdg_test
 

diff --git a/paths_plan9_test.go b/paths_plan9_test.go
@@ -1,5 +1,4 @@
 //go:build plan9
-// +build plan9
 
 package xdg_test
 

diff --git a/paths_unix.go b/paths_unix.go
@@ -1,5 +1,4 @@
 //go:build aix || dragonfly || freebsd || (js && wasm) || nacl || linux || netbsd || openbsd || solaris
-// +build aix dragonfly freebsd js,wasm nacl linux netbsd openbsd solaris
 
 package xdg
 

diff --git a/paths_unix_test.go b/paths_unix_test.go
@@ -1,5 +1,4 @@
 //go:build aix || dragonfly || freebsd || (js && wasm) || nacl || linux || netbsd || openbsd || solaris
-// +build aix dragonfly freebsd js,wasm nacl linux netbsd openbsd solaris
 
 package xdg_test
 

diff --git a/paths_windows_test.go b/paths_windows_test.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package xdg_test