Merge pull request 'Replace IfZero with cmp.Or' (#2854) from snematoda/revert-ifzero into forgejo

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2854
Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org>

modules/git/grep.go

@@ -6,14 +6,13 @@ package git
 import (
 	"bufio"
 	"bytes"
+	"cmp"
 	"context"
 	"errors"
 	"fmt"
 	"os"
 	"strconv"
 	"strings"
-
-	"code.gitea.io/gitea/modules/util"
 )
 
 type GrepResult struct {
@@ -59,8 +58,8 @@ func GrepSearch(ctx context.Context, repo *Repository, search string, opts GrepO
 	} else {
 		cmd.AddOptionValues("-e", strings.TrimLeft(search, "-"))
 	}
-	cmd.AddDynamicArguments(util.IfZero(opts.RefName, "HEAD"))
+	cmd.AddDynamicArguments(cmp.Or(opts.RefName, "HEAD"))
-	opts.MaxResultLimit = util.IfZero(opts.MaxResultLimit, 50)
+	opts.MaxResultLimit = cmp.Or(opts.MaxResultLimit, 50)
 	stderr := bytes.Buffer{}
 	err = cmd.Run(&RunOpts{
 		Dir:    repo.Path,

modules/util/util.go

@@ -212,12 +212,3 @@ func ToFloat64(number any) (float64, error) {
 func ToPointer[T any](val T) *T {
 	return &val
 }
-
-// IfZero returns "def" if "v" is a zero value, otherwise "v"
-func IfZero[T comparable](v, def T) T {
-	var zero T
-	if v == zero {
-		return def
-	}
-	return v
-}