Result2 Def1 & Def2 are two separated now

lainio · Mar 9, 2024 · 1b8c72d · 1b8c72d
1 parent abdb34e
commit 1b8c72d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/try/out.go b/try/out.go
@@ -204,13 +204,22 @@ func (o *Result1[T]) Def1(v T) *Result1[T] {
 	return o
 }
 
-// Def2 sets default value for Result.Val2. The value is returned in case of
+// Def1 sets default value for Result.Val1. The value is returned in case of
 // Result.Err != nil.
-func (o *Result2[T, U]) Def2(v T, v2 U) *Result2[T, U] {
+func (o *Result2[T, U]) Def1(v T) *Result2[T, U] {
 	if o.Err == nil {
 		return o
 	}
 	o.Val1 = v
+	return o
+}
+
+// Def2 sets default value for Result.Val2. The value is returned in case of
+// Result.Err != nil.
+func (o *Result2[T, U]) Def2(v2 U) *Result2[T, U] {
+	if o.Err == nil {
+		return o
+	}
 	o.Val2 = v2
 	return o
 }

diff --git a/try/result2_test.go b/try/result2_test.go
@@ -21,7 +21,7 @@ func ExampleResult2_Logf() {
 	err2.SetLogTracer(os.Stdout)
 
 	countSomething := func(s1, s2 string) (int, int) {
-		r := try.Out2(convTwoStr(s1, s2)).Logf().Def2(10, 10)
+		r := try.Out2(convTwoStr(s1, s2)).Logf().Def1(10).Def2(10)
 		v1, v2 := r.Val1, r.Val2
 		return v1 + v2, v2
 	}