chore: Use io/fs.Skip{All,Dir} sentinel errors

internal/chezmoi/archive.go

@@ -200,7 +200,7 @@ HEADER:
 						switch err := processHeader(implicitDirHeader(dir+"/", header.ModTime), dir+"/"); {
 						case errors.Is(err, fs.SkipDir):
 							continue HEADER
-						case errors.Is(err, Break):
+						case errors.Is(err, fs.SkipAll):
 							return nil
 						case err != nil:
 							return err
@@ -211,7 +211,7 @@ HEADER:
 			switch err := processHeader(header, header.Name); {
 			case errors.Is(err, fs.SkipDir):
 				continue HEADER
-			case errors.Is(err, Break):
+			case errors.Is(err, fs.SkipAll):
 				return nil
 			case err != nil:
 				return err
@@ -281,7 +281,7 @@ FILE:
 					switch err := processHeader(fileInfo, dir+"/"); {
 					case errors.Is(err, fs.SkipDir):
 						continue FILE
-					case errors.Is(err, Break):
+					case errors.Is(err, fs.SkipAll):
 						return nil
 					case err != nil:
 						return err
@@ -306,7 +306,7 @@ FILE:
 		switch {
 		case errors.Is(err, fs.SkipDir):
 			skippedDirPrefixes = append(skippedDirPrefixes, zipFile.Name+"/")
-		case errors.Is(err, Break):
+		case errors.Is(err, fs.SkipAll):
 			return nil
 		case err != nil:
 			return err

internal/chezmoi/archive_test.go

@@ -107,7 +107,7 @@ func TestWalkArchive(t *testing.T) {
 				case "dir2":
 					return fs.SkipDir
 				case "symlink1":
-					return Break
+					return fs.SkipAll
 				default:
 					return nil
 				}

internal/chezmoi/chezmoi.go

@@ -9,11 +9,9 @@ import (
 	"crypto/sha256"
 	"crypto/sha512"
 	"fmt"
-	"io"
 	"io/fs"
 	"net"
 	"os"
-	"path/filepath"
 	"regexp"
 	"runtime"
 	"strconv"
@@ -31,12 +29,6 @@ var (
 	// DefaultTemplateOptions are the default template options.
 	DefaultTemplateOptions = []string{"missingkey=error"}
 
-	// Break indicates that a walk should be stopped.
-	Break = io.EOF
-
-	// Skip indicates that entry should be skipped.
-	Skip = filepath.SkipDir
-
 	// Umask is the process's umask.
 	Umask = fs.FileMode(0)
 )

internal/chezmoi/sourcestate.go

@@ -30,7 +30,6 @@ import (
 	"github.com/mitchellh/copystructure"
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
-	vfs "github.com/twpayne/go-vfs/v4"
 	"go.uber.org/multierr"
 	"golang.org/x/exp/maps"
 	"golang.org/x/exp/slices"
@@ -405,7 +404,7 @@ DEST_ABS_PATH:
 
 		if options.PreAddFunc != nil {
 			switch err := options.PreAddFunc(targetRelPath); {
-			case errors.Is(err, Skip):
+			case errors.Is(err, fs.SkipDir):
 				continue DEST_ABS_PATH
 			case err != nil:
 				return err
@@ -429,7 +428,7 @@ DEST_ABS_PATH:
 			if !oldSourceEntryRelPath.Empty() && oldSourceEntryRelPath != sourceEntryRelPath {
 				if options.ReplaceFunc != nil {
 					switch err := options.ReplaceFunc(targetRelPath, newSourceStateEntry, oldSourceStateEntry); {
-					case errors.Is(err, Skip):
+					case errors.Is(err, fs.SkipDir):
 						continue DEST_ABS_PATH
 					case err != nil:
 						return err
@@ -927,7 +926,7 @@ func (s *SourceState) Read(ctx context.Context, options *ReadOptions) error {
 			if err := s.addTemplateDataDir(sourceAbsPath, fileInfo); err != nil {
 				return err
 			}
-			return vfs.SkipDir
+			return fs.SkipDir
 		case isPrefixDotFormat(fileInfo.Name(), dataName):
 			if !s.readTemplateData {
 				return nil
@@ -937,7 +936,7 @@ func (s *SourceState) Read(ctx context.Context, options *ReadOptions) error {
 			if err := s.addTemplatesDir(ctx, sourceAbsPath); err != nil {
 				return err
 			}
-			return vfs.SkipDir
+			return fs.SkipDir
 		case s.templateDataOnly:
 			return nil
 		case isPrefixDotFormat(fileInfo.Name(), externalName) || isPrefixDotFormatDotTmpl(fileInfo.Name(), externalName):
@@ -947,7 +946,7 @@ func (s *SourceState) Read(ctx context.Context, options *ReadOptions) error {
 			if err := s.addExternalDir(ctx, sourceAbsPath); err != nil {
 				return err
 			}
-			return vfs.SkipDir
+			return fs.SkipDir
 		case fileInfo.Name() == ignoreName || fileInfo.Name() == ignoreName+TemplateSuffix:
 			return s.addPatterns(s.ignore, sourceAbsPath, parentSourceRelPath)
 		case fileInfo.Name() == removeName || fileInfo.Name() == removeName+TemplateSuffix:
@@ -960,14 +959,14 @@ func (s *SourceState) Read(ctx context.Context, options *ReadOptions) error {
 			for relPath, scriptSourceStateEntries := range scriptsDirSourceStateEntries {
 				addSourceStateEntries(relPath, scriptSourceStateEntries...)
 			}
-			return vfs.SkipDir
+			return fs.SkipDir
 		case fileInfo.Name() == VersionName:
 			return s.readVersionFile(sourceAbsPath)
 		case strings.HasPrefix(fileInfo.Name(), Prefix):
 			fallthrough
 		case strings.HasPrefix(fileInfo.Name(), ignorePrefix):
 			if fileInfo.IsDir() {
-				return vfs.SkipDir
+				return fs.SkipDir
 			}
 			return nil
 		case fileInfo.IsDir():
@@ -976,7 +975,7 @@ func (s *SourceState) Read(ctx context.Context, options *ReadOptions) error {
 				TargetRelPath(s.encryption.EncryptedSuffix()).
 				JoinString(da.TargetName)
 			if s.Ignore(targetRelPath) {
-				return vfs.SkipDir
+				return fs.SkipDir
 			}
 			sourceStateDir := s.newSourceStateDir(sourceAbsPath, sourceRelPath, da)
 			addSourceStateEntries(targetRelPath, sourceStateDir)
@@ -1353,7 +1352,7 @@ func (s *SourceState) addExternalDir(ctx context.Context, externalsDirAbsPath Ab
 			return fmt.Errorf("%s: not allowed in %s directory", externalAbsPath, externalsDirName)
 		case strings.HasPrefix(fileInfo.Name(), ignorePrefix):
 			if fileInfo.IsDir() {
-				return vfs.SkipDir
+				return fs.SkipDir
 			}
 			return nil
 		case fileInfo.Mode().IsRegular():
@@ -1449,7 +1448,7 @@ func (s *SourceState) addTemplateDataDir(sourceAbsPath AbsPath, fileInfo fs.File
 			return fmt.Errorf("%s: not allowed in %s directory", dataAbsPath, dataName)
 		case strings.HasPrefix(fileInfo.Name(), ignorePrefix):
 			if fileInfo.IsDir() {
-				return vfs.SkipDir
+				return fs.SkipDir
 			}
 			return nil
 		case fileInfo.Mode().IsRegular():
@@ -1482,7 +1481,7 @@ func (s *SourceState) addTemplatesDir(ctx context.Context, templatesDirAbsPath A
 			return fmt.Errorf("%s: not allowed in %s directory", templateAbsPath, TemplatesDirName)
 		case strings.HasPrefix(fileInfo.Name(), ignorePrefix):
 			if fileInfo.IsDir() {
-				return vfs.SkipDir
+				return fs.SkipDir
 			}
 			return nil
 		case fileInfo.Mode().IsRegular():
@@ -2481,7 +2480,7 @@ func (s *SourceState) readExternalArchiveFile(
 				sourceRelPath:    sourceRelPath,
 				targetStateEntry: targetStateEntry,
 			}
-			return Break
+			return fs.SkipAll
 		case fileInfo.Mode()&fs.ModeType == fs.ModeSymlink:
 			fileAttr := FileAttr{
 				TargetName: fileInfo.Name(),
@@ -2500,7 +2499,7 @@ func (s *SourceState) readExternalArchiveFile(
 				sourceRelPath:    sourceRelPath,
 				targetStateEntry: targetStateEntry,
 			}
-			return Break
+			return fs.SkipAll
 		default:
 			return fmt.Errorf("%s: unsupported mode %o", name, fileInfo.Mode()&fs.ModeType)
 		}
@@ -2694,7 +2693,7 @@ func (s *SourceState) readScriptsDir(
 			return fmt.Errorf("%s: not allowed in %s directory", sourceAbsPath, scriptsDirName)
 		case strings.HasPrefix(fileInfo.Name(), ignorePrefix):
 			if fileInfo.IsDir() {
-				return vfs.SkipDir
+				return fs.SkipDir
 			}
 			return nil
 		case fileInfo.IsDir():

internal/chezmoi/sourcestate_test.go

@@ -1946,7 +1946,7 @@ func (s *SourceState) applyAll(
 ) error {
 	for _, targetRelPath := range s.TargetRelPaths() {
 		switch err := s.Apply(targetSystem, destSystem, persistentState, targetDirAbsPath, targetRelPath, options); {
-		case errors.Is(err, Skip):
+		case errors.Is(err, fs.SkipDir):
 			continue
 		case err != nil:
 			return err

internal/chezmoi/sourcestatetreenode.go

@@ -67,7 +67,7 @@ func (n *sourceStateEntryTreeNode) ForEachNode(
 	targetRelPath RelPath, f func(RelPath, *sourceStateEntryTreeNode) error,
 ) error {
 	switch err := f(targetRelPath, n); {
-	case errors.Is(err, Skip):
+	case errors.Is(err, fs.SkipDir):
 		return nil
 	case err != nil:
 		return err

internal/cmd/addcmd.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"fmt"
+	"io/fs"
 
 	"github.com/spf13/cobra"
 
@@ -106,7 +107,7 @@ func (c *Config) defaultPreAddFunc(targetRelPath chezmoi.RelPath) error {
 			c.Add.prompt = false
 			return nil
 		case choice == "no":
-			return chezmoi.Skip
+			return fs.SkipDir
 		case choice == "quit":
 			return chezmoi.ExitCodeError(0)
 		case choice == "yes":
@@ -161,7 +162,7 @@ func (c *Config) defaultReplaceFunc(
 			c.force = true
 			return nil
 		case choice == "no":
-			return chezmoi.Skip
+			return fs.SkipDir
 		case choice == "quit":
 			return chezmoi.ExitCodeError(0)
 		case choice == "yes":

internal/cmd/config.go

@@ -613,7 +613,7 @@ func (c *Config) applyArgs(
 		switch err := sourceState.Apply(
 			targetSystem, c.destSystem, c.persistentState, targetDirAbsPath, targetRelPath, applyOptions,
 		); {
-		case errors.Is(err, chezmoi.Skip):
+		case errors.Is(err, fs.SkipDir):
 			continue
 		case err != nil && c.keepGoing:
 			c.errorf("%v\n", err)
@@ -954,7 +954,7 @@ func (c *Config) defaultPreApplyFunc(
 			case choice == "yes":
 				return nil
 			case choice == "no":
-				return chezmoi.Skip
+				return fs.SkipDir
 			case choice == "all":
 				c.interactive = false
 				return nil
@@ -1003,7 +1003,7 @@ func (c *Config) defaultPreApplyFunc(
 			c.force = true
 			return nil
 		case choice == "skip":
-			return chezmoi.Skip
+			return fs.SkipDir
 		case choice == "quit":
 			return chezmoi.ExitCodeError(0)
 		default:

internal/cmd/mergeallcmd.go

@@ -1,6 +1,8 @@
 package cmd
 
 import (
+	"io/fs"
+
 	"github.com/spf13/cobra"
 
 	"github.com/twpayne/chezmoi/v2/internal/chezmoi"
@@ -47,7 +49,7 @@ func (c *Config) runMergeAllCmd(cmd *cobra.Command, args []string) error {
 			!targetEntryState.Equivalent(actualEntryState) {
 			targetRelPaths = append(targetRelPaths, targetRelPath)
 		}
-		return chezmoi.Skip
+		return fs.SkipDir
 	}
 	if err := c.applyArgs(cmd.Context(), dryRunSystem, c.DestDirAbsPath, args, applyArgsOptions{
 		cmd:          cmd,

internal/cmd/statuscmd.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"fmt"
+	"io/fs"
 	"strings"
 
 	"github.com/spf13/cobra"
@@ -75,7 +76,7 @@ func (c *Config) runStatusCmd(cmd *cobra.Command, args []string) error {
 		if x != ' ' || y != ' ' {
 			fmt.Fprintf(&builder, "%c%c %s\n", x, y, targetRelPath)
 		}
-		return chezmoi.Skip
+		return fs.SkipDir
 	}
 	if err := c.applyArgs(cmd.Context(), dryRunSystem, c.DestDirAbsPath, args, applyArgsOptions{
 		cmd:          cmd,

internal/cmd/unmanagedcmd.go

@@ -7,7 +7,6 @@ import (
 	"strings"
 
 	"github.com/spf13/cobra"
-	vfs "github.com/twpayne/go-vfs/v4"
 	"golang.org/x/exp/maps"
 
 	"github.com/twpayne/chezmoi/v2/internal/chezmoi"
@@ -81,13 +80,13 @@ func (c *Config) runUnmanagedCmd(
 		if fileInfo.IsDir() {
 			switch {
 			case !managed:
-				return vfs.SkipDir
+				return fs.SkipDir
 			case ignored:
-				return vfs.SkipDir
+				return fs.SkipDir
 			case sourceStateEntry != nil:
 				if external, ok := sourceStateEntry.Origin().(*chezmoi.External); ok {
 					if external.Type == chezmoi.ExternalTypeGitRepo {
-						return vfs.SkipDir
+						return fs.SkipDir
 					}
 				}
 			}

internal/cmd/upgradecmd.go

@@ -398,7 +398,7 @@ func (c *Config) replaceExecutable(
 			if err != nil {
 				return err
 			}
-			return chezmoi.Break
+			return fs.SkipAll
 		default:
 			return nil
 		}