Skip to content

Commit 0a145c7

Browse files
committed
style: replace interface{} by any
1 parent 9405c90 commit 0a145c7

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

errors.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ func Validate(ok bool, format string, args ...any) error {
1515
return nil
1616
}
1717

18-
func messageFromMsgAndArgs(msgAndArgs ...interface{}) string {
18+
func messageFromMsgAndArgs(msgAndArgs ...any) string {
1919
if len(msgAndArgs) == 1 {
2020
if msgAsStr, ok := msgAndArgs[0].(string); ok {
2121
return msgAsStr
@@ -29,7 +29,7 @@ func messageFromMsgAndArgs(msgAndArgs ...interface{}) string {
2929
}
3030

3131
// must panics if err is error or false.
32-
func must(err any, messageArgs ...interface{}) {
32+
func must(err any, messageArgs ...any) {
3333
if err == nil {
3434
return
3535
}
@@ -61,54 +61,54 @@ func must(err any, messageArgs ...interface{}) {
6161
// Must is a helper that wraps a call to a function returning a value and an error
6262
// and panics if err is error or false.
6363
// Play: https://go.dev/play/p/TMoWrRp3DyC
64-
func Must[T any](val T, err any, messageArgs ...interface{}) T {
64+
func Must[T any](val T, err any, messageArgs ...any) T {
6565
must(err, messageArgs...)
6666
return val
6767
}
6868

6969
// Must0 has the same behavior as Must, but callback returns no variable.
7070
// Play: https://go.dev/play/p/TMoWrRp3DyC
71-
func Must0(err any, messageArgs ...interface{}) {
71+
func Must0(err any, messageArgs ...any) {
7272
must(err, messageArgs...)
7373
}
7474

7575
// Must1 is an alias to Must
7676
// Play: https://go.dev/play/p/TMoWrRp3DyC
77-
func Must1[T any](val T, err any, messageArgs ...interface{}) T {
77+
func Must1[T any](val T, err any, messageArgs ...any) T {
7878
return Must(val, err, messageArgs...)
7979
}
8080

8181
// Must2 has the same behavior as Must, but callback returns 2 variables.
8282
// Play: https://go.dev/play/p/TMoWrRp3DyC
83-
func Must2[T1, T2 any](val1 T1, val2 T2, err any, messageArgs ...interface{}) (T1, T2) {
83+
func Must2[T1, T2 any](val1 T1, val2 T2, err any, messageArgs ...any) (T1, T2) {
8484
must(err, messageArgs...)
8585
return val1, val2
8686
}
8787

8888
// Must3 has the same behavior as Must, but callback returns 3 variables.
8989
// Play: https://go.dev/play/p/TMoWrRp3DyC
90-
func Must3[T1, T2, T3 any](val1 T1, val2 T2, val3 T3, err any, messageArgs ...interface{}) (T1, T2, T3) {
90+
func Must3[T1, T2, T3 any](val1 T1, val2 T2, val3 T3, err any, messageArgs ...any) (T1, T2, T3) {
9191
must(err, messageArgs...)
9292
return val1, val2, val3
9393
}
9494

9595
// Must4 has the same behavior as Must, but callback returns 4 variables.
9696
// Play: https://go.dev/play/p/TMoWrRp3DyC
97-
func Must4[T1, T2, T3, T4 any](val1 T1, val2 T2, val3 T3, val4 T4, err any, messageArgs ...interface{}) (T1, T2, T3, T4) {
97+
func Must4[T1, T2, T3, T4 any](val1 T1, val2 T2, val3 T3, val4 T4, err any, messageArgs ...any) (T1, T2, T3, T4) {
9898
must(err, messageArgs...)
9999
return val1, val2, val3, val4
100100
}
101101

102102
// Must5 has the same behavior as Must, but callback returns 5 variables.
103103
// Play: https://go.dev/play/p/TMoWrRp3DyC
104-
func Must5[T1, T2, T3, T4, T5 any](val1 T1, val2 T2, val3 T3, val4 T4, val5 T5, err any, messageArgs ...interface{}) (T1, T2, T3, T4, T5) {
104+
func Must5[T1, T2, T3, T4, T5 any](val1 T1, val2 T2, val3 T3, val4 T4, val5 T5, err any, messageArgs ...any) (T1, T2, T3, T4, T5) {
105105
must(err, messageArgs...)
106106
return val1, val2, val3, val4, val5
107107
}
108108

109109
// Must6 has the same behavior as Must, but callback returns 6 variables.
110110
// Play: https://go.dev/play/p/TMoWrRp3DyC
111-
func Must6[T1, T2, T3, T4, T5, T6 any](val1 T1, val2 T2, val3 T3, val4 T4, val5 T5, val6 T6, err any, messageArgs ...interface{}) (T1, T2, T3, T4, T5, T6) {
111+
func Must6[T1, T2, T3, T4, T5, T6 any](val1 T1, val2 T2, val3 T3, val4 T4, val5 T5, val6 T6, err any, messageArgs ...any) (T1, T2, T3, T4, T5, T6) {
112112
must(err, messageArgs...)
113113
return val1, val2, val3, val4, val5, val6
114114
}

type_manipulation_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func TestIsNil(t *testing.T) {
2525
var b *bool
2626
is.True(IsNil(b))
2727

28-
var ifaceWithNilValue interface{} = (*string)(nil)
28+
var ifaceWithNilValue any = (*string)(nil)
2929
is.True(IsNil(ifaceWithNilValue))
3030
is.False(ifaceWithNilValue == nil) // nolint:staticcheck
3131
}

0 commit comments

Comments
 (0)