Skip to content

Commit 0be5ebc

Browse files
committed
fix: 2024-04-02 12:22:17
1 parent 261f737 commit 0be5ebc

Some content is hidden

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

66 files changed

+226
-201
lines changed

assert/must.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ func Must(err error, args ...interface{}) {
1919
}
2020

2121
func MustFn(errFn func() error, args ...interface{}) {
22-
var err = try.Try(errFn)
22+
err := try.Try(errFn)
2323
if generic.IsNil(err) {
2424
return
2525
}
@@ -54,7 +54,7 @@ func Exit(err error, args ...interface{}) {
5454
}
5555

5656
func ExitFn(errFn func() error, args ...interface{}) {
57-
var err = try.Try(errFn)
57+
err := try.Try(errFn)
5858
if generic.IsNil(err) {
5959
return
6060
}

assert/must_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ func panicNoErr() (*errBase, error) {
2121
}
2222

2323
func TestPanicErr(t *testing.T) {
24-
var is = assert.New(t)
24+
is := assert.New(t)
2525
is.Panics(func() {
26-
var ret = Must1(panicErr())
26+
ret := Must1(panicErr())
2727
fmt.Println(ret == nil)
2828
})
2929

3030
is.NotPanics(func() {
31-
var ret = Must1(panicNoErr())
31+
ret := Must1(panicNoErr())
3232
fmt.Println(ret.msg)
3333
})
3434
}
@@ -45,7 +45,7 @@ func TestRespNext(t *testing.T) {
4545
}
4646

4747
func testPanic1(t *testing.T) {
48-
//xerrImpl.Must(xerrImpl.New("ok"))
48+
// xerrImpl.Must(xerrImpl.New("ok"))
4949
Must(init1Next())
5050
}
5151

async/go.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ import (
1717
func Async[T any](fn func() (T, error)) *Future[T] {
1818
assert.If(fn == nil, "[Async] [fn] is nil")
1919

20-
var f = newFuture[T]()
20+
f := newFuture[T]()
2121
go func() {
2222
defer recovery.Recovery(func(err error) {
2323
err = errors.WrapKV(err, "fn_stack", stack.CallerWithFunc(fn).String())
2424
f.setErr(err)
2525
})
2626

27-
var t, e = fn()
27+
t, e := fn()
2828
if e != nil {
2929
f.setErr(e)
3030
} else {
@@ -87,7 +87,7 @@ func Timeout(dur time.Duration, fn func() error) (gErr error) {
8787
assert.If(fn == nil, "[Timeout] [fn] is nil")
8888
assert.If(dur <= 0, "[Timeout] [dur] should not be less than zero")
8989

90-
var done = make(chan struct{})
90+
done := make(chan struct{})
9191
go func() {
9292
defer close(done)
9393
gErr = try.Try(fn)

async/go_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,22 +50,22 @@ func httpGetList() *Iterator[*http.Response] {
5050
}
5151

5252
func TestGoChan(t *testing.T) {
53-
var now = time.Now()
53+
now := time.Now()
5454
defer func() {
5555
fmt.Println(time.Since(now))
5656
}()
5757

58-
var val1 = Async(func() (string, error) {
58+
val1 := Async(func() (string, error) {
5959
time.Sleep(time.Millisecond)
6060
fmt.Println("2")
61-
//return WithErr(errors.New("error"))
61+
// return WithErr(errors.New("error"))
6262
return "hello", nil
6363
})
6464

65-
var val2 = Async(func() (string, error) {
65+
val2 := Async(func() (string, error) {
6666
time.Sleep(time.Millisecond)
6767
fmt.Println("3")
68-
//return WithErr(errors.New("error"))
68+
// return WithErr(errors.New("error"))
6969
return "hello", nil
7070
})
7171

async/iterator_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
)
77

88
func TestName(t *testing.T) {
9-
var ch = make(chan string, 10)
9+
ch := make(chan string, 10)
1010
ch <- "hello"
1111
ch <- "hello"
1212
ch <- "hello"

async/promise.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
func Promise[T any](fn func(resolve func(T), reject func(err error))) *Future[T] {
1313
assert.If(fn == nil, "[fn] is nil")
1414

15-
var f = newFuture[T]()
15+
f := newFuture[T]()
1616
go func() {
1717
defer recovery.Recovery(func(err error) {
1818
err = errors.WrapKV(err, "fn", stack.CallerWithFunc(fn).String())
@@ -27,7 +27,7 @@ func Promise[T any](fn func(resolve func(T), reject func(err error))) *Future[T]
2727
func Group[T any](do func(async func(func() (T, error))) error) *Iterator[T] {
2828
assert.If(do == nil, "[Async] [fn] is nil")
2929

30-
var rr = iteratorOf[T]()
30+
rr := iteratorOf[T]()
3131
go func() {
3232
var wg sync.WaitGroup
3333
defer rr.setDone()
@@ -41,7 +41,7 @@ func Group[T any](do func(async func(func() (T, error))) error) *Iterator[T] {
4141
rr.setErr(err)
4242
})
4343

44-
var t, e = f()
44+
t, e := f()
4545
if e == nil {
4646
rr.setValue(t)
4747
} else {
@@ -55,7 +55,7 @@ func Group[T any](do func(async func(func() (T, error))) error) *Iterator[T] {
5555
}
5656

5757
func Yield[T any](do func(yield func(T)) error) *Iterator[T] {
58-
var dd = iteratorOf[T]()
58+
dd := iteratorOf[T]()
5959
go func() {
6060
defer dd.setDone()
6161
defer recovery.Recovery(func(err error) {

build/build.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
)
1212

1313
func Run(BuildFlags, Packages string) error {
14-
var pwd, err = os.Getwd()
14+
pwd, err := os.Getwd()
1515
if err != nil {
1616
return err
1717
}

clone/clone.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@ import (
77
"github.com/huandu/go-clone"
88
)
99

10-
type Func = clone.Func
11-
type Allocator = clone.Allocator
12-
type AllocatorMethods = clone.AllocatorMethods
10+
type (
11+
Func = clone.Func
12+
Allocator = clone.Allocator
13+
AllocatorMethods = clone.AllocatorMethods
14+
)
1315

1416
func Clone[T any](t T) T {
1517
return clone.Clone(t).(T)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func GenerateFile(gen *protogen.Plugin, file *protogen.File) *protogen.Generated
2929
g := gen.NewGeneratedFile(filename, file.GoImportPath)
3030
g.Skip()
3131

32-
var genEnum = func(enum *protogen.Enum) {
32+
genEnum := func(enum *protogen.Enum) {
3333
genFile.
3434
Func().Id(enum.GoIdent.GoName + "Values").
3535
Params().

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ func GenerateFile(gen *protogen.Plugin, file *protogen.File) *protogen.Generated
4545
g.Unskip()
4646

4747
for _, codeName := range m.Values {
48-
var name = strings.ToLower(fmt.Sprintf("%s.%s",
48+
name := strings.ToLower(fmt.Sprintf("%s.%s",
4949
file.Desc.Package(),
5050
strcase.ToSnake(string(codeName.Desc.Name())),
5151
))
5252

53-
var statusName = "OK"
53+
statusName := "OK"
5454
if tag.DefaultCode != 0 && int32(codeName.Desc.Number()) != 0 {
5555
statusName = tag.DefaultCode.String()
5656
}
@@ -61,7 +61,7 @@ func GenerateFile(gen *protogen.Plugin, file *protogen.File) *protogen.Generated
6161
}
6262

6363
// comment
64-
var rr = string(codeName.Desc.Name())
64+
rr := string(codeName.Desc.Name())
6565
if codeName.Comments.Leading.String() != "" {
6666
rr = codeName.Comments.Leading.String()
6767
rr = strings.Trim(strings.TrimSpace(rr), "/")
@@ -75,7 +75,7 @@ func GenerateFile(gen *protogen.Plugin, file *protogen.File) *protogen.Generated
7575
rr = strings.ReplaceAll(rr, "_", " ")
7676
rr = strings.TrimSpace(strings.ReplaceAll(rr, " ", " "))
7777

78-
var num = int32(codeName.Desc.Number())
78+
num := int32(codeName.Desc.Number())
7979
genFile.Var().
8080
Id("ErrCode"+string(codeName.Desc.Name())).
8181
Id("=").

0 commit comments

Comments
 (0)