From 4cf1dbe4348f796f043a85a62761be52dd7ef859 Mon Sep 17 00:00:00 2001
From: Sergey Matveev <stargrave@stargrave.org>
Date: Sat, 30 Sep 2023 15:19:25 +0300
Subject: [PATCH] Do not use legacy os.IsNotExist

---
 buildlog.go | 3 ++-
 depfix.go   | 5 +++--
 ood.go      | 5 +++--
 run.go      | 4 ++--
 sources.go  | 2 +-
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/buildlog.go b/buildlog.go
index 2978080..b0d2f2d 100644
--- 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 1f29122..b045682 100644
--- 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 8f3d779..1be3957 100644
--- 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 88adf66..dd41fbc 100644
--- 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 659df3a..d53e0e3 100644
--- 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)
-- 
2.44.0