Skip to content

Commit 25809aa

Browse files
committed
chore: quick update fix/version at 2025-10-28 15:21:07
2 parents 3d0d368 + f4b8776 commit 25809aa

File tree

119 files changed

+548
-460
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+548
-460
lines changed

.golangci.yaml

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
version: "2"
2+
issues:
3+
fix: true
4+
linters:
5+
default: none
6+
enable:
7+
- govet
8+
exclusions:
9+
presets:
10+
- comments
11+
- common-false-positives
12+
- legacy
13+
- std-error-handling
14+
paths:
15+
- internal/example
16+
- cmds
17+
- vendor
18+
- third_party$
19+
- builtin$
20+
- examples$
21+
formatters:
22+
enable:
23+
- goimports
24+
- gofmt
25+
- gofumpt
26+
settings:
27+
gofumpt:
28+
extra-rules: true
29+
goimports:
30+
# A list of prefixes, which, if set, checks import paths
31+
# with the given prefixes are grouped after 3rd-party packages.
32+
# Default: []
33+
local-prefixes:
34+
- github.com/pubgo/funk/v2
35+
gofmt:
36+
# Simplify code: gofmt with `-s` option.
37+
# Default: true
38+
simplify: false
39+
# Apply the rewrite rules to the source before reformatting.
40+
# https://pkg.go.dev/cmd/gofmt
41+
# Default: []
42+
rewrite-rules:
43+
- pattern: 'interface{}'
44+
replacement: 'any'
45+
- pattern: 'a[b:len(a)]'
46+
replacement: 'a[b:]'
47+
48+
exclusions:
49+
paths:
50+
- internal/example
51+
- vendor
52+
- examples$
53+
- proto

.golangci.yml

Lines changed: 0 additions & 29 deletions
This file was deleted.

assert/assert.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/k0kubun/pp/v3"
88
)
99

10-
func Assert(b bool, format string, a ...interface{}) {
10+
func Assert(b bool, format string, a ...any) {
1111
if b {
1212
must(fmt.Errorf(format, a...))
1313
}
@@ -21,13 +21,13 @@ func MustEqual[T any](a, b T) {
2121
}
2222
}
2323

24-
func If(b bool, format string, a ...interface{}) {
24+
func If(b bool, format string, a ...any) {
2525
if b {
2626
must(fmt.Errorf(format, a...))
2727
}
2828
}
2929

30-
func T(b bool, format string, a ...interface{}) {
30+
func T(b bool, format string, a ...any) {
3131
if b {
3232
must(fmt.Errorf(format, a...))
3333
}

assert/must.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ import (
77
"runtime/debug"
88
)
99

10-
func Must(err error, args ...interface{}) {
10+
func Must(err error, args ...any) {
1111
if err == nil {
1212
return
1313
}
1414

1515
must(err, args...)
1616
}
1717

18-
func MustFn(errFn func() error, args ...interface{}) {
18+
func MustFn(errFn func() error, args ...any) {
1919
err := try(errFn)
2020
if err == nil {
2121
return
@@ -24,7 +24,7 @@ func MustFn(errFn func() error, args ...interface{}) {
2424
must(err, args...)
2525
}
2626

27-
func MustF(err error, msg string, args ...interface{}) {
27+
func MustF(err error, msg string, args ...any) {
2828
if err == nil {
2929
return
3030
}
@@ -40,7 +40,7 @@ func Must1[T any](ret T, err error) T {
4040
return ret
4141
}
4242

43-
func Exit(err error, args ...interface{}) {
43+
func Exit(err error, args ...any) {
4444
if err == nil {
4545
return
4646
}
@@ -50,7 +50,7 @@ func Exit(err error, args ...interface{}) {
5050
os.Exit(1)
5151
}
5252

53-
func ExitFn(errFn func() error, args ...interface{}) {
53+
func ExitFn(errFn func() error, args ...any) {
5454
err := try(errFn)
5555
if err == nil {
5656
return
@@ -61,7 +61,7 @@ func ExitFn(errFn func() error, args ...interface{}) {
6161
os.Exit(1)
6262
}
6363

64-
func ExitF(err error, msg string, args ...interface{}) {
64+
func ExitF(err error, msg string, args ...any) {
6565
if err == nil {
6666
return
6767
}

assert/must_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func BenchmarkNoPanic(b *testing.B) {
6666
for i := 0; i < b.N; i++ {
6767
_ = func() (err error) {
6868
assert1.Must(nil)
69-
return
69+
return err
7070
}()
7171
}
7272
}

assert/util.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func must(err error, messageArgs ...any) {
5454
return
5555
}
5656

57-
var attrs = []slog.Attr{slog.Bool("panic", true)}
57+
attrs := []slog.Attr{slog.Bool("panic", true)}
5858
if v, ok := lo.ErrorsAs[interface {
5959
ID() string
6060
Error() string
@@ -100,7 +100,7 @@ func try(fn func() error) (gErr error) {
100100
gErr = fmt.Errorf("assert: [fn] is nil")
101101
logErr(gErr, gErr.Error())
102102
debug.PrintStack()
103-
return
103+
return gErr
104104
}
105105

106106
defer func() {
@@ -116,5 +116,5 @@ func try(fn func() error) (gErr error) {
116116
}()
117117

118118
gErr = fn()
119-
return
119+
return gErr
120120
}

async/go.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ func Timeout(dur time.Duration, fn func() error) error {
119119
}
120120
}
121121

122-
func logErr(fn interface{}, err error) {
122+
func logErr(fn any, err error) {
123123
if generic.IsNil(err) {
124124
return
125125
}

buildinfo/build.go

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

3-
var domain string
4-
var mainPath string
3+
var (
4+
domain string
5+
mainPath string
6+
)
57

68
// git rev-parse HEAD
79
// git describe --always --abbrev=7 --dirty
@@ -23,7 +25,5 @@ var (
2325
project string
2426
)
2527

26-
var (
27-
// release tag
28-
release string
29-
)
28+
// release tag
29+
var release string

cmds/configcmd/cmd.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"fmt"
66

77
"github.com/urfave/cli/v3"
8-
"gopkg.in/yaml.v3"
8+
yaml "gopkg.in/yaml.v3"
99

1010
"github.com/pubgo/funk/v2/assert"
1111
"github.com/pubgo/funk/v2/config"

cmds/protoc-gen-go-cloudevent2/internal/gen.go

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,13 @@ import (
1919
"github.com/pubgo/funk/v2/stack"
2020
)
2121

22-
var cloudeventPkg = reflect.TypeOf(cloudevent.Client{}).PkgPath()
23-
var jobTypesPkg = reflect.TypeOf(cloudeventpb.PushEventOptions{}).PkgPath()
24-
var ctxPkg = stack.CallerWithFunc(context.WithTimeout).Pkg
25-
var assertPkt = stack.CallerWithFunc(assert.Assert).Pkg
26-
var protojsonPkt = stack.CallerWithFunc(protojson.Marshal).Pkg
22+
var (
23+
cloudeventPkg = reflect.TypeOf(cloudevent.Client{}).PkgPath()
24+
jobTypesPkg = reflect.TypeOf(cloudeventpb.PushEventOptions{}).PkgPath()
25+
ctxPkg = stack.CallerWithFunc(context.WithTimeout).Pkg
26+
assertPkt = stack.CallerWithFunc(assert.Assert).Pkg
27+
protojsonPkt = stack.CallerWithFunc(protojson.Marshal).Pkg
28+
)
2729

2830
type eventInfo struct {
2931
srv *protogen.Service
@@ -54,7 +56,7 @@ func GenerateFile(gen *protogen.Plugin, file *protogen.File) *protogen.Generated
5456
return g
5557
}
5658

57-
var events = make(map[string]map[string]*eventInfo)
59+
events := make(map[string]map[string]*eventInfo)
5860
for _, srv := range file.Services {
5961
job, ok := proto.GetExtension(srv.Desc.Options(), cloudeventpb.E_Job).(*cloudeventpb.CloudEventServiceOptions)
6062
if !ok || job == nil {
@@ -118,7 +120,7 @@ func GenerateFile(gen *protogen.Plugin, file *protogen.File) *protogen.Generated
118120

119121
for _, subName := range subjectNames {
120122
info := subjects[subName]
121-
var keyName = fmt.Sprintf("%sCloudEventKey", info.mth.GoName)
123+
keyName := fmt.Sprintf("%sCloudEventKey", info.mth.GoName)
122124
genFile.Commentf("%s /%s/%s", keyName, info.srv.Desc.FullName(), info.mth.GoName)
123125
genFile.Comment(strings.TrimSpace(info.mth.Comments.Leading.String()))
124126
genFile.Const().
@@ -147,7 +149,7 @@ func GenerateFile(gen *protogen.Plugin, file *protogen.File) *protogen.Generated
147149
//}
148150

149151
subjectValues := lo.Values(subjects)
150-
var cloudEventName = fmt.Sprintf("%sCloudEvent", subjectValues[0].srv.GoName)
152+
cloudEventName := fmt.Sprintf("%sCloudEvent", subjectValues[0].srv.GoName)
151153
genFile.Type().Id(cloudEventName).StructFunc(func(group *jen.Group) {
152154
for _, ss := range subjectValues {
153155
group.Id("On"+ss.mth.GoName).Func().Params(
@@ -165,27 +167,27 @@ func GenerateFile(gen *protogen.Plugin, file *protogen.File) *protogen.Generated
165167
jen.Id("opts").Op("...").Op("*").Qual(jobTypesPkg, "RegisterJobOptions"),
166168
).BlockFunc(func(group *jen.Group) {
167169
for _, ss := range subjectValues {
168-
var keyName = fmt.Sprintf("%sCloudEventKey", ss.mth.GoName)
170+
keyName := fmt.Sprintf("%sCloudEventKey", ss.mth.GoName)
169171
group.If(jen.Id("event").Dot("On" + ss.mth.GoName)).Op("!=").Nil().BlockFunc(func(group *jen.Group) {
170172
group.Qual(cloudeventPkg, "RegisterJobHandler").Call(
171173
jen.Id("jobCli"),
172174
jen.Id(jobKeyName),
173175
jen.Id(keyName),
174176
jen.Id("event").Dot("On"+ss.mth.GoName),
175-
//jen.Qual(cloudeventPkg, "WrapHandler").Call(jen.Id("event").Dot(ss.mth.GoName)),
177+
// jen.Qual(cloudeventPkg, "WrapHandler").Call(jen.Id("event").Dot(ss.mth.GoName)),
176178
jen.Id("opts").Op("..."),
177179
)
178180
}).Line()
179181
}
180182
})
181183

182-
var publisher = fmt.Sprintf("%sPublisher", cloudEventName)
184+
publisher := fmt.Sprintf("%sPublisher", cloudEventName)
183185
genFile.Type().Id(publisher).StructFunc(func(group *jen.Group) {
184186
group.Id("Client").Op("*").Qual(cloudeventPkg, "Client")
185187
})
186188
for _, ss := range subjectValues {
187-
var mthName = fmt.Sprintf("Push%sEvent", ss.mth.GoName)
188-
var keyName = fmt.Sprintf("%sCloudEventKey", ss.mth.GoName)
189+
mthName := fmt.Sprintf("Push%sEvent", ss.mth.GoName)
190+
keyName := fmt.Sprintf("%sCloudEventKey", ss.mth.GoName)
189191
genFile.Func().
190192
Params(jen.Id(fmt.Sprintf("a %s", publisher))).
191193
Id(mthName).
@@ -223,7 +225,7 @@ func getSrv(data map[string]*eventInfo) *protogen.Service {
223225
}
224226

225227
func getPkg(file *protogen.File, goIdent protogen.GoIdent) *jen.Statement {
226-
var pkgName = ""
228+
pkgName := ""
227229
if file.GoImportPath != goIdent.GoImportPath {
228230
pkgName = string(goIdent.GoImportPath)
229231
}

0 commit comments

Comments
 (0)