Use dir walking from stdlib instead of godirwalk

hmarr · hmarr · commit 85cd95aab610 · 2022-10-26T22:06:26.000-04:00
diff --git a/cmd/codeowners/main.go b/cmd/codeowners/main.go
@@ -7,7 +7,6 @@ import (
 	"strings"
 
 	"github.com/hmarr/codeowners"
-	"github.com/karrick/godirwalk"
 	flag "github.com/spf13/pflag"
 )
 
@@ -60,19 +59,16 @@ func main() {
 			continue
 		}
 
-		err = godirwalk.Walk(startPath, &godirwalk.Options{
-			Callback: func(path string, dirent *godirwalk.Dirent) error {
-				if path == ".git" {
-					return filepath.SkipDir
-				}
-
-				// Only show code owners for files, not directories
-				if !dirent.IsDir() {
-					return printFileOwners(ruleset, path, ownerFilters, showUnowned)
-				}
-				return nil
-			},
-			Unsorted: true,
+		err = filepath.WalkDir(startPath, func(path string, d os.DirEntry, err error) error {
+			if path == ".git" {
+				return filepath.SkipDir
+			}
+
+			// Only show code owners for files, not directories
+			if !d.IsDir() {
+				return printFileOwners(ruleset, path, ownerFilters, showUnowned)
+			}
+			return nil
 		})
 
 		if err != nil {
diff --git a/go.mod b/go.mod
@@ -3,7 +3,6 @@ module github.com/hmarr/codeowners
 go 1.14
 
 require (
-	github.com/karrick/godirwalk v1.17.0
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.8.0
 )
diff --git a/go.sum b/go.sum
@@ -1,8 +1,6 @@
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/karrick/godirwalk v1.17.0 h1:b4kY7nqDdioR/6qnbHQyDvmA17u5G1cZ6J+CZXwSWoI=
-github.com/karrick/godirwalk v1.17.0/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@ module github.com/hmarr/codeowners`
`3`	`3`	`go 1.14`
`4`	`4`
`5`	`5`	`require (`
`6`		`- github.com/karrick/godirwalk v1.17.0`
`7`	`6`	`github.com/spf13/pflag v1.0.5`
`8`	`7`	`github.com/stretchr/testify v1.8.0`
`9`	`8`	`)`