Factored sliceContainsSourceFile into a proper method

Author: cmaglie

legacy/builder/types/accessories.go

@@ -50,11 +50,20 @@ func (queue UniqueSourceFileQueue) Less(i, j int) bool { return false }
 func (queue UniqueSourceFileQueue) Swap(i, j int)      { panic("Who called me?!?") }
 
 func (queue *UniqueSourceFileQueue) Push(value *SourceFile) {
-	if !sliceContainsSourceFile(*queue, value) {
+	if !queue.Contains(value) {
 		*queue = append(*queue, value)
 	}
 }
 
+func (queue UniqueSourceFileQueue) Contains(target *SourceFile) bool {
+	for _, elem := range queue {
+		if elem.Equals(target) {
+			return true
+		}
+	}
+	return false
+}
+
 func (queue *UniqueSourceFileQueue) Pop() *SourceFile {
 	old := *queue
 	x := old[0]

legacy/builder/types/types.go

@@ -31,6 +31,11 @@ type SourceFile struct {
 	RelativePath *paths.Path
 }
 
+func (f *SourceFile) Equals(g *SourceFile) bool {
+	return f.Origin == g.Origin &&
+		f.RelativePath.EqualsTo(g.RelativePath)
+}
+
 // Create a SourceFile containing the given source file path within the
 // given origin. The given path can be absolute, or relative within the
 // origin's root source folder

legacy/builder/types/utils.go

@@ -24,12 +24,3 @@ func sliceContains(slice []string, target string) bool {
 	}
 	return false
 }
-
-func sliceContainsSourceFile(slice []SourceFile, target *SourceFile) bool {
-	for _, elem := range slice {
-		if elem.Origin == target.Origin && elem.RelativePath.EqualsTo(target.RelativePath) {
-			return true
-		}
-	}
-	return false
-}