From a5caae6b8f664a7f6a528855d82a79e14459be41 Mon Sep 17 00:00:00 2001
From: youzichuan <youzichuan6@outlook.com>
Date: Wed, 13 Aug 2025 15:42:49 +0800
Subject: [PATCH] refactor: use the built-in max/min to simplify the code

Signed-off-by: youzichuan <youzichuan6@outlook.com>
---
 internal/gopher-lua/state.go | 16 ++++------------
 internal/gopher-lua/vm.go    | 15 +++------------
 server/core_leaderboard.go   |  5 +----
 3 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/internal/gopher-lua/state.go b/internal/gopher-lua/state.go
index 5afa458513..9fe0b04bda 100644
--- a/internal/gopher-lua/state.go
+++ b/internal/gopher-lua/state.go
@@ -386,10 +386,8 @@ func (rg *registry) checkSize(requiredSize int) { // +inline-start
 } // +inline-end
 
 func (rg *registry) resize(requiredSize int) { // +inline-start
-	newSize := requiredSize + rg.growBy // give some padding
-	if newSize > rg.maxSize {
-		newSize = rg.maxSize
-	}
+	// give some padding
+	newSize := min(requiredSize+rg.growBy, rg.maxSize)
 	if newSize < requiredSize {
 		rg.handler.registryOverflow()
 		return
@@ -1037,10 +1035,7 @@ func (ls *LState) initCallFrame(cf *callFrame) { // +inline-start
 					   namedparam1 <- lbase
 					   namedparam2
 			*/
-			nvarargs := nargs - np
-			if nvarargs < 0 {
-				nvarargs = 0
-			}
+			nvarargs := max(nargs-np, 0)
 
 			ls.reg.SetTop(cf.LocalBase + nargs + np)
 			for i := 0; i < np; i++ {
@@ -1149,10 +1144,7 @@ func (ls *LState) pushCallFrame(cf callFrame, fn LValue, meta bool) { // +inline
 						   namedparam1 <- lbase
 						   namedparam2
 				*/
-				nvarargs := nargs - np
-				if nvarargs < 0 {
-					nvarargs = 0
-				}
+				nvarargs := max(nargs-np, 0)
 
 				ls.reg.SetTop(cf.LocalBase + nargs + np)
 				for i := 0; i < np; i++ {
diff --git a/internal/gopher-lua/vm.go b/internal/gopher-lua/vm.go
index 470855f2af..c0ea5cf310 100644
--- a/internal/gopher-lua/vm.go
+++ b/internal/gopher-lua/vm.go
@@ -783,10 +783,7 @@ func init() {
 									   namedparam1 <- lbase
 									   namedparam2
 							*/
-							nvarargs := nargs - np
-							if nvarargs < 0 {
-								nvarargs = 0
-							}
+							nvarargs := max(nargs-np, 0)
 
 							ls.reg.SetTop(cf.LocalBase + nargs + np)
 							for i := 0; i < np; i++ {
@@ -965,10 +962,7 @@ func init() {
 									   namedparam1 <- lbase
 									   namedparam2
 							*/
-							nvarargs := nargs - np
-							if nvarargs < 0 {
-								nvarargs = 0
-							}
+							nvarargs := max(nargs-np, 0)
 
 							ls.reg.SetTop(cf.LocalBase + nargs + np)
 							for i := 0; i < np; i++ {
@@ -1452,10 +1446,7 @@ func init() {
 			RA := lbase + A
 			B := int(inst & 0x1ff) //GETB
 			nparams := int(cf.Fn.Proto.NumParameters)
-			nvarargs := cf.NArgs - nparams
-			if nvarargs < 0 {
-				nvarargs = 0
-			}
+			nvarargs := max(cf.NArgs-nparams, 0)
 			nwant := B - 1
 			if B == 0 {
 				nwant = nvarargs
diff --git a/server/core_leaderboard.go b/server/core_leaderboard.go
index 32ee32997d..91c7b8ff72 100644
--- a/server/core_leaderboard.go
+++ b/server/core_leaderboard.go
@@ -846,10 +846,7 @@ func getLeaderboardRecordsHaystack(ctx context.Context, logger *zap.Logger, db *
 		if start < 0 || len(firstRecords) < secondLimit {
 			start = 0
 		}
-		end := start + limit
-		if end > numRecords {
-			end = numRecords
-		}
+		end := min(start+limit, numRecords)
 
 		if start > 0 {
 			// There was a previous result that was discarded, the prev_cursor should be set.