@@ -15,7 +15,7 @@ func Validate(ok bool, format string, args ...any) error {
15
15
return nil
16
16
}
17
17
18
- func messageFromMsgAndArgs (msgAndArgs ... interface {} ) string {
18
+ func messageFromMsgAndArgs (msgAndArgs ... any ) string {
19
19
if len (msgAndArgs ) == 1 {
20
20
if msgAsStr , ok := msgAndArgs [0 ].(string ); ok {
21
21
return msgAsStr
@@ -29,7 +29,7 @@ func messageFromMsgAndArgs(msgAndArgs ...interface{}) string {
29
29
}
30
30
31
31
// must panics if err is error or false.
32
- func must (err any , messageArgs ... interface {} ) {
32
+ func must (err any , messageArgs ... any ) {
33
33
if err == nil {
34
34
return
35
35
}
@@ -61,54 +61,54 @@ func must(err any, messageArgs ...interface{}) {
61
61
// Must is a helper that wraps a call to a function returning a value and an error
62
62
// and panics if err is error or false.
63
63
// 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 {
65
65
must (err , messageArgs ... )
66
66
return val
67
67
}
68
68
69
69
// Must0 has the same behavior as Must, but callback returns no variable.
70
70
// Play: https://go.dev/play/p/TMoWrRp3DyC
71
- func Must0 (err any , messageArgs ... interface {} ) {
71
+ func Must0 (err any , messageArgs ... any ) {
72
72
must (err , messageArgs ... )
73
73
}
74
74
75
75
// Must1 is an alias to Must
76
76
// 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 {
78
78
return Must (val , err , messageArgs ... )
79
79
}
80
80
81
81
// Must2 has the same behavior as Must, but callback returns 2 variables.
82
82
// 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 ) {
84
84
must (err , messageArgs ... )
85
85
return val1 , val2
86
86
}
87
87
88
88
// Must3 has the same behavior as Must, but callback returns 3 variables.
89
89
// 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 ) {
91
91
must (err , messageArgs ... )
92
92
return val1 , val2 , val3
93
93
}
94
94
95
95
// Must4 has the same behavior as Must, but callback returns 4 variables.
96
96
// 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 ) {
98
98
must (err , messageArgs ... )
99
99
return val1 , val2 , val3 , val4
100
100
}
101
101
102
102
// Must5 has the same behavior as Must, but callback returns 5 variables.
103
103
// 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 ) {
105
105
must (err , messageArgs ... )
106
106
return val1 , val2 , val3 , val4 , val5
107
107
}
108
108
109
109
// Must6 has the same behavior as Must, but callback returns 6 variables.
110
110
// 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 ) {
112
112
must (err , messageArgs ... )
113
113
return val1 , val2 , val3 , val4 , val5 , val6
114
114
}
0 commit comments