chore: Miscellaneous fixes

oSoWoSo · Oct 30, 2021 · d5398fd · d5398fd
1 parent 96d7bc4
commit d5398fd
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 9 deletions.
diff --git a/go.mod b/go.mod
@@ -53,7 +53,7 @@ require (
 require (
 	github.com/Microsoft/go-winio v0.5.1 // indirect
 	github.com/godbus/dbus/v5 v5.0.5 // indirect
-	github.com/google/gops v0.3.22 // indirect
+	github.com/google/gops v0.3.22
 	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/shopspring/decimal v1.3.0 // indirect
 	github.com/stretchr/objx v0.3.0 // indirect

diff --git a/internal/chezmoi/abspath.go b/internal/chezmoi/abspath.go
@@ -22,6 +22,13 @@ type AbsPath struct {
 	absPath string
 }
 
+// AbsPaths is a slice of RelPaths that implements sort.Interface.
+type AbsPaths []AbsPath
+
+func (ps AbsPaths) Len() int           { return len(ps) }
+func (ps AbsPaths) Less(i, j int) bool { return ps[i].Less(ps[j]) }
+func (ps AbsPaths) Swap(i, j int)      { ps[i], ps[j] = ps[j], ps[i] }
+
 // NewAbsPath returns a new AbsPath.
 func NewAbsPath(absPath string) AbsPath {
 	return AbsPath{
@@ -77,6 +84,11 @@ func (p AbsPath) Len() int {
 	return len(p.absPath)
 }
 
+// Less returns if p is less than other.
+func (p AbsPath) Less(other AbsPath) bool {
+	return p.absPath < other.absPath
+}
+
 // MarshalText implements encoding.TextMarshaler.MarshalText.
 func (p AbsPath) MarshalText() ([]byte, error) {
 	return []byte(p.absPath), nil

diff --git a/internal/chezmoi/relpath.go b/internal/chezmoi/relpath.go
@@ -19,9 +19,9 @@ type RelPath struct {
 // RelPaths is a slice of RelPaths that implements sort.Interface.
 type RelPaths []RelPath
 
-func (p RelPaths) Len() int           { return len(p) }
-func (p RelPaths) Less(i, j int) bool { return p[i].Less(p[j]) }
-func (p RelPaths) Swap(i, j int)      { p[i], p[j] = p[j], p[i] }
+func (ps RelPaths) Len() int           { return len(ps) }
+func (ps RelPaths) Less(i, j int) bool { return ps[i].Less(ps[j]) }
+func (ps RelPaths) Swap(i, j int)      { ps[i], ps[j] = ps[j], ps[i] }
 
 // NewRelPath returns a new RelPath.
 func NewRelPath(relPath string) RelPath {
@@ -31,7 +31,7 @@ func NewRelPath(relPath string) RelPath {
 }
 
 // AppendString appends s to p.
-func (p *RelPath) AppendString(s string) RelPath {
+func (p RelPath) AppendString(s string) RelPath {
 	return NewRelPath(p.relPath + s)
 }
 

diff --git a/internal/chezmoi/sourcestate.go b/internal/chezmoi/sourcestate.go
@@ -241,13 +241,11 @@ func (s *SourceState) Add(sourceSystem System, persistentState PersistentState,
 		sourceRelPaths []SourceRelPath
 	}
 
-	destAbsPaths := make([]AbsPath, 0, len(destAbsPathInfos))
+	destAbsPaths := make(AbsPaths, 0, len(destAbsPathInfos))
 	for destAbsPath := range destAbsPathInfos {
 		destAbsPaths = append(destAbsPaths, destAbsPath)
 	}
-	sort.Slice(destAbsPaths, func(i, j int) bool {
-		return destAbsPaths[i].absPath < destAbsPaths[j].absPath
-	})
+	sort.Sort(destAbsPaths)
 
 	sourceUpdates := make([]sourceUpdate, 0, len(destAbsPathInfos))
 	newSourceStateEntries := make(map[SourceRelPath]SourceStateEntry)