Do not use legacy os.IsNotExist

diff --git a/buildlog.go b/buildlog.go
index 297808080f112443487832145e17ce6753d4bdb4..b0d2f2d620b1961a306576594c501517f88763f7 100644 (file)
--- a/buildlog.go
+++ b/buildlog.go
@@ -23,6 +23,7 @@ import (
        "flag"
        "fmt"
        "io"
+       "io/fs"
        "os"
        "path"
        "sort"
@@ -204,7 +205,7 @@ func showBuildLog(dir, tgt string, buildLogRec map[string][]string, depth int) e
                }
                rec, err := parseBuildLogRec(subDir, subTgt)
                if err != nil {
-                       if os.IsNotExist(err) {
+                       if errors.Is(err, fs.ErrNotExist) {
                                continue
                        }
                        return err

diff --git a/depfix.go b/depfix.go
index 1f29122764bd75ca9a9a875f68951ca0b1fa398e..b045682f3c03cfe9c6013a6532cc65a1a68560b5 100644 (file)
--- a/depfix.go
+++ b/depfix.go
@@ -20,6 +20,7 @@ package main
 import (
        "errors"
        "io"
+       "io/fs"
        "os"
        "path"
        "strings"
@@ -55,7 +56,7 @@ func depFix(root string) error {
        redoDir := path.Join(root, RedoDir)
        dir, err = os.Open(redoDir)
        if err != nil {
-               if os.IsNotExist(err) {
+               if errors.Is(err, fs.ErrNotExist) {
                        return nil
                }
                return ErrLine(err)
@@ -112,7 +113,7 @@ func depFix(root string) error {
                                theirHsh := m["Hash"]
                                fd, err := os.Open(path.Join(root, dep))
                                if err != nil {
-                                       if os.IsNotExist(err) {
+                                       if errors.Is(err, fs.ErrNotExist) {
                                                tracef(
                                                        CDebug, "depfix: %s/%s -> %s: not exists",
                                                        root, entry.Name(), dep,

diff --git a/ood.go b/ood.go
index 8f3d7798d8ccf718b0e5ae8b9052b179e8ea7ade..1be39573bd4b15e2ad1ada84fec28210e9089337 100644 (file)
--- a/ood.go
+++ b/ood.go
@@ -23,6 +23,7 @@ import (
        "errors"
        "fmt"
        "io"
+       "io/fs"
        "log"
        "os"
        "path"
@@ -61,7 +62,7 @@ func FileExists(p string) bool {
                FileExistsCache[p] = true
                return true
        }
-       if os.IsNotExist(err) {
+       if errors.Is(err, fs.ErrNotExist) {
                FileExistsCache[p] = false
        }
        return false
@@ -176,7 +177,7 @@ func isOOD(cwd, tgtOrig string, level int, seen map[string]struct{}) (bool, erro
 
                inode, err := inodeFromFileByPath(path.Join(cwd, dep))
                if err != nil {
-                       if os.IsNotExist(err) {
+                       if errors.Is(err, fs.ErrNotExist) {
                                tracef(CDebug, "ood: %s%s -> %s: not exists", indent, tgtOrig, dep)
                                ood = true
                                OODCache[path.Join(cwd, dep)] = ood

diff --git a/run.go b/run.go
index 88adf66f2d9e4239b0596f82a9a0617f36d0438b..dd41fbcc01927463f327d043321f828e22a9637f 100644 (file)
--- a/run.go
+++ b/run.go
@@ -259,7 +259,7 @@ func runScript(tgtOrig string, errs chan error, forced, traced bool) error {
                        var depInfo *DepInfo
                        fdDep, err := os.Open(path.Join(redoDir, tgt+DepSuffix))
                        if err != nil {
-                               if os.IsNotExist(err) {
+                               if errors.Is(err, fs.ErrNotExist) {
                                        err = errors.New("was not built: no .rec")
                                }
                                goto Finish
@@ -710,7 +710,7 @@ func runScript(tgtOrig string, errs chan error, forced, traced bool) error {
                                return
                        }
                        tmpExists = true
-               } else if !os.IsNotExist(err) {
+               } else if !errors.Is(err, fs.ErrNotExist) {
                        runErr.Err = ErrLine(err)
                        errs <- runErr
                        return

diff --git a/sources.go b/sources.go
index 659df3a51d9ff76e352dcbc104b62e7d01a8be6b..d53e0e32501b880be35e737cf377602cf9f3ed5e 100644 (file)
--- a/sources.go
+++ b/sources.go
@@ -30,7 +30,7 @@ func sourcesWalker(tgts []string) ([]string, error) {
                cwd, f := path.Split(path.Join(Cwd, tgt))
                fdDep, err := os.Open(path.Join(cwd, RedoDir, f+DepSuffix))
                if err != nil {
-                       if os.IsNotExist(err) {
+                       if errors.Is(err, fs.ErrNotExist) {
                                continue
                        }
                        return nil, ErrLine(err)