Factored a method in library.List

Author: cmaglie

arduino/libraries/librarieslist.go

@@ -41,14 +41,18 @@ func (list *List) Add(libs ...*Library) {
 	}
 }
 
-// Remove removes the library from the list
-func (list *List) Remove(library *Library) {
+// Remove removes the given library from the list
+func (list *List) Remove(libraryToRemove *Library) {
+	j := 0
 	for i, lib := range *list {
-		if lib == library {
-			*list = append((*list)[:i], (*list)[i+1:]...)
-			return
+		if lib != libraryToRemove {
+			if i != j {
+				(*list)[j] = (*list)[i]
+			}
+			j++
 		}
 	}
+	*list = (*list)[:j]
 }
 
 // FindByName returns the first library in the list that match

legacy/builder/resolve_library.go

@@ -58,20 +58,11 @@ func ResolveLibrary(ctx *types.Context, header string) *libraries.Library {
 		}
 	}
 
+	candidates.Remove(selected)
 	ctx.LibrariesResolutionResults[header] = types.LibraryResolutionResult{
 		Library:          selected,
-		NotUsedLibraries: filterOutLibraryFrom(candidates, selected),
+		NotUsedLibraries: candidates,
 	}
 
 	return selected
 }
-
-func filterOutLibraryFrom(libs libraries.List, libraryToRemove *libraries.Library) libraries.List {
-	filteredOutLibraries := []*libraries.Library{}
-	for _, lib := range libs {
-		if lib != libraryToRemove {
-			filteredOutLibraries = append(filteredOutLibraries, lib)
-		}
-	}
-	return filteredOutLibraries
-}