Skip to content

Commit 6365aa9

Browse files
author
yangyile
committed
简单升级依赖
1 parent 1fbcbd8 commit 6365aa9

File tree

6 files changed

+64
-75
lines changed

6 files changed

+64
-75
lines changed

.gitignore

+20-31
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,25 @@
1-
*.a
2-
*.so
1+
# If you prefer the allow list template instead of the deny list, see community template:
2+
# https://github.com/github/gitignore/blob/main/community/Golang/Go.AllowList.gitignore
3+
#
4+
# Binaries for programs and plugins
35
*.exe
4-
*.pyc
5-
*.log
6+
*.exe~
67
*.dll
7-
*.out
8-
*.key
9-
_test
8+
*.so
9+
*.dylib
10+
11+
# Test binary, built with `go test -c`
1012
*.test
11-
*.cert
12-
*.exe~
13+
14+
# Output of the go coverage tool, specifically when used with LiteIDE
15+
*.out
16+
17+
# Dependency directories (remove the comment below to include it)
18+
# vendor/
19+
20+
# Go workspace file
1321
go.work
14-
.Trash-*
15-
.DS_Store
1622
go.work.sum
17-
main.out.bin
18-
*gitignore*secrets*
19-
*gitignore*outputs*
20-
ehthumbs.db
21-
Thumbs.db
22-
.gitkeep
23-
.vscode/
24-
*.dylib
25-
vendor/
26-
.idea/
27-
*.err
28-
*.swp
29-
_obj
30-
tmp/
31-
bin/
32-
tags
33-
*.DB
34-
*.db
35-
*.o
36-
*~
23+
24+
# env file
25+
.env

go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ go 1.22.6
55
require (
66
github.com/pkg/errors v0.9.1
77
github.com/stretchr/testify v1.10.0
8-
github.com/yyle88/zaplog v0.0.17
8+
github.com/yyle88/zaplog v0.0.19
99
go.uber.org/zap v1.27.0
1010
)
1111

