From bcc7bf31671c85e536265b01af96fd03ab939b4e Mon Sep 17 00:00:00 2001
From: Philipp Wolfer <ph.wolfer@gmail.com>
Date: Mon, 15 Apr 2024 15:47:16 +0200
Subject: [PATCH] Replaced util Min/Max functions with builtin

---
 internal/backends/deezer/deezer.go   |  5 ++---
 internal/backends/spotify/spotify.go |  3 +--
 internal/similarity/similarity.go    |  2 +-
 internal/util/util.go                | 16 ----------------
 internal/util/util_test.go           | 12 ------------
 5 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/internal/backends/deezer/deezer.go b/internal/backends/deezer/deezer.go
index e840c93..3131c3e 100644
--- a/internal/backends/deezer/deezer.go
+++ b/internal/backends/deezer/deezer.go
@@ -26,7 +26,6 @@ import (
 	"go.uploadedlobster.com/scotty/internal/config"
 	"go.uploadedlobster.com/scotty/internal/i18n"
 	"go.uploadedlobster.com/scotty/internal/models"
-	"go.uploadedlobster.com/scotty/internal/util"
 	"golang.org/x/oauth2"
 )
 
@@ -106,7 +105,7 @@ out:
 		// and continue.
 		if offset >= result.Total {
 			p.Total = int64(result.Total)
-			offset = util.Max(result.Total-perPage, 0)
+			offset = max(result.Total-perPage, 0)
 			continue
 		}
 
@@ -175,7 +174,7 @@ out:
 		if offset >= result.Total {
 			p.Total = int64(result.Total)
 			totalCount = result.Total
-			offset = util.Max(result.Total-perPage, 0)
+			offset = max(result.Total-perPage, 0)
 			continue
 		}
 
diff --git a/internal/backends/spotify/spotify.go b/internal/backends/spotify/spotify.go
index b9a51e2..a4e3c87 100644
--- a/internal/backends/spotify/spotify.go
+++ b/internal/backends/spotify/spotify.go
@@ -28,7 +28,6 @@ import (
 	"go.uploadedlobster.com/scotty/internal/config"
 	"go.uploadedlobster.com/scotty/internal/i18n"
 	"go.uploadedlobster.com/scotty/internal/models"
-	"go.uploadedlobster.com/scotty/internal/util"
 	"golang.org/x/oauth2"
 	"golang.org/x/oauth2/spotify"
 )
@@ -184,7 +183,7 @@ out:
 		if offset >= result.Total {
 			p.Total = int64(result.Total)
 			totalCount = result.Total
-			offset = util.Max(result.Total-perPage, 0)
+			offset = max(result.Total-perPage, 0)
 			continue
 		}
 
diff --git a/internal/similarity/similarity.go b/internal/similarity/similarity.go
index 4c0b345..358404a 100644
--- a/internal/similarity/similarity.go
+++ b/internal/similarity/similarity.go
@@ -33,7 +33,7 @@ func Similarity(s1 string, s2 string) float64 {
 	s2 = norm.NFKC.String(s2)
 	l1 := len([]rune(s1))
 	l2 := len([]rune(s2))
-	maxLen := util.Max(l1, l2)
+	maxLen := max(l1, l2)
 	// Empty strings always compare full equal
 	if maxLen == 0 {
 		return 1.0
diff --git a/internal/util/util.go b/internal/util/util.go
index e8663a7..9ef4e14 100644
--- a/internal/util/util.go
+++ b/internal/util/util.go
@@ -17,22 +17,6 @@ package util
 
 import "golang.org/x/exp/constraints"
 
-func Max[T constraints.Ordered](m, n T) T {
-	if n > m {
-		return n
-	} else {
-		return m
-	}
-}
-
-func Min[T constraints.Ordered](m, n T) T {
-	if n < m {
-		return n
-	} else {
-		return m
-	}
-}
-
 func Sum[T constraints.Integer | constraints.Float](v ...T) T {
 	var sum T
 	for _, i := range v {
diff --git a/internal/util/util_test.go b/internal/util/util_test.go
index 73ec415..077fedd 100644
--- a/internal/util/util_test.go
+++ b/internal/util/util_test.go
@@ -23,18 +23,6 @@ import (
 	"go.uploadedlobster.com/scotty/internal/util"
 )
 
-func ExampleMax() {
-	v := util.Max(2, 5)
-	fmt.Print(v)
-	// Output: 5
-}
-
-func ExampleMin() {
-	v := util.Min(2, 5)
-	fmt.Print(v)
-	// Output: 2
-}
-
 func ExampleSum() {
 	values := []float64{1.4, 2.2}
 	sum := util.Sum(values...)