regexp/syntax: use min func

qiulaidongfeng · gopherbot · commit 3bd30298dd3b · 2023-10-03T19:49:07.000Z
Change-Id: I679c906057577d4a795c07a2f572b969c3ee14d5 GitHub-Last-Rev: fba371d GitHub-Pull-Request: #63350 Reviewed-on: https://go-review.googlesource.com/c/go/+/532218 LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: Michael Pratt <mpratt@google.com> Auto-Submit: Ian Lance Taylor <iant@google.com> Reviewed-by: Ian Lance Taylor <iant@google.com>
diff --git a/src/regexp/syntax/parse.go b/src/regexp/syntax/parse.go
@@ -382,14 +382,12 @@ func minFoldRune(r rune) rune {
 	if r < minFold || r > maxFold {
 		return r
 	}
-	min := r
+	m := r
 	r0 := r
 	for r = unicode.SimpleFold(r); r != r0; r = unicode.SimpleFold(r) {
-		if min > r {
-			min = r
-		}
+		m = min(m, r)
 	}
-	return min
+	return m
 }
 
 // op pushes a regexp with the given op onto the stack

Original file line number	Diff line number	Diff line change
`@@ -382,14 +382,12 @@ func minFoldRune(r rune) rune {`
`382`	`382`	`if r < minFold \|\| r > maxFold {`
`383`	`383`	`return r`
`384`	`384`	`}`
`385`		`- min := r`
	`385`	`+ m := r`
`386`	`386`	`r0 := r`
`387`	`387`	`for r = unicode.SimpleFold(r); r != r0; r = unicode.SimpleFold(r) {`
`388`		`- if min > r {`
`389`		`- min = r`
`390`		`- }`
	`388`	`+ m = min(m, r)`
`391`	`389`	`}`
`392`		`- return min`
	`390`	`+ return m`
`393`	`391`	`}`
`394`	`392`
`395`	`393`	`// op pushes a regexp with the given op onto the stack`