refactor: replace math.Min/Max with builtin min/max

alecthomas · claude · alecthomas · commit b1512744ad0b · 2026-07-05T12:05:21.000+10:00
ClampBrightness's min/max parameters are renamed low/high as they
would shadow the builtins. In serialise.go the builtins operate on
float32 directly, removing the float64 round-trips and the math
import.

Co-Authored-By: Claude Fable 5 &lt;noreply@anthropic.com&gt;
diff --git a/colour.go b/colour.go
@@ -101,17 +101,17 @@ func (c Colour) BrightenOrDarken(factor float64) Colour {
 }
 
 // ClampBrightness returns a copy of this colour with its brightness adjusted such that
-// it falls within the range [min, max] (or very close to it due to rounding errors).
+// it falls within the range [low, high] (or very close to it due to rounding errors).
 // The supplied values use the same [0.0, 1.0] range as Brightness.
-func (c Colour) ClampBrightness(min, max float64) Colour {
+func (c Colour) ClampBrightness(low, high float64) Colour {
 	if !c.IsSet() {
 		return c
 	}
 
-	min = math.Max(min, 0)
-	max = math.Min(max, 1)
+	low = max(low, 0)
+	high = min(high, 1)
 	current := c.Brightness()
-	target := math.Min(math.Max(current, min), max)
+	target := min(max(current, low), high)
 	if current == target {
 		return c
 	}
diff --git a/colour_test.go b/colour_test.go
@@ -1,7 +1,6 @@
 package chroma
 
 import (
-	"math"
 	"testing"
 
 	assert "github.com/alecthomas/assert/v2"
@@ -48,16 +47,16 @@ func hue(c Colour) float64 {
 	g := float64(c.Green()) / 255
 	b := float64(c.Blue()) / 255
 
-	min := math.Min(math.Min(r, g), b)
-	max := math.Max(math.Max(r, g), b)
+	lo := min(r, g, b)
+	hi := max(r, g, b)
 
 	switch {
-	case r == min:
-		return (g - b) / (max - min)
-	case g == min:
-		return 2 + (b-r)/(max-min)
+	case r == lo:
+		return (g - b) / (hi - lo)
+	case g == lo:
+		return 2 + (b-r)/(hi-lo)
 	default:
-		return 4 + (r-g)/(max-min)
+		return 4 + (r-g)/(hi-lo)
 	}
 }
 
diff --git a/serialise.go b/serialise.go
@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"io"
 	"io/fs"
-	"math"
 	"path/filepath"
 	"reflect"
 	"regexp"
@@ -173,15 +172,15 @@ func NewXMLLexer(from fs.FS, path string) (*RegexLexer, error) {
 				}
 
 				if ok && config.Analyse.First {
-					return float32(math.Min(float64(ra.score), 1.0))
+					return min(ra.score, 1.0)
 				}
 
 				if ok {
 					score += ra.score
 				}
 			}
 
-			return float32(math.Min(float64(score), 1.0))
+			return min(score, 1.0)
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@ import (`
`7`	`7`	`"fmt"`
`8`	`8`	`"io"`
`9`	`9`	`"io/fs"`
`10`		`- "math"`
`11`	`10`	`"path/filepath"`
`12`	`11`	`"reflect"`
`13`	`12`	`"regexp"`
`@@ -173,15 +172,15 @@ func NewXMLLexer(from fs.FS, path string) (*RegexLexer, error) {`
`173`	`172`	`}`
`174`	`173`
`175`	`174`	`if ok && config.Analyse.First {`
`176`		`- return float32(math.Min(float64(ra.score), 1.0))`
	`175`	`+ return min(ra.score, 1.0)`
`177`	`176`	`}`
`178`	`177`
`179`	`178`	`if ok {`
`180`	`179`	`score += ra.score`
`181`	`180`	`}`
`182`	`181`	`}`
`183`	`182`
`184`		`- return float32(math.Min(float64(score), 1.0))`
	`183`	`+ return min(score, 1.0)`
`185`	`184`	`}`
`186`	`185`	`}`
`187`	`186`