address review feedback

Signed-off-by: Callum Styan <[email protected]>

Author: cstyan

internal/entryhuman/entry.go

@@ -109,6 +109,18 @@ func bracketedLevel(l slog.Level) string {
 	}
 }
 
+func writeSignedInt(w io.Writer, n int64) (bool, error) {
+	var a [20]byte
+	_, err := w.Write(strconv.AppendInt(a[:0], n, 10))
+	return true, err
+}
+
+func writeUnsignedInt(w io.Writer, n uint64) (bool, error) {
+	var a [20]byte
+	_, err := w.Write(strconv.AppendUint(a[:0], n, 10))
+	return true, err
+}
+
 // Optimization to avoid allocation of heap allocations/temporary strings via formatValue when dealing with primitive types.
 // It returns (handled, error). When handled is false, the caller should fall back to formatValue.
 func writeValueFast(w io.Writer, v interface{}) (bool, error) {
@@ -126,47 +138,27 @@ func writeValueFast(w io.Writer, v interface{}) (bool, error) {
 
 	// signed ints
 	case int:
-		var a [20]byte
-		_, err := w.Write(strconv.AppendInt(a[:0], int64(x), 10))
-		return true, err
+		return writeSignedInt(w, int64(x))
 	case int8:
-		var a [20]byte
-		_, err := w.Write(strconv.AppendInt(a[:0], int64(x), 10))
-		return true, err
+		return writeSignedInt(w, int64(x))
 	case int16:
-		var a [20]byte
-		_, err := w.Write(strconv.AppendInt(a[:0], int64(x), 10))
-		return true, err
+		return writeSignedInt(w, int64(x))
 	case int32:
-		var a [20]byte
-		_, err := w.Write(strconv.AppendInt(a[:0], int64(x), 10))
-		return true, err
+		return writeSignedInt(w, int64(x))
 	case int64:
-		var a [20]byte
-		_, err := w.Write(strconv.AppendInt(a[:0], x, 10))
-		return true, err
+		return writeSignedInt(w, x)
 
 	// unsigned ints
 	case uint:
-		var a [20]byte
-		_, err := w.Write(strconv.AppendUint(a[:0], uint64(x), 10))
-		return true, err
+		return writeUnsignedInt(w, uint64(x))
 	case uint8:
-		var a [20]byte
-		_, err := w.Write(strconv.AppendUint(a[:0], uint64(x), 10))
-		return true, err
+		return writeUnsignedInt(w, uint64(x))
 	case uint16:
-		var a [20]byte
-		_, err := w.Write(strconv.AppendUint(a[:0], uint64(x), 10))
-		return true, err
+		return writeUnsignedInt(w, uint64(x))
 	case uint32:
-		var a [20]byte
-		_, err := w.Write(strconv.AppendUint(a[:0], uint64(x), 10))
-		return true, err
+		return writeUnsignedInt(w, uint64(x))
 	case uint64:
-		var a [20]byte
-		_, err := w.Write(strconv.AppendUint(a[:0], x, 10))
-		return true, err
+		return writeUnsignedInt(w, x)
 
 	// floats: prefer 'g' to keep output bounded (matches fmt default)
 	case float32:

internal/entryhuman/entry_test.go

@@ -6,6 +6,7 @@ import (
 	"flag"
 	"fmt"
 	"io"
+	"math"
 	"os"
 	"testing"
 	"time"
@@ -175,9 +176,11 @@ func TestEntry(t *testing.T) {
 				Fields: slog.M(
 					slog.F("zero_int", 0),
 					slog.F("neg_int", -999),
-					slog.F("max_int64", int64(9223372036854775807)),
-					slog.F("min_int64", int64(-9223372036854775808)),
-					slog.F("max_uint64", uint64(18446744073709551615)),
+					slog.F("max_int64", math.MaxInt64),
+					slog.F("min_int64", math.MinInt64),
+					// math.MaxUint64 is an untyped constant, and by default the compiler will assume a number
+					// value is an int, so we need an explicit cast to uint64 here.
+					slog.F("max_uint64", uint64(math.MaxUint64)),
 					slog.F("zero_float", 0.0),
 					slog.F("neg_float", -123.456),
 				),