Use Go builtin min/max func

utils/gravatar/gravatar.go

@@ -4,8 +4,6 @@ import (
 	"crypto/md5"
 	"fmt"
 	"strings"
-
-	"github.com/navidrome/navidrome/utils/number"
 )
 
 const baseUrl = "https://www.gravatar.com/avatar"
@@ -19,7 +17,7 @@ func Url(email string, size int) string {
 	if size < 1 {
 		size = defaultSize
 	}
-	size = number.Min(maxSize, size)
+	size = min(maxSize, size)
 
 	return fmt.Sprintf("%s/%x?s=%d", baseUrl, hash, size)
 }

utils/number/number.go

@@ -3,40 +3,8 @@ package number
 import (
 	"crypto/rand"
 	"math/big"
-
-	"golang.org/x/exp/constraints"
 )
 
-// TODO Remove on Go 1.22, in favor of builtin `min` function.
-func Min[T constraints.Ordered](vs ...T) T {
-	if len(vs) == 0 {
-		var zero T
-		return zero
-	}
-	min := vs[0]
-	for _, v := range vs[1:] {
-		if v < min {
-			min = v
-		}
-	}
-	return min
-}
-
-// TODO Remove on Go 1.22, in favor of builtin `max` function.
-func Max[T constraints.Ordered](vs ...T) T {
-	if len(vs) == 0 {
-		var zero T
-		return zero
-	}
-	max := vs[0]
-	for _, v := range vs[1:] {
-		if v > max {
-			max = v
-		}
-	}
-	return max
-}
-
 func RandomInt64(max int64) int64 {
 	rnd, _ := rand.Int(rand.Reader, big.NewInt(max))
 	return rnd.Int64()

utils/number/number_test.go

@@ -13,26 +13,10 @@ func TestNumber(t *testing.T) {
 	RunSpecs(t, "Number Suite")
 }
 
-var _ = Describe("Min", func() {
-	It("returns zero value if no arguments are passed", func() {
-		Expect(number.Min[int]()).To(BeZero())
-	})
-	It("returns the smallest int", func() {
-		Expect(number.Min(1, 2)).To(Equal(1))
-	})
-	It("returns the smallest float", func() {
-		Expect(number.Min(-4.1, -4.2, -4.0)).To(Equal(-4.2))
-	})
-})
-
-var _ = Describe("Max", func() {
-	It("returns zero value if no arguments are passed", func() {
-		Expect(number.Max[int]()).To(BeZero())
-	})
-	It("returns the biggest int", func() {
-		Expect(number.Max(1, 2)).To(Equal(2))
-	})
-	It("returns the biggest float", func() {
-		Expect(number.Max(-4.1, -4.2, -4.0)).To(Equal(-4.0))
+var _ = Describe("RandomInt64", func() {
+	It("should return a random int64", func() {
+		for i := 0; i < 10000; i++ {
+			Expect(number.RandomInt64(100)).To(BeNumerically("<", 100))
+		}
 	})
 })