Remove unnecessary SourceRelPaths type

twpayne · May 15, 2021 · df0ea51 · df0ea51
1 parent 9fbaba1
commit df0ea51
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/internal/chezmoi/chezmoi.go b/internal/chezmoi/chezmoi.go
@@ -73,7 +73,7 @@ var modeTypeNames = map[os.FileMode]string{
 
 type errDuplicateTarget struct {
 	targetRelPath  RelPath
-	sourceRelPaths SourceRelPaths
+	sourceRelPaths []SourceRelPath
 }
 
 func (e *errDuplicateTarget) Error() string {

diff --git a/internal/chezmoi/sourcerelpath.go b/internal/chezmoi/sourcerelpath.go
@@ -10,13 +10,6 @@ type SourceRelPath struct {
 	isDir   bool
 }
 
-// SourceRelPaths is a slice of SourceRelPaths that implements sort.Interface.
-type SourceRelPaths []SourceRelPath
-
-func (ps SourceRelPaths) Len() int           { return len(ps) }
-func (ps SourceRelPaths) Less(i, j int) bool { return string(ps[i].relPath) < string(ps[j].relPath) }
-func (ps SourceRelPaths) Swap(i, j int)      { ps[i], ps[j] = ps[j], ps[i] }
-
 // NewSourceRelDirPath returns a new SourceRelPath for a directory.
 func NewSourceRelDirPath(relPath RelPath) SourceRelPath {
 	return SourceRelPath{

diff --git a/internal/chezmoi/sourcestate.go b/internal/chezmoi/sourcestate.go
@@ -137,7 +137,7 @@ func (s *SourceState) Add(sourceSystem System, persistentState PersistentState,
 	type update struct {
 		destAbsPath    AbsPath
 		entryState     *EntryState
-		sourceRelPaths SourceRelPaths
+		sourceRelPaths []SourceRelPath
 	}
 
 	destAbsPaths := make([]AbsPath, 0, len(destAbsPathInfos))
@@ -192,7 +192,7 @@ DESTABSPATH:
 		update := update{
 			destAbsPath:    destAbsPath,
 			entryState:     entryState,
-			sourceRelPaths: SourceRelPaths{sourceEntryRelPath},
+			sourceRelPaths: []SourceRelPath{sourceEntryRelPath},
 		}
 
 		if oldSourceStateEntry, ok := s.entries[targetRelPath]; ok {
@@ -699,11 +699,13 @@ func (s *SourceState) Read() error {
 		if len(sourceStateEntries) == 1 {
 			continue
 		}
-		sourceRelPaths := make(SourceRelPaths, 0, len(sourceStateEntries))
+		sourceRelPaths := make([]SourceRelPath, 0, len(sourceStateEntries))
 		for _, sourceStateEntry := range sourceStateEntries {
 			sourceRelPaths = append(sourceRelPaths, sourceStateEntry.SourceRelPath())
 		}
-		sort.Sort(sourceRelPaths)
+		sort.Slice(sourceRelPaths, func(i, j int) bool {
+			return sourceRelPaths[i].relPath < sourceRelPaths[j].relPath
+		})
 		err = multierr.Append(err, &errDuplicateTarget{
 			targetRelPath:  targetRelPath,
 			sourceRelPaths: sourceRelPaths,