Skip to content

Commit ac6060a

Browse files
authored
log: replace tmp with bytes.Buffer.AvailableBuffer (#29287)
1 parent 15eb977 commit ac6060a

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

log/format.go

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -79,24 +79,18 @@ func (h *TerminalHandler) format(buf []byte, r slog.Record, usecolor bool) []byt
7979
}
8080

8181
func (h *TerminalHandler) formatAttributes(buf *bytes.Buffer, r slog.Record, color string) {
82-
// tmp is a temporary buffer we use, until bytes.Buffer.AvailableBuffer() (1.21)
83-
// can be used.
84-
var tmp = make([]byte, 40)
8582
writeAttr := func(attr slog.Attr, first, last bool) {
8683
buf.WriteByte(' ')
8784

8885
if color != "" {
8986
buf.WriteString(color)
90-
//buf.Write(appendEscapeString(buf.AvailableBuffer(), attr.Key))
91-
buf.Write(appendEscapeString(tmp[:0], attr.Key))
87+
buf.Write(appendEscapeString(buf.AvailableBuffer(), attr.Key))
9288
buf.WriteString("\x1b[0m=")
9389
} else {
94-
//buf.Write(appendEscapeString(buf.AvailableBuffer(), attr.Key))
95-
buf.Write(appendEscapeString(tmp[:0], attr.Key))
90+
buf.Write(appendEscapeString(buf.AvailableBuffer(), attr.Key))
9691
buf.WriteByte('=')
9792
}
98-
//val := FormatSlogValue(attr.Value, true, buf.AvailableBuffer())
99-
val := FormatSlogValue(attr.Value, tmp[:0])
93+
val := FormatSlogValue(attr.Value, buf.AvailableBuffer())
10094

10195
padding := h.fieldPadding[attr.Key]
10296

0 commit comments

Comments
 (0)