1212
require (
1313
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
1414
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
15-
github.com/yyle88/mutexmap v1.0.9 // indirect
15+
github.com/yyle88/mutexmap v1.0.10 // indirect
1616
go.uber.org/multierr v1.11.0 // indirect
1717
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
1818
gopkg.in/yaml.v3 v3.0.1 // indirect

go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU
1212
github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
1313
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
1414
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
15-
github.com/yyle88/mutexmap v1.0.9 h1:g1nfNmsReU/AgcGkLgPEKrBeMThJJBrJuvU7i3DOVC0=
16-
github.com/yyle88/mutexmap v1.0.9/go.mod h1:QUYDuARLPlGj414kHewQ5tt8jkDxQXoai8H3C4Gg+yc=
17-
github.com/yyle88/zaplog v0.0.17 h1:2exjnXROfkNRvcKZDAFUM2KDpca1n2OKrEH73pTvrX0=
18-
github.com/yyle88/zaplog v0.0.17/go.mod h1:SJvxdHW7zWu1r+K66oBPBWljiGnDjCV8le3SzQnJpBw=
15+
github.com/yyle88/mutexmap v1.0.10 h1:PIsx9KTdK6h1yH5NzBrPl21RrZ/XsE4IbgulMlhJzZE=
16+
github.com/yyle88/mutexmap v1.0.10/go.mod h1:QUYDuARLPlGj414kHewQ5tt8jkDxQXoai8H3C4Gg+yc=
17+
github.com/yyle88/zaplog v0.0.19 h1:O4g7EO+uks7DkXbBXAje0LRvrBbkPuMD4gphuXw9jAo=
18+
github.com/yyle88/zaplog v0.0.19/go.mod h1:jN9/2IXYlpHOgoIyOTid1EPlUyGBWzFjr0dX9YKLkC0=
1919
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
2020
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
2121
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=

must.go

+23-23
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,23 @@ import (
1010
// True 期望值为 true。如果值为 false,则触发 panic。
1111
func True(v bool) {
1212
if !v {
13-
zaplog.ZAPS.P1.LOG.Panic("expect TRUE while got FALSE", zap.Bool("v", v))
13+
zaplog.ZAPS.Skip1.LOG.Panic("expect TRUE while got FALSE", zap.Bool("v", v))
1414
}
1515
}
1616

1717
// Done expects no error. Panics if the provided error is non-nil.
1818
// Done 期望没有错误。如果提供的错误不为 nil,则触发 panic。
1919
func Done(err error) {
2020
if err != nil {
21-
zaplog.ZAPS.P1.LOG.Panic("NO ERROR BUG", zap.Error(err))
21+
zaplog.ZAPS.Skip1.LOG.Panic("NO ERROR BUG", zap.Error(err))
2222
}
2323
}
2424

2525
// Must expects no error. Panics if the provided error is non-nil.
2626
// Must 期望没有错误。如果提供的错误不为 nil,则触发 panic。
2727
func Must(err error) {
2828
if err != nil {
29-
zaplog.ZAPS.P1.LOG.Panic("ERROR", zap.Error(err))
29+
zaplog.ZAPS.Skip1.LOG.Panic("ERROR", zap.Error(err))
3030
}
3131
}
3232

@@ -35,7 +35,7 @@ func Must(err error) {
3535
func Nice[V comparable](a V) V {
3636
var b V // zero value
3737
if a == b {
38-
zaplog.ZAPS.P1.LOG.Panic("A IS ZERO VALUE", zap.Any("a", a))
38+
zaplog.ZAPS.Skip1.LOG.Panic("A IS ZERO VALUE", zap.Any("a", a))
3939
}
4040
return a
4141
}
@@ -45,7 +45,7 @@ func Nice[V comparable](a V) V {
4545
func Zero[V comparable](a V) {
4646
var b V // zero value
4747
if a != b {
48-
zaplog.ZAPS.P1.LOG.Panic("A IS NOT ZERO VALUE", zap.Any("a", a))
48+
zaplog.ZAPS.Skip1.LOG.Panic("A IS NOT ZERO VALUE", zap.Any("a", a))
4949
}
5050
}
5151

@@ -54,63 +54,63 @@ func Zero[V comparable](a V) {
5454
func None[V comparable](a V) {
5555
var b V // zero value
5656
if a != b {
57-
zaplog.ZAPS.P1.LOG.Panic("A IS NOT NONE VALUE", zap.Any("a", a))
57+
zaplog.ZAPS.Skip1.LOG.Panic("A IS NOT NONE VALUE", zap.Any("a", a))
5858
}
5959
}
6060

6161
// Null expects the value to be nil. Panics if the value is non-nil.
6262
// Null 期望值为 nil。如果值不为 nil,则触发 panic。
6363
func Null[T any](v *T) {
6464
if v != nil {
65-
zaplog.ZAPS.P1.LOG.Panic("SHOULD BE NULL BUT IS FULL")
65+
zaplog.ZAPS.Skip1.LOG.Panic("SHOULD BE NULL BUT IS FULL")
6666
}
6767
}
6868

6969
// Full expects the value to be non-nil. Panics if the value is nil.
7070
// Full 期望值为非 nil。如果值为 nil,则触发 panic。
7171
func Full[T any](v *T) {
7272
if v == nil {
73-
zaplog.ZAPS.P1.LOG.Panic("SHOULD BE FULL BUT IS NULL")
73+
zaplog.ZAPS.Skip1.LOG.Panic("SHOULD BE FULL BUT IS NULL")
7474
}
7575
}
7676

7777
// Equal expects the values to be equal. Panics if they are not equal.
7878
// Equal 期望值相等。如果值不相等,则触发 panic。
7979
func Equal[V comparable](a, b V) {
8080
if a != b {
81-
zaplog.ZAPS.P1.LOG.Panic("A AND B ARE NOT EQUAL", zap.Any("a", a), zap.Any("b", b))
81+
zaplog.ZAPS.Skip1.LOG.Panic("A AND B ARE NOT EQUAL", zap.Any("a", a), zap.Any("b", b))
8282
}
8383
}
8484

8585
// Equals expects the values to be equal. Panics if they are not equal.
8686
// Equals 期望值相等。如果值不相等,则触发 panic。
8787
func Equals[V comparable](a, b V) {
8888
if a != b {
89-
zaplog.ZAPS.P1.LOG.Panic("A AND B ARE NOT EQUALS", zap.Any("a", a), zap.Any("b", b))
89+
zaplog.ZAPS.Skip1.LOG.Panic("A AND B ARE NOT EQUALS", zap.Any("a", a), zap.Any("b", b))
9090
}
9191
}
9292

9393
// Same expects the values to be same. Panics if they are not same.
9494
// Same 期望值相等。如果值不相等,则触发 panic。
9595
func Same[V comparable](a, b V) {
9696
if a != b {
97-
zaplog.ZAPS.P1.LOG.Panic("A AND B ARE NOT SAME", zap.Any("a", a), zap.Any("b", b))
97+
zaplog.ZAPS.Skip1.LOG.Panic("A AND B ARE NOT SAME", zap.Any("a", a), zap.Any("b", b))
9898
}
9999
}
100100

101101
// Is expects equality, not the logic of errors.Is, but the logic of Equals. Panics if the values are not equal.
102102
// Is 期望相等,不是 errors.Is 的逻辑,而是 Equals 的逻辑。如果值不相等,则触发 panic。
103103
func Is[V comparable](a, b V) {
104104
if a != b {
105-
zaplog.ZAPS.P1.LOG.Panic("A AND B ARE NOT EQUALS", zap.Any("a", a), zap.Any("b", b))
105+
zaplog.ZAPS.Skip1.LOG.Panic("A AND B ARE NOT EQUALS", zap.Any("a", a), zap.Any("b", b))
106106
}
107107
}
108108

109109
// Ise expects the errors to be equal, similar to the behavior of errors.Is. Panics if they are not equal.
110110
// Ise 期望错误相等,类似于 errors.Is 的行为。如果错误不相等,则触发 panic。
111111
func Ise(err, target error) {
112112
if !errors.Is(err, target) {
113-
zaplog.ZAPS.P1.LOG.Panic("ERROR IS NOT SAME", zap.Error(err), zap.Error(target))
113+
zaplog.ZAPS.Skip1.LOG.Panic("ERROR IS NOT SAME", zap.Error(err), zap.Error(target))
114114
}
115115
}
116116

@@ -119,7 +119,7 @@ func Ise(err, target error) {
119119
func Ok[V comparable](a V) {
120120
var b V // zero value
121121
if a == b {
122-
zaplog.ZAPS.P1.LOG.Panic("A IS ZERO VALUE NOT OK", zap.Any("a", a))
122+
zaplog.ZAPS.Skip1.LOG.Panic("A IS ZERO VALUE NOT OK", zap.Any("a", a))
123123
}
124124
}
125125

@@ -128,55 +128,55 @@ func Ok[V comparable](a V) {
128128
func OK[V comparable](a V) {
129129
var b V // zero value
130130
if a == b {
131-
zaplog.ZAPS.P1.LOG.Panic("A IS ZERO VALUE NOT OK", zap.Any("a", a))
131+
zaplog.ZAPS.Skip1.LOG.Panic("A IS ZERO VALUE NOT OK", zap.Any("a", a))
132132
}
133133
}
134134

135135
// TRUE expects the value to be true. Panics if the value is false.
136136
// TRUE 期望值为 true。如果值为 false,则触发 panic。
137137
func TRUE(v bool) {
138138
if !v {
139-
zaplog.ZAPS.P1.LOG.Panic("expect TRUE while got FALSE", zap.Bool("v", v))
139+
zaplog.ZAPS.Skip1.LOG.Panic("expect TRUE while got FALSE", zap.Bool("v", v))
140140
}
141141
}
142142

143143
// FALSE expects the value to be false. Panics if the value is true.
144144
// FALSE 期望值为 false。如果值为 true,则触发 panic。
145145
func FALSE(v bool) {
146146
if v {
147-
zaplog.ZAPS.P1.LOG.Panic("expect FALSE while got TRUE", zap.Bool("v", v))
147+
zaplog.ZAPS.Skip1.LOG.Panic("expect FALSE while got TRUE", zap.Bool("v", v))
148148
}
149149
}
150150

151151
// False expects the value to be false. Panics if the value is true.
152152
// False 期望值为 false。如果值为 true,则触发 panic。
153153
func False(v bool) {
154154
if v {
155-
zaplog.ZAPS.P1.LOG.Panic("expect FALSE while got TRUE", zap.Bool("v", v))
155+
zaplog.ZAPS.Skip1.LOG.Panic("expect FALSE while got TRUE", zap.Bool("v", v))
156156
}
157157
}
158158

159159
// Have checks that the slice is not empty/none. Panics if the slice is empty/none.
160160
// Have 检查切片是否为空。如果切片为空,则触发 panic。
161161
func Have[T any](a []T) {
162162
if len(a) == 0 {
163-
zaplog.ZAPS.P1.LOG.Panic("expect LENGTH > 0 while got an empty/none slice")
163+
zaplog.ZAPS.Skip1.LOG.Panic("expect LENGTH > 0 while got an empty/none slice")
164164
}
165165
}
166166

167167
// Length expects the slice to have length n. Panics if the length is not n.
168168
// Length 期望切片的长度为 n。如果长度不是 n,则触发 panic。
169169
func Length[T any](a []T, n int) {
170170
if len(a) != n {
171-
zaplog.ZAPS.P1.LOG.Panic("expect LENGTH = n while not equals", zap.Int("len", len(a)), zap.Int("n", n))
171+
zaplog.ZAPS.Skip1.LOG.Panic("expect LENGTH = n while not equals", zap.Int("len", len(a)), zap.Int("n", n))
172172
}
173173
}
174174

175175
// Len is an abbreviation of Length, serving the same purpose. Panics if the length is not n.
176176
// Len 是 Length 的缩写,功能相同。如果长度不是 n,则触发 panic。
177177
func Len[T any](a []T, n int) {
178178
if len(a) != n {
179-
zaplog.ZAPS.P1.LOG.Panic("expect LENGTH = n while not equals", zap.Int("len", len(a)), zap.Int("n", n))
179+
zaplog.ZAPS.Skip1.LOG.Panic("expect LENGTH = n while not equals", zap.Int("len", len(a)), zap.Int("n", n))
180180
}
181181
}
182182

@@ -188,7 +188,7 @@ func In[T comparable](v T, a []T) {
188188
return
189189
}
190190
}
191-
zaplog.ZAPS.P1.LOG.Panic("expect value in slice while not in", zap.Any("v", v), zap.Int("len", len(a)))
191+
zaplog.ZAPS.Skip1.LOG.Panic("expect value in slice while not in", zap.Any("v", v), zap.Int("len", len(a)))
192192
}
193193

194194
// Contains checks if the slice contains the value. Panics if the value is not found.
@@ -199,5 +199,5 @@ func Contains[T comparable](a []T, v T) {
199199
return
200200
}
201201
}
202-
zaplog.ZAPS.P1.LOG.Panic("expect slice contains value while not contains", zap.Int("len", len(a)), zap.Any("v", v))
202+
zaplog.ZAPS.Skip1.LOG.Panic("expect slice contains value while not contains", zap.Int("len", len(a)), zap.Any("v", v))
203203
}

mustmap/must_map.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,23 @@ import (
1111
// Equals 比较两个 map 是否相等,如果不相等,则触发 panic。
1212
func Equals[K, V comparable](a, b map[K]V) {
1313
if !maps.Equal(a, b) {
14-
zaplog.ZAPS.P1.LOG.Panic("expect map equals while not equals", zap.Int("len_a", len(a)), zap.Int("len_b", len(b)))
14+
zaplog.ZAPS.Skip1.LOG.Panic("expect map equals while not equals", zap.Int("len_a", len(a)), zap.Int("len_b", len(b)))
1515
}
1616
}
1717

1818
// Have checks if a map is non-empty. If it is empty, it panics.
1919
// Have 检查一个 map 是否非空,如果为空,则触发 panic。
2020
func Have[K comparable, V any](a map[K]V) {
2121
if len(a) == 0 {
22-
zaplog.ZAPS.P1.LOG.Panic("expect LENGTH > 0 while got an none map")
22+
zaplog.ZAPS.Skip1.LOG.Panic("expect LENGTH > 0 while got an none map")
2323
}
2424
}
2525

2626
// Nice checks if a map is non-empty and returns it. If it is empty, it panics.
2727
// Nice 检查一个 map 是否非空并返回它,如果为空,则触发 panic。
2828
func Nice[K comparable, V any](a map[K]V) map[K]V {
2929
if len(a) == 0 {
30-
zaplog.ZAPS.P1.LOG.Panic("expect LENGTH > 0 while got an none map")
30+
zaplog.ZAPS.Skip1.LOG.Panic("expect LENGTH > 0 while got an none map")
3131
}
3232
return a
3333
}
@@ -36,23 +36,23 @@ func Nice[K comparable, V any](a map[K]V) map[K]V {
3636
// None 确保 map 内容为空,若有元素则 panic。
3737
func None[K comparable, V any](a map[K]V) {
3838
if len(a) != 0 {
39-
zaplog.ZAPS.P1.LOG.Panic("expect LENGTH = 0 while contains elements")
39+
zaplog.ZAPS.Skip1.LOG.Panic("expect LENGTH = 0 while contains elements")
4040
}
4141
}
4242

4343
// Length checks if the length of a map is equal to n. If not, it panics.
4444
// Length 检查一个 map 的长度是否等于 n,如果不等,则触发 panic。
4545
func Length[K comparable, V any](a map[K]V, n int) {
4646
if len(a) != n {
47-
zaplog.ZAPS.P1.LOG.Panic("expect LENGTH = n while not equals", zap.Int("len", len(a)), zap.Int("n", n))
47+
zaplog.ZAPS.Skip1.LOG.Panic("expect LENGTH = n while not equals", zap.Int("len", len(a)), zap.Int("n", n))
4848
}
4949
}
5050

5151
// Len checks if the length of a map is equal to n. If not, it panics.
5252
// Len 是 Length 的简写版本,检查一个 map 的长度是否等于 n,如果不等,则触发 panic。
5353
func Len[K comparable, V any](a map[K]V, n int) {
5454
if len(a) != n {
55-
zaplog.ZAPS.P1.LOG.Panic("expect LENGTH = n while not equals", zap.Int("len", len(a)), zap.Int("n", n))
55+
zaplog.ZAPS.Skip1.LOG.Panic("expect LENGTH = n while not equals", zap.Int("len", len(a)), zap.Int("n", n))
5656
}
5757
}
5858

@@ -61,7 +61,7 @@ func Len[K comparable, V any](a map[K]V, n int) {
6161
func Get[K, V comparable](a map[K]V, key K) V {
6262
value, exists := a[key]
6363
if !exists {
64-
zaplog.ZAPS.P1.LOG.Panic("expect KEY to EXIST in map", zap.Any("key", key))
64+
zaplog.ZAPS.Skip1.LOG.Panic("expect KEY to EXIST in map", zap.Any("key", key))
6565
}
6666
return value
6767
}

0 commit comments

Comments
 (0)