Skip to content

Commit c66f7c6

Browse files
itaydItay Donanhirsh
itayd
authored and
Itay Donanhirsh
committed
zlog - remove zap
1 parent e3b6cde commit c66f7c6

20 files changed

Lines changed: 379 additions & 114 deletions

File tree

‎cmd/clutter/cmd_resolve.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import (
55
"os"
66

77
cli "github.com/urfave/cli/v2"
8-
"go.uber.org/zap"
98

109
"github.com/cluttercode/clutter/internal/pkg/index"
1110
"github.com/cluttercode/clutter/internal/pkg/resolver"
1211
"github.com/cluttercode/clutter/internal/pkg/scanner"
12+
"github.com/cluttercode/clutter/pkg/zlog"
1313
)
1414

1515
var (
@@ -163,7 +163,7 @@ var (
163163

164164
z.Info("resolved tag")
165165

166-
r := func(z *zap.SugaredLogger, what *index.Entry, idx *index.Index, _ bool) ([]*index.Entry, error) {
166+
r := func(z *zlog.Logger, what *index.Entry, idx *index.Index, _ bool) ([]*index.Entry, error) {
167167
return resolver.ResolveList(z, what, idx)
168168
}
169169

‎cmd/clutter/log.go‎

Lines changed: 8 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,22 @@
11
package main
22

33
import (
4-
"fmt"
5-
"time"
6-
7-
"go.uber.org/zap"
8-
"go.uber.org/zap/zapcore"
4+
"github.com/cluttercode/clutter/pkg/zlog"
95
)
106

11-
var z *zap.SugaredLogger = zap.NewNop().Sugar()
7+
var z *zlog.Logger = zlog.NewNopLogger()
128

139
func initLogger(level string, color bool) error {
14-
zcfg := zap.NewDevelopmentConfig()
15-
16-
zcfg.DisableStacktrace = true
17-
18-
zcfg.EncoderConfig.EncodeLevel = zapcore.CapitalColorLevelEncoder
19-
if !color {
20-
zcfg.EncoderConfig.EncodeLevel = zapcore.CapitalLevelEncoder
21-
}
22-
23-
zcfg.EncoderConfig.EncodeTime = func(time.Time, zapcore.PrimitiveArrayEncoder) {}
10+
b := zlog.NewDefaultBackend()
2411

25-
if level != "debug" {
26-
zcfg.EncoderConfig.EncodeDuration = nil
27-
zcfg.EncoderConfig.EncodeCaller = nil
28-
}
29-
30-
if err := zcfg.Level.UnmarshalText([]byte(level)); err != nil {
31-
return fmt.Errorf(`invalid log level "%s": %w`, level, err)
32-
}
33-
34-
zz, err := zcfg.Build(zap.AddCaller())
12+
lvl, err := zlog.ParseLevelString(level)
3513
if err != nil {
36-
return fmt.Errorf("failed initializing log: %w", err)
14+
return err
3715
}
3816

39-
z = zz.Sugar()
17+
b.Level = lvl
18+
19+
z = &zlog.Logger{Backend: b}
4020

4121
return nil
4222
}

‎go.mod‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@ go 1.15
44

55
require (
66
github.com/fsnotify/fsnotify v1.4.9
7-
github.com/stretchr/testify v1.7.0
7+
github.com/kr/pretty v0.2.1 // indirect
88
github.com/urfave/cli/v2 v2.3.0
9-
go.uber.org/zap v1.16.0
109
golang.org/x/sys v0.0.0-20210113181707-4bcb84eeeb78 // indirect
11-
golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5
10+
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
1211
gopkg.in/yaml.v2 v2.4.0
1312
)

‎go.sum‎

Lines changed: 2 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,27 @@
1-
github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
21
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
32
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY=
43
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
5-
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
6-
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
7-
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
84
github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
95
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
10-
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
11-
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
12-
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
13-
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
6+
github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
7+
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
148
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
159
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
1610
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
17-
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
18-
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
1911
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
2012
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
21-
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
2213
github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=
2314
github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
2415
github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
2516
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
26-
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
27-
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
28-
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
29-
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
30-
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
3117
github.com/urfave/cli/v2 v2.3.0 h1:qph92Y649prgesehzOrQjdWyxFOp/QVM+6imKHad91M=
3218
github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
33-
go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk=
34-
go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
35-
go.uber.org/multierr v1.5.0 h1:KCa4XfM8CWFCpxXRGok+Q0SS/0XBhMDbHHGABQLvD2A=
36-
go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
37-
go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee h1:0mgffUl7nfd+FpvXMVz4IDEaUSmT1ysygQC7qYo7sG4=
38-
go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
39-
go.uber.org/zap v1.16.0 h1:uFRZXykJGK9lLY4HtgSw44DnIcAM+kRBP7x5m+NpAOM=
40-
go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ=
41-
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
42-
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
43-
golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs=
44-
golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
45-
golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
46-
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
47-
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
48-
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
49-
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
50-
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
51-
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
5219
golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
5320
golang.org/x/sys v0.0.0-20210113181707-4bcb84eeeb78 h1:nVuTkr9L6Bq62qpUqKo/RnZCFfzDBL0bYo6w9OJUqZY=
5421
golang.org/x/sys v0.0.0-20210113181707-4bcb84eeeb78/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
55-
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
56-
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
57-
golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
58-
golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
59-
golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5 h1:hKsoRgsbwY1NafxrwTs+k64bikrLBkAgPir1TNCj3Zs=
60-
golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
61-
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
6222
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
6323
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
6424
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
65-
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
66-
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
6725
gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
6826
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
6927
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
70-
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
71-
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
72-
honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM=
73-
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=

‎internal/pkg/linter/linter.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import (
88
"regexp"
99
"strings"
1010

11-
"go.uber.org/zap"
12-
1311
"github.com/cluttercode/clutter/internal/pkg/index"
12+
1413
"github.com/cluttercode/clutter/pkg/strmatcher"
14+
"github.com/cluttercode/clutter/pkg/zlog"
1515
)
1616

1717
type internalRule struct {
@@ -20,7 +20,7 @@ type internalRule struct {
2020
}
2121

2222
type Linter struct {
23-
z *zap.SugaredLogger
23+
z *zlog.Logger
2424

2525
config Config
2626

@@ -79,7 +79,7 @@ func (ir *internalRule) init(l *Linter, r Rule) error {
7979
return nil
8080
}
8181

82-
func NewLinter(z *zap.SugaredLogger, cfg Config) (*Linter, error) {
82+
func NewLinter(z *zlog.Logger, cfg Config) (*Linter, error) {
8383
l := &Linter{
8484
z: z,
8585
config: cfg,

‎internal/pkg/parser/parser_test.go‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
package parser
22

33
import (
4+
"reflect"
45
"testing"
56

6-
"github.com/stretchr/testify/assert"
7-
87
"github.com/cluttercode/clutter/internal/pkg/scanner"
98
)
109

@@ -206,19 +205,31 @@ func TestParseElement(t *testing.T) {
206205
)
207206

208207
if test.err {
209-
assert.Error(t, err)
208+
if err == nil {
209+
t.Errorf("error expected, but got nil")
210+
}
211+
210212
return
211213
}
212214

213-
if !assert.NoError(t, err) {
215+
if err != nil {
216+
t.Errorf("got error: %v", err)
214217
return
215218
}
216219

217-
assert.Equal(t, test.name, ent.Name)
218-
assert.EqualValues(t, test.attrs, ent.Attrs)
220+
if test.name != ent.Name {
221+
t.Errorf("name: %q != %q", test.name, ent.Name)
222+
}
223+
224+
if reflect.DeepEqual(test.attrs, ent.Attrs) {
225+
t.Errorf("attrs: %v != %v", test.attrs, ent.Attrs)
226+
}
219227

220228
_, s := ent.IsSearch()
221-
assert.Equal(t, test.search, s)
229+
230+
if test.search != s {
231+
t.Errorf("search: %v != %v", test.search, s)
232+
}
222233
})
223234
}
224235
}

‎internal/pkg/resolver/resolver.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,26 @@ package resolver
33
import (
44
"fmt"
55

6-
"go.uber.org/zap"
6+
"github.com/cluttercode/clutter/pkg/zlog"
77

88
"github.com/cluttercode/clutter/internal/pkg/index"
99
)
1010

1111
type params struct{ next, prev, cycle, first, last bool }
1212

13-
func ResolveList(z *zap.SugaredLogger, what *index.Entry, idx *index.Index) ([]*index.Entry, error) {
13+
func ResolveList(z *zlog.Logger, what *index.Entry, idx *index.Index) ([]*index.Entry, error) {
1414
return resolve(z, what, idx, params{})
1515
}
1616

17-
func ResolveNext(z *zap.SugaredLogger, what *index.Entry, idx *index.Index, cycle bool) ([]*index.Entry, error) {
17+
func ResolveNext(z *zlog.Logger, what *index.Entry, idx *index.Index, cycle bool) ([]*index.Entry, error) {
1818
return resolve(z, what, idx, params{next: true, cycle: cycle})
1919
}
2020

21-
func ResolvePrev(z *zap.SugaredLogger, what *index.Entry, idx *index.Index, cycle bool) ([]*index.Entry, error) {
21+
func ResolvePrev(z *zlog.Logger, what *index.Entry, idx *index.Index, cycle bool) ([]*index.Entry, error) {
2222
return resolve(z, what, idx, params{prev: true, cycle: cycle})
2323
}
2424

25-
func resolve(z *zap.SugaredLogger, what *index.Entry, idx *index.Index, p params) ([]*index.Entry, error) {
25+
func resolve(z *zlog.Logger, what *index.Entry, idx *index.Index, p params) ([]*index.Entry, error) {
2626
if p.next && p.prev {
2727
z.Panic("prev and next are mutually exclusive")
2828
}

‎internal/pkg/scanner/filter.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,15 @@ import (
55
"path/filepath"
66
"strings"
77

8-
"go.uber.org/zap"
9-
108
"github.com/cluttercode/clutter/pkg/gitignore"
9+
"github.com/cluttercode/clutter/pkg/zlog"
1110
)
1211

1312
var defaultIgnores = []string{
1413
".git",
1514
}
1615

17-
func NewFilter(z *zap.SugaredLogger, cfg Config) (func(string, os.FileInfo) (bool, error), error) {
16+
func NewFilter(z *zlog.Logger, cfg Config) (func(string, os.FileInfo) (bool, error), error) {
1817
if len(cfg.Ignore) == 0 {
1918
cfg.Ignore = defaultIgnores
2019
}

‎internal/pkg/scanner/scan.go‎

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,31 @@ import (
55
"fmt"
66
"io"
77
"os"
8+
"unicode/utf8"
89

9-
"golang.org/x/tools/godoc/util"
10-
11-
"go.uber.org/zap"
10+
"github.com/cluttercode/clutter/pkg/zlog"
1211
)
1312

13+
func isText(s []byte) bool {
14+
const max = 1024 // at least utf8.UTFMax
15+
if len(s) > max {
16+
s = s[0:max]
17+
}
18+
for i, c := range string(s) {
19+
if i+utf8.UTFMax > len(s) {
20+
// last char may be incomplete - ignore
21+
break
22+
}
23+
if c == 0xFFFD || c < ' ' && c != '\n' && c != '\t' && c != '\f' {
24+
// decoding error or control character - not a text file
25+
return false
26+
}
27+
}
28+
return true
29+
}
30+
1431
func ScanFile(
15-
z *zap.SugaredLogger,
32+
z *zlog.Logger,
1633
cfg BracketConfig,
1734
path string,
1835
f func(*RawElement) error,
@@ -37,7 +54,7 @@ func ScanFile(
3754
return fmt.Errorf("read: %w", err)
3855
}
3956

40-
if !util.IsText(buf[:n]) {
57+
if !isText(buf[:n]) {
4158
z.Debug("not a text file, ignoring")
4259
return nil
4360
}

‎internal/pkg/scanner/scan_raw.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import (
66
"io"
77
"strings"
88

9-
"go.uber.org/zap"
9+
"github.com/cluttercode/clutter/pkg/zlog"
1010
)
1111

1212
func ScanRawReader(
13-
z *zap.SugaredLogger,
13+
z *zlog.Logger,
1414
cfg BracketConfig,
1515
r io.Reader,
1616
f func(*RawElement) error, // will not include path. path is filled in [# ./fill-path #].

0 commit comments

Comments
 (0)