Fix various lint warnings and suggestions

diff --git a/r.go b/r.go
index a16f8477ea68ad9231679a1f2a7339ffb0140149..fbf83d70bad1cd15d0b44549aaafba3d90721f7b 100644 (file)
--- a/r.go
+++ b/r.go
@@ -69,7 +69,7 @@ func (r *Reader) Next() ([]Field, error) {
        var err error
        for {
                if !r.scanner.Scan() {
-                       if err := r.scanner.Err(); err != nil {
+                       if err = r.scanner.Err(); err != nil {
                                return fields, err
                        }
                        err = io.EOF

diff --git a/slog/handler.go b/slog/handler.go
index 5f6a98c6196790fb67523a49732fac1569ed56a8..84ac436a6a5eee1c8c667d215a057e098cf787d1 100644 (file)
--- a/slog/handler.go
+++ b/slog/handler.go
@@ -28,13 +28,13 @@ import (
 
 type RecfileHandler struct {
        W        io.Writer
-       Level    slog.Level
        LevelKey string
        MsgKey   string
        TimeKey  string
-       attrs    []slog.Attr
        group    string
        m        *sync.Mutex
+       attrs    []slog.Attr
+       Level    slog.Level
 }
 
 func NewRecfileHandler(