From 3be6284b2d94a85257b236e835a2fd411fe033e4 Mon Sep 17 00:00:00 2001 From: Juha Ylitalo Date: Sun, 20 Aug 2023 14:39:47 +0300 Subject: [PATCH] Resolve complains from go-staticchecks. (#28) * Use context.TODO instead of nil (SA1012) * error variables should use err as prefix (ST1012) * Update line number in test output * minor refactoring --------- Co-authored-by: lmittmann --- handler_test.go | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/handler_test.go b/handler_test.go index d751fab..48b5886 100644 --- a/handler_test.go +++ b/handler_test.go @@ -245,7 +245,7 @@ func TestHandler(t *testing.T) { { // https://github.com/lmittmann/tint/issues/8 F: func(l *slog.Logger) { - l.Log(nil, slog.LevelInfo+1, "test") + l.Log(context.TODO(), slog.LevelInfo+1, "test") }, Want: `Nov 10 23:00:00.000 INF+1 test`, }, @@ -355,88 +355,88 @@ func BenchmarkLogAttrs(b *testing.B) { { "5 args", func(logger *slog.Logger) { - logger.LogAttrs(nil, slog.LevelInfo, testMessage, + logger.LogAttrs(context.TODO(), slog.LevelInfo, testMessage, slog.String("string", testString), slog.Int("status", testInt), slog.Duration("duration", testDuration), slog.Time("time", testTime), - slog.Any("error", testError), + slog.Any("error", errTest), ) }, }, { "5 args custom level", func(logger *slog.Logger) { - logger.LogAttrs(nil, slog.LevelInfo+1, testMessage, + logger.LogAttrs(context.TODO(), slog.LevelInfo+1, testMessage, slog.String("string", testString), slog.Int("status", testInt), slog.Duration("duration", testDuration), slog.Time("time", testTime), - slog.Any("error", testError), + slog.Any("error", errTest), ) }, }, { "10 args", func(logger *slog.Logger) { - logger.LogAttrs(nil, slog.LevelInfo, testMessage, + logger.LogAttrs(context.TODO(), slog.LevelInfo, testMessage, slog.String("string", testString), slog.Int("status", testInt), slog.Duration("duration", testDuration), slog.Time("time", testTime), - slog.Any("error", testError), + slog.Any("error", errTest), slog.String("string", testString), slog.Int("status", testInt), slog.Duration("duration", testDuration), slog.Time("time", testTime), - slog.Any("error", testError), + slog.Any("error", errTest), ) }, }, { "40 args", func(logger *slog.Logger) { - logger.LogAttrs(nil, slog.LevelInfo, testMessage, + logger.LogAttrs(context.TODO(), slog.LevelInfo, testMessage, slog.String("string", testString), slog.Int("status", testInt), slog.Duration("duration", testDuration), slog.Time("time", testTime), - slog.Any("error", testError), + slog.Any("error", errTest), slog.String("string", testString), slog.Int("status", testInt), slog.Duration("duration", testDuration), slog.Time("time", testTime), - slog.Any("error", testError), + slog.Any("error", errTest), slog.String("string", testString), slog.Int("status", testInt), slog.Duration("duration", testDuration), slog.Time("time", testTime), - slog.Any("error", testError), + slog.Any("error", errTest), slog.String("string", testString), slog.Int("status", testInt), slog.Duration("duration", testDuration), slog.Time("time", testTime), - slog.Any("error", testError), + slog.Any("error", errTest), slog.String("string", testString), slog.Int("status", testInt), slog.Duration("duration", testDuration), slog.Time("time", testTime), - slog.Any("error", testError), + slog.Any("error", errTest), slog.String("string", testString), slog.Int("status", testInt), slog.Duration("duration", testDuration), slog.Time("time", testTime), - slog.Any("error", testError), + slog.Any("error", errTest), slog.String("string", testString), slog.Int("status", testInt), slog.Duration("duration", testDuration), slog.Time("time", testTime), - slog.Any("error", testError), + slog.Any("error", errTest), slog.String("string", testString), slog.Int("status", testInt), slog.Duration("duration", testDuration), slog.Time("time", testTime), - slog.Any("error", testError), + slog.Any("error", errTest), ) }, }, @@ -471,5 +471,5 @@ var ( testString = "7e3b3b2aaeff56a7108fe11e154200dd/7819479873059528190" testInt = 32768 testDuration = 23 * time.Second - testError = errors.New("fail") + errTest = errors.New("fail") )