octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-12-22 19:08:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/fs: Use io/fs errors as recommended in std lib (#8726)

Browse Source
This commit is contained in:
Simon Frei 2022-12-21 23:42:22 +01:00 committed by GitHub
parent 09f4d865ae
commit 634a3d0e3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/fs/filesystem.go
View File

@ -10,6 +10,7 @@ import (
"context" "context"
"errors" "errors"
"io" "io"
"io/fs"
"os" "os"
"path/filepath" "path/filepath"
"strings" "strings"
@ -192,20 +193,25 @@ const OptWriteOnly = os.O_WRONLY
// as an error by any function. // as an error by any function.
var SkipDir = filepath.SkipDir var SkipDir = filepath.SkipDir
// IsExist is the equivalent of os.IsExist func IsExist(err error) bool {
var IsExist = os.IsExist return errors.Is(err, ErrExist)
}
// IsExist is the equivalent of os.ErrExist // ErrExist is the equivalent of os.ErrExist
var ErrExist = os.ErrExist var ErrExist = fs.ErrExist
// IsNotExist is the equivalent of os.IsNotExist // IsNotExist is the equivalent of os.IsNotExist
var IsNotExist = os.IsNotExist func IsNotExist(err error) bool {
return errors.Is(err, ErrNotExist)
}
// ErrNotExist is the equivalent of os.ErrNotExist // ErrNotExist is the equivalent of os.ErrNotExist
var ErrNotExist = os.ErrNotExist var ErrNotExist = fs.ErrNotExist
// IsPermission is the equivalent of os.IsPermission // IsPermission is the equivalent of os.IsPermission
var IsPermission = os.IsPermission func IsPermission(err error) bool {
return errors.Is(err, fs.ErrPermission)
}
// IsPathSeparator is the equivalent of os.IsPathSeparator // IsPathSeparator is the equivalent of os.IsPathSeparator
var IsPathSeparator = os.IsPathSeparator var IsPathSeparator = os.IsPathSeparator

4
lib/ignore/ignore_test.go
View File

@ -996,8 +996,8 @@ func TestIssue4901(t *testing.T) {
if err == nil { if err == nil {
t.Fatal("expected an error") t.Fatal("expected an error")
} }
if fs.IsNotExist(err) { if err == fs.ErrNotExist {
t.Fatal("unexpected error type") t.Fatalf("unexpected error type: %T", err)
} }
if !IsParseError(err) { if !IsParseError(err) {
t.Fatal("failure to load included file should be a parse error") t.Fatal("failure to load included file should be a parse error")