misc: Upgrade Go to v1.21

Upgrade to 1.21 as 1.20 is now unmaintained.

Most changes are related to the new `slices` package from standard
library, which can replace some existing custom functions.
This commit is contained in:
Michael Manganiello
2024-03-05 09:49:10 -03:00
parent ea1b2f3284
commit 801967a530
19 changed files with 47 additions and 104 deletions
+5 -39
View File
@@ -2,32 +2,11 @@ package sharedutil
import (
"math"
"sort"
"slices"
"github.com/dweymouth/supersonic/backend/mediaprovider"
)
func SliceEqual[T comparable](a []T, b []T) bool {
if len(a) != len(b) {
return false
}
for i := 0; i < len(a); i++ {
if a[i] != b[i] {
return false
}
}
return true
}
func SliceContains[T comparable](ts []T, t T) bool {
for _, x := range ts {
if x == t {
return true
}
}
return false
}
func FilterSlice[T any](ss []T, test func(T) bool) []T {
if ss == nil {
return nil
@@ -52,19 +31,6 @@ func MapSlice[T any, U any](ts []T, f func(T) U) []U {
return result
}
func Find[T any](ts []T, f func(T) bool) int {
for i, tt := range ts {
if f(tt) {
return i
}
}
return -1
}
func IndexOf[T comparable](ts []T, t T) int {
return Find(ts, func(tt T) bool { return t == tt })
}
func Reversed[T any](ts []T) []T {
if ts == nil {
return nil
@@ -133,7 +99,7 @@ func ReorderTracks(tracks []*mediaprovider.Track, idxToMove []int, op TrackReord
topIdx := 0
botIdx := len(idxToMove)
for i, t := range tracks {
if SliceContains(idxToMove, i) {
if slices.Contains(idxToMove, i) {
newTracks[topIdx] = t
topIdx++
} else {
@@ -145,7 +111,7 @@ func ReorderTracks(tracks []*mediaprovider.Track, idxToMove []int, op TrackReord
topIdx := 0
botIdx := len(tracks) - len(idxToMove)
for i, t := range tracks {
if SliceContains(idxToMove, i) {
if slices.Contains(idxToMove, i) {
newTracks[botIdx] = t
botIdx++
} else {
@@ -178,7 +144,7 @@ func ReorderTracks(tracks []*mediaprovider.Track, idxToMove []int, op TrackReord
func firstIdxCanMoveUp(idxs []int) int {
prevIdx := -1
sort.Ints(idxs)
slices.Sort(idxs)
for _, idx := range idxs {
if idx > prevIdx+1 {
return idx
@@ -190,7 +156,7 @@ func firstIdxCanMoveUp(idxs []int) int {
func lastIdxCanMoveDown(idxs []int, lenSlice int) int {
prevIdx := lenSlice
sort.Ints(idxs)
slices.Sort(idxs)
for i := len(idxs) - 1; i >= 0; i-- {
idx := idxs[i]
if idx < prevIdx-1 {