diff --git a/common_test.go b/common_test.go index f9df4ab..4a757db 100644 --- a/common_test.go +++ b/common_test.go @@ -96,7 +96,7 @@ func newLogRecord(msg string) *slog.Record { "source": "linux", "extra_key0": "hello", }, - // Caller: stdutil.GetCallerInfo(), + // Caller: goinfo.GetCallerInfo(), } r.Init(true) diff --git a/go.mod b/go.mod index 62cd070..7be022d 100644 --- a/go.mod +++ b/go.mod @@ -3,8 +3,8 @@ module github.com/gookit/slog go 1.18 require ( - github.com/gookit/color v1.5.3 - github.com/gookit/goutil v0.6.11 + github.com/gookit/color v1.5.4 + github.com/gookit/goutil v0.6.12 github.com/gookit/gsr v0.1.0 github.com/valyala/bytebufferpool v1.0.0 ) diff --git a/go.sum b/go.sum index cfaeb50..ebf74a7 100644 --- a/go.sum +++ b/go.sum @@ -1,12 +1,12 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/gookit/color v1.5.3 h1:twfIhZs4QLCtimkP7MOxlF3A0U/5cDPseRT9M/+2SCE= -github.com/gookit/color v1.5.3/go.mod h1:NUzwzeehUfl7GIb36pqId+UGmRfQcU/WiiyTTeNjHtE= -github.com/gookit/goutil v0.6.11 h1:615nIGRpQHFmgJ1oaA48q/z7bTx6KzMvHmKTsp21T2E= -github.com/gookit/goutil v0.6.11/go.mod h1:bU9ghaM9uW23x2+jB0WcywRsFGbIP0hvdIKYl2OMiog= +github.com/gookit/color v1.5.4 h1:FZmqs7XOyGgCAxmWyPslpiok1k05wmY3SJTytgvYFs0= +github.com/gookit/color v1.5.4/go.mod h1:pZJOeOS8DM43rXbp4AZo1n9zCU2qjpcRko0b6/QJi9w= +github.com/gookit/goutil v0.6.12 h1:73vPUcTtVGXbhSzBOFcnSB1aJl7Jq9np3RAE50yIDZc= +github.com/gookit/goutil v0.6.12/go.mod h1:g6krlFib8xSe3G1h02IETowOtrUGpAmetT8IevDpvpM= github.com/gookit/gsr v0.1.0 h1:0gadWaYGU4phMs0bma38t+Do5OZowRMEVlHv31p0Zig= github.com/gookit/gsr v0.1.0/go.mod h1:7wv4Y4WCnil8+DlDYHBjidzrEzfHhXEoFjEA0pPPWpI= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no= diff --git a/util.go b/util.go index 09944da..aab813b 100644 --- a/util.go +++ b/util.go @@ -9,7 +9,6 @@ import ( "strings" "github.com/gookit/goutil/byteutil" - "github.com/gookit/goutil/stdutil" "github.com/gookit/goutil/strutil" "github.com/valyala/bytebufferpool" ) @@ -110,7 +109,7 @@ func EncodeToString(v any) string { if mp, ok := v.(map[string]any); ok { return mapToString(mp) } - return stdutil.ToString(v) + return strutil.SafeString(v) } func mapToString(mp map[string]any) string {