all: fix minmax

Change-Id: I1eacfe303e724fc4dfe371b10a3762627162285d
Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/753425
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
kokoro-CI: kokoro <noreply+kokoro@google.com>
Reviewed-by: Ethan Lee <ethanalee@google.com>

4 files changed, 6 insertions, 16 deletions

diff --git a/internal/database/database.go b/internal/database/database.go
index 5fd3af9e..917b6094 100644
--- a/internal/database/database.go
+++ b/internal/database/database.go
@@ -520,10 +520,7 @@ func (db *DB) BulkUpdate(ctx context.Context, table string, columns, types []str
 	}
 	query := buildBulkUpdateQuery(table, columns, types)
 	for left := 0; left < nRows; left += maxBulkUpdateArrayLen {
-		right := left + maxBulkUpdateArrayLen
-		if right > nRows {
-			right = nRows
-		}
+		right := min(left+maxBulkUpdateArrayLen, nRows)
 		var args []any
 		for _, vs := range values {
 			args = append(args, pq.Array(vs[left:right]))
diff --git a/internal/godoc/dochtml/internal/render/linkify.go b/internal/godoc/dochtml/internal/render/linkify.go
index f189e6ae..2cbcf41a 100644
--- a/internal/godoc/dochtml/internal/render/linkify.go
+++ b/internal/godoc/dochtml/internal/render/linkify.go
@@ -765,10 +765,9 @@ scan:
 		// Add traversed bytes from src to the appropriate line.
 		prevLines := strings.SplitAfter(string(src[lastOffset:offset]), "\n")
 		for i, ln := range prevLines {
-			n := line - len(prevLines) + i + 1
-			if n < 0 { // possible at EOF
-				n = 0
-			}
+			n := max(line-len(prevLines)+i+1,
+				// possible at EOF
+				0)
 			htmlLines[n] = append(htmlLines[n], safe.HTMLEscaped(ln))
 		}
 
diff --git a/internal/postgres/path_test.go b/internal/postgres/path_test.go
index 1b06d90b..e2b04d22 100644
--- a/internal/postgres/path_test.go
+++ b/internal/postgres/path_test.go
@@ -168,10 +168,7 @@ func TestUpsertPathsConcurrently(t *testing.T) {
 		i := i
 		go func() {
 			start := (10 * i) % len(paths)
-			end := start + 50
-			if end > len(paths) {
-				end = len(paths)
-			}
+			end := min(start+50, len(paths))
 			sub := paths[start:end]
 			got, err := upsertPathsInTx(ctx, testDB.db, sub)
 			if err == nil {
diff --git a/internal/postgres/searchdoc.go b/internal/postgres/searchdoc.go
index b78fffa0..60830e3f 100644
--- a/internal/postgres/searchdoc.go
+++ b/internal/postgres/searchdoc.go
@@ -53,10 +53,7 @@ func searchDocumentSections(synopsis, readmeFilename, readme string, maxSecWords
 	rwd := append(rwfd, rwr...)
 	// Keep maxSecWords of section D, but not more than maxReadmeFrac.
 	f := int(maxReadmeFrac * float64(len(rwd)))
-	nkeep := maxSecWords
-	if nkeep > f {
-		nkeep = f
-	}
+	nkeep := min(maxSecWords, f)
 	sectionD, _ := split(rwd, nkeep)
 
 	// If there is no synopsis, use first sentence of the README.