From fc039167d200b423c95807758628e4899e3ca7df Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Sun, 3 Sep 2023 18:34:57 +0800 Subject: Use Go 1.21 and update dependencies (#26878) To make sure Gitea's next release's lifecycle could have active Golang support. And min/max are builtin now. --- services/gitdiff/csv.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'services/gitdiff') diff --git a/services/gitdiff/csv.go b/services/gitdiff/csv.go index 5781d7e909..8db73c56a3 100644 --- a/services/gitdiff/csv.go +++ b/services/gitdiff/csv.go @@ -7,8 +7,6 @@ import ( "encoding/csv" "errors" "io" - - "code.gitea.io/gitea/modules/util" ) const ( @@ -396,7 +394,7 @@ func tryMapColumnsByContent(baseCSVReader *csvReader, base2HeadColMap []int, hea headStart := 0 for base2HeadColMap[i] == unmappedColumn && headStart < len(head2BaseColMap) { if head2BaseColMap[headStart] == unmappedColumn { - rows := util.Min(maxRowsToInspect, util.Max(0, util.Min(len(baseCSVReader.buffer), len(headCSVReader.buffer))-1)) + rows := min(maxRowsToInspect, max(0, min(len(baseCSVReader.buffer), len(headCSVReader.buffer))-1)) same := 0 for j := 1; j <= rows; j++ { baseCell, baseErr := getCell(baseCSVReader.buffer[j], i) -- cgit v1.2.3