Standardise on using lo for slice functions

We've been sometimes using lo and sometimes using my slices package, and we need to pick one
for consistency. Lo is more extensive and better maintained so we're going with that.

My slices package was a superset of go's own slices package so in some places I've just used
the official one (the methods were just wrappers anyway).

I've also moved the remaining methods into the utils package.

1 files changed, 4 insertions, 4 deletions

diff --git a/pkg/gui/modes/cherrypicking/cherry_picking.go b/pkg/gui/modes/cherrypicking/cherry_picking.go
index 1fd34d473..ffbe51a80 100644
--- a/pkg/gui/modes/cherrypicking/cherry_picking.go
+++ b/pkg/gui/modes/cherrypicking/cherry_picking.go
@@ -2,8 +2,8 @@ package cherrypicking
 
 import (
 	"github.com/jesseduffield/generics/set"
-	"github.com/jesseduffield/generics/slices"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
+	"github.com/samber/lo"
 )
 
 type CherryPicking struct {
@@ -25,7 +25,7 @@ func (self *CherryPicking) Active() bool {
 }
 
 func (self *CherryPicking) SelectedShaSet() *set.Set[string] {
-	shas := slices.Map(self.CherryPickedCommits, func(commit *models.Commit) string {
+	shas := lo.Map(self.CherryPickedCommits, func(commit *models.Commit, _ int) string {
 		return commit.Sha
 	})
 	return set.NewFromSlice(shas)
@@ -46,11 +46,11 @@ func (self *CherryPicking) Remove(selectedCommit *models.Commit, commitsList []*
 }
 
 func (self *CherryPicking) update(selectedShaSet *set.Set[string], commitsList []*models.Commit) {
-	cherryPickedCommits := slices.Filter(commitsList, func(commit *models.Commit) bool {
+	cherryPickedCommits := lo.Filter(commitsList, func(commit *models.Commit, _ int) bool {
 		return selectedShaSet.Includes(commit.Sha)
 	})
 
-	self.CherryPickedCommits = slices.Map(cherryPickedCommits, func(commit *models.Commit) *models.Commit {
+	self.CherryPickedCommits = lo.Map(cherryPickedCommits, func(commit *models.Commit, _ int) *models.Commit {
 		return &models.Commit{Name: commit.Name, Sha: commit.Sha}
 	})
 }