new functions + tests: T, T1, T2, T3

Author: lainio

err2_test.go

@@ -33,6 +33,11 @@ func TestTry_noError(t *testing.T) {
 	try.To2(twoStrNoThrow())
 	try.To2(intStrNoThrow())
 	try.To3(boolIntStrNoThrow())
+
+	_ = try.T1(noThrow())("test")
+	_, _ = try.T2(twoStrNoThrow())("test %d", 1)
+	_, _ = try.T2(intStrNoThrow())("test %d", 2)
+	_, _, _ = try.T3(boolIntStrNoThrow())("test %d",3)
 }
 
 func TestDefault_Error(t *testing.T) {
@@ -814,25 +819,12 @@ func BenchmarkTry_ErrVar(b *testing.B) {
 	}
 }
 
-func BenchmarkTryOut_ErrVar(b *testing.B) {
-	for n := 0; n < b.N; n++ {
-		_, err := noThrow()
-		try.Out(err).Handle()
-	}
-}
-
 func BenchmarkTry_StringGenerics(b *testing.B) {
 	for n := 0; n < b.N; n++ {
 		_ = try.To1(noThrow())
 	}
 }
 
-func BenchmarkTryOut_StringGenerics(b *testing.B) {
-	for n := 0; n < b.N; n++ {
-		_ = try.Out1(noThrow()).Handle()
-	}
-}
-
 func BenchmarkTry_StrStrGenerics(b *testing.B) {
 	for n := 0; n < b.N; n++ {
 		_, _ = try.To2(twoStrNoThrow())
@@ -852,6 +844,38 @@ func BenchmarkTryVarCall(b *testing.B) {
 	}
 }
 
+func BenchmarkTryOut_ErrVar(b *testing.B) {
+	for n := 0; n < b.N; n++ {
+		_, err := noThrow()
+		try.Out(err).Handle()
+	}
+}
+
+func BenchmarkTryOut_LogStringGenerics(b *testing.B) {
+	for n := 0; n < b.N; n++ {
+		_ = try.Out1(noThrow()).Logf("test").Val1
+	}
+}
+
+func BenchmarkTryOut_StringGenerics(b *testing.B) {
+	for n := 0; n < b.N; n++ {
+		_ = try.Out1(noThrow()).Handle().Val1
+	}
+}
+
+func BenchmarkT_ErrVar(b *testing.B) {
+	for n := 0; n < b.N; n++ {
+		_, err := noThrow()
+		try.T(err)("test")
+	}
+}
+
+func BenchmarkT_StringGenerics(b *testing.B) {
+	for n := 0; n < b.N; n++ {
+		_ = try.T1(noThrow())("test")
+	}
+}
+
 func BenchmarkRecursionWithOldErrorCheck(b *testing.B) {
 	var recursionWithErrorCheck func(a int) (int, error)
 	recursionWithErrorCheck = func(a int) (int, error) {

try/try.go

@@ -65,9 +65,11 @@ package try
 
 import (
 	"errors"
+	"fmt"
 	"io"
 
 	"github.com/lainio/err2"
+	"github.com/lainio/err2/internal/handler"
 )
 
 // To is a helper function to call functions which returns an error value and
@@ -239,3 +241,50 @@ func IsNotRecoverable(err error) bool {
 func IsNotEnabled(err error) bool {
 	return Is(err, err2.ErrNotEnabled)
 }
+
+// T is similar as [To] but it let's you to annotate a possible error at place.
+//
+//	try.T(f.Close)("annotations")
+func T(err error) func(fs string, a ...any) {
+	return func(fs string, a ...any) {
+		if err != nil {
+			er := fmt.Errorf(fs+handler.WrapError, append(a[1:], err)...)
+			panic(er)
+		}
+	}
+}
+
+// T1 is similar as [To1] but it let's you to annotate a possible error at place.
+//
+//	f := try.T1(os.Open("filename")("cannot open cfg file")
+func T1[T any](v T, err error) func(fs string, a ...any) T {
+	return func(fs string, a ...any) T {
+		if err != nil {
+			er := fmt.Errorf(fs+handler.WrapError, append(a[1:], err)...)
+			panic(er)
+		}
+		return v
+	}
+}
+
+// T2 is similar as [To2] but it let's you to annotate a possible error at place.
+func T2[T, U any](v T, u U, err error) func(fs string, a ...any) (T, U) {
+	return func(fs string, a ...any) (T, U) {
+		if err != nil {
+			er := fmt.Errorf(fs+handler.WrapError, append(a[1:], err)...)
+			panic(er)
+		}
+		return v, u
+	}
+}
+
+// T3 is similar as [To3] but it let's you to annotate a possible error at place.
+func T3[T, U, V any](v1 T, v2 U, v3 V, err error) func(fs string, a ...any) (T, U, V) {
+	return func(fs string, a ...any) (T, U, V) {
+		if err != nil {
+			er := fmt.Errorf(fs+handler.WrapError, append(a[1:], err)...)
+			panic(er)
+		}
+		return v1, v2, v3
+	}
+}