Skip to content

Commit 1b8c72d

Browse files
committed
Result2 Def1 & Def2 are two separated now
1 parent abdb34e commit 1b8c72d

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

try/out.go

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,13 +204,22 @@ func (o *Result1[T]) Def1(v T) *Result1[T] {
204204
return o
205205
}
206206

207-
// Def2 sets default value for Result.Val2. The value is returned in case of
207+
// Def1 sets default value for Result.Val1. The value is returned in case of
208208
// Result.Err != nil.
209-
func (o *Result2[T, U]) Def2(v T, v2 U) *Result2[T, U] {
209+
func (o *Result2[T, U]) Def1(v T) *Result2[T, U] {
210210
if o.Err == nil {
211211
return o
212212
}
213213
o.Val1 = v
214+
return o
215+
}
216+
217+
// Def2 sets default value for Result.Val2. The value is returned in case of
218+
// Result.Err != nil.
219+
func (o *Result2[T, U]) Def2(v2 U) *Result2[T, U] {
220+
if o.Err == nil {
221+
return o
222+
}
214223
o.Val2 = v2
215224
return o
216225
}

try/result2_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ func ExampleResult2_Logf() {
2121
err2.SetLogTracer(os.Stdout)
2222

2323
countSomething := func(s1, s2 string) (int, int) {
24-
r := try.Out2(convTwoStr(s1, s2)).Logf().Def2(10, 10)
24+
r := try.Out2(convTwoStr(s1, s2)).Logf().Def1(10).Def2(10)
2525
v1, v2 := r.Val1, r.Val2
2626
return v1 + v2, v2
2727
}

0 commit comments

Comments
 (0)