Improve code quality all around

export_test.go

@@ -1,18 +1,13 @@
 package slog
 
-import (
-	"io"
-)
-
 var Exits = 0
 var Errors = 0
 
 func init() {
 	exit = func(code int) {
 		Exits++
 	}
-	ferrorf = func(io.Writer, string, ...interface{}) (int, error) {
+	errorf = func(string, ...interface{}) {
 		Errors++
-		return 0, nil
 	}
 }

internal/humanfmt/humanfmt.go

@@ -102,10 +102,7 @@ func Entry(w io.Writer, ent slog.SinkEntry) string {
 		fields, _ := json.MarshalIndent(ent.Fields, "", "")
 		fields = bytes.ReplaceAll(fields, []byte(",\n"), []byte(", "))
 		fields = bytes.ReplaceAll(fields, []byte("\n"), []byte(""))
-		fields, err := highlightJSON(w, fields)
-		if err != nil {
-			println("humanfmt: failed to colorize fields JSON: " + err.Error())
-		}
+		fields = formatJSON(w, fields)
 		ents += "\t" + string(fields)
 	}
 

internal/humanfmt/json.go

@@ -25,20 +25,29 @@ var style = chroma.MustNewStyle("slog", chroma.StyleEntries{
 
 var jsonLexer = chroma.Coalesce(jlexers.JSON)
 
-func highlightJSON(w io.Writer, buf []byte) ([]byte, error) {
+func formatJSON(w io.Writer, buf []byte) []byte {
 	if !shouldColor(w) {
-		return buf, nil
+		return buf
 	}
 
+	highlighted, err := colorizeJSON(buf)
+	if err != nil {
+		println("humanfmt: failed to colorize fields JSON: " + err.Error())
+		return buf
+	}
+	return highlighted
+}
+
+func colorizeJSON(buf []byte) ([]byte, error) {
 	it, err := jsonLexer.Tokenise(nil, string(buf))
 	if err != nil {
-		return buf, err
+		return nil, err
 	}
 
-	b := bytes.NewBuffer(buf[:0])
+	b := &bytes.Buffer{}
 	err = formatters.TTY8.Format(b, style, it)
 	if err != nil {
-		return buf, err
+		return nil, err
 	}
 	return b.Bytes(), nil
 }

slog.go

@@ -267,7 +267,7 @@ func (l Logger) log(ctx context.Context, level Level, msg string, fields Map) {
 		}
 		err := s.sink.LogEntry(ctx, s.entry(ctx, ent))
 		if err != nil {
-			ferrorf(os.Stderr, "slog: sink with name %v and type %T failed to log entry: %+v", s.name, s.sink, err)
+			errorf("slog: sink with name %v and type %T failed to log entry: %+v", s.name, s.sink, err)
 			continue
 		}
 	}
@@ -282,15 +282,17 @@ func (l Logger) log(ctx context.Context, level Level, msg string, fields Map) {
 }
 
 var exit = os.Exit
-var ferrorf = fmt.Fprintf
+var errorf = func(f string, v ...interface{}) {
+	println(fmt.Sprintf(f, v...))
+}
 
 // Sync calls Sync on the sinks underlying the logger.
 // Used it to ensure all logs are flushed during exit.
 func (l Logger) Sync() {
 	for _, s := range l.sinks {
 		err := s.sink.Sync()
 		if err != nil {
-			ferrorf(os.Stderr, "slog: sink with name %v and type %T failed to sync: %+v\n", s.name, s.sink, err)
+			errorf("slog: sink with name %v and type %T failed to sync: %+v\n", s.name, s.sink, err)
 			continue
 		}
 	}