From 6066c1a10e6eeef41b6b949b2e423386a4ed46ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6ran=20Karl?= <3951388+JoeKar@users.noreply.github.com> Date: Wed, 29 May 2024 20:33:46 +0200 Subject: [PATCH] buffer: Convert `os.Is()` into `errors.Is()` --- internal/buffer/buffer.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/internal/buffer/buffer.go b/internal/buffer/buffer.go index 68f5824c..d8d37883 100644 --- a/internal/buffer/buffer.go +++ b/internal/buffer/buffer.go @@ -7,6 +7,7 @@ import ( "errors" "fmt" "io" + "io/fs" "io/ioutil" "os" "path" @@ -238,7 +239,7 @@ func NewBufferFromFileAtLoc(path string, btype BufType, cursorLoc Loc) (*Buffer, } fileInfo, serr := os.Stat(filename) - if serr != nil && !os.IsNotExist(serr) { + if serr != nil && !errors.Is(serr, fs.ErrNotExist) { return nil, serr } if serr == nil && fileInfo.IsDir() { @@ -249,7 +250,7 @@ func NewBufferFromFileAtLoc(path string, btype BufType, cursorLoc Loc) (*Buffer, } f, err := os.OpenFile(filename, os.O_WRONLY, 0) - readonly := os.IsPermission(err) + readonly := errors.Is(err, fs.ErrPermission) f.Close() file, err := os.Open(filename) @@ -258,7 +259,7 @@ func NewBufferFromFileAtLoc(path string, btype BufType, cursorLoc Loc) (*Buffer, } var buf *Buffer - if os.IsNotExist(err) { + if errors.Is(err, fs.ErrNotExist) { // File does not exist -- create an empty buffer with that name buf = NewBufferFromString("", filename, btype) } else if err != nil { @@ -392,7 +393,7 @@ func NewBuffer(r io.Reader, size int64, path string, startcursor Loc, btype BufT // we know the filetype now, so update per-filetype settings config.UpdateFileTypeLocals(b.Settings, b.Settings["filetype"].(string)) - if _, err := os.Stat(filepath.Join(config.ConfigDir, "buffers")); os.IsNotExist(err) { + if _, err := os.Stat(filepath.Join(config.ConfigDir, "buffers")); errors.Is(err, fs.ErrNotExist) { os.Mkdir(filepath.Join(config.ConfigDir, "buffers"), os.ModePerm) }