Merge branch 'internal-variadic-removal' into repare-major-release

Author: lainio

err2.go

@@ -86,7 +86,7 @@ func Handle(err *error, a ...any) {
 	// how how it works with defer.
 	r := recover()
 
-	if !handler.WorkToDo(r, err) && !handler.NoerrCallToDo(a...) {
+	if !handler.WorkToDo(r, err) && !handler.NoerrCallToDo(a) {
 		return
 	}
 
@@ -96,7 +96,7 @@ func Handle(err *error, a ...any) {
 	*err = handler.PreProcess(err, &handler.Info{
 		CallerName: "Handle",
 		Any:        r,
-	}, a...)
+	}, a)
 }
 
 // Catch is a convenient helper to those functions that doesn't return errors.
@@ -157,7 +157,7 @@ func Catch(a ...any) {
 	err = handler.PreProcess(&err, &handler.Info{
 		CallerName: "Catch",
 		Any:        r,
-	}, a...)
+	}, a)
 	doTrace(err)
 }
 

internal/handler/handler.go

@@ -221,8 +221,10 @@ func WorkToDo(r any, err *error) bool {
 	return (err != nil && *err != nil) || r != nil
 }
 
-func NoerrCallToDo(a ...any) (yes bool) {
-	//var yes bool
+// NoerrCallToDo returns if we have the _exception case_, aka, func (noerr bool)
+// where these handlers are called even normally only error handlers are called,
+// i.e. those which have error to handle.
+func NoerrCallToDo(a []any) (yes bool) {
 	if len(a) != 0 {
 		_, yes = a[0].(CheckHandler)
 	}
@@ -249,7 +251,7 @@ func Process(info *Info) {
 
 // PreProcess is currently used for err2 API like err2.Handle and .Catch.
 //   - replaces the Process
-func PreProcess(errPtr *error, info *Info, a ...any) error {
+func PreProcess(errPtr *error, info *Info, a []any) error {
 	// Bug in Go?
 	// start to use local error ptr only for optimization reasons.
 	// We get 3x faster defer handlers without unsing ptr to original err
@@ -265,7 +267,7 @@ func PreProcess(errPtr *error, info *Info, a ...any) error {
 	const lvl = -1
 
 	if len(a) > 0 {
-		subProcess(info, a...)
+		subProcess(info, a)
 	} else {
 		fnName := "Handle" // default
 		if info.CallerName != "" {
@@ -307,16 +309,7 @@ func PreProcess(errPtr *error, info *Info, a ...any) error {
 	return err
 }
 
-// firstArgIsString not used any more.
-func _(a ...any) bool {
-	if len(a) > 0 {
-		_, isStr := a[0].(string)
-		return isStr
-	}
-	return false
-}
-
-func subProcess(info *Info, a ...any) {
+func subProcess(info *Info, a []any) {
 	// not that switch cannot be 0: see call side
 	switch len(a) {
 	case 0:
@@ -325,22 +318,22 @@ programming error: subProcess: case 0:
 ---`
 		fmt.Fprintln(os.Stderr, color.Red()+msg+color.Reset())
 	case 1:
-		processArg(info, 0, a...)
+		processArg(info, 0, a)
 	default: // case 2, 3, ...
-		processArg(info, 0, a...)
+		processArg(info, 0, a)
 		if _, ok := a[1].(PanicFn); ok {
-			processArg(info, 1, a...)
+			processArg(info, 1, a)
 		} else if _, ok := a[1].(ErrorFn); ok {
 			// check second ^ and then change the rest by combining them to
 			// one that we set to proper places: ErrorFn and NilFn
-			hfn := Pipeline(AssertErrHandlers(a))
+			hfn := Pipeline(ToErrorFns(a))
 			info.ErrorFn = hfn
 			info.NilFn = hfn
 		}
 	}
 }
 
-func processArg(info *Info, i int, a ...any) {
+func processArg(info *Info, i int, a []any) {
 	switch first := a[i].(type) {
 	case string:
 		info.Format = first
@@ -411,25 +404,17 @@ func Pipeline(f []ErrorFn) ErrorFn {
 	}
 }
 
-func bugAssertErrHandlers(handlerFns ...any) (hs []ErrorFn) {
-	hs = make([]ErrorFn, 0, len(handlerFns))
-	for _, a := range handlerFns {
-		if fn, ok := a.(ErrorFn); ok {
-			hs = append(hs, fn)
-		} else {
-			return nil
-		}
-	}
-	return hs
-}
-
-func AssertErrHandlers(handlerFns []any) (hs []ErrorFn) {
+func ToErrorFns(handlerFns []any) (hs []ErrorFn) {
 	count := len(handlerFns)
 	hs = make([]ErrorFn, 0, count)
 	for _, a := range handlerFns {
 		if fn, ok := a.(ErrorFn); ok {
 			hs = append(hs, fn)
 		} else {
+			msg := `---
+assertion vialation: your handlers should be 'func(erro) error' type
+---`
+			fmt.Fprintln(os.Stderr, color.Red()+msg+color.Reset())
 			return nil
 		}
 	}

internal/handler/handler_test.go

@@ -141,7 +141,7 @@ var Info = handler.Info{
 func Handle() {
 	a := []any{}
 	Info.Err = &myErrVal
-	myErrVal = handler.PreProcess(&myErrVal, &Info, a...)
+	myErrVal = handler.PreProcess(&myErrVal, &Info, a)
 }
 
 func TestPreProcess_debug(t *testing.T) {
@@ -241,7 +241,7 @@ func TestPreProcess(t *testing.T) {
 				var err = x.Whom(tt.args.Info.Err != nil,
 					*tt.args.Info.Err, nil)
 
-				err = handler.PreProcess(&err, &tt.args.Info, tt.args.a...)
+				err = handler.PreProcess(&err, &tt.args.Info, tt.args.a)
 
 				test.RequireEqual(t, panicHandlerCalled, tt.want.panicCalled)
 				test.RequireEqual(t, errorHandlerCalled, tt.want.errorCalled)

internal/handler/handlers_test.go

@@ -38,7 +38,7 @@ func TestHandlers(t *testing.T) {
 			anys := tt.args.f
 
 			test.Require(t, anys != nil, "cannot be nil")
-			fns := handler.AssertErrHandlers(anys)
+			fns := handler.ToErrorFns(anys)
 			test.Require(t, fns != nil, "cannot be nil")
 
 			errHandler := handler.Pipeline(fns)

try/out.go

@@ -43,7 +43,7 @@ type (
 //
 //	error sending response: UDP not listening
 func (o *Result) Logf(a ...any) *Result {
-	return o.logf(logfFrameLvl, a...)
+	return o.logf(logfFrameLvl, a)
 }
 
 // Logf prints a log line to pre-set logging stream (err2.SetLogWriter)
@@ -57,7 +57,7 @@ func (o *Result) Logf(a ...any) *Result {
 //
 //	error sending response: UDP not listening
 func (o *Result1[T]) Logf(a ...any) *Result1[T] {
-	o.Result.logf(logfFrameLvl, a...)
+	o.Result.logf(logfFrameLvl, a)
 	return o
 }
 
@@ -72,7 +72,7 @@ func (o *Result1[T]) Logf(a ...any) *Result1[T] {
 //
 //	error sending response: UDP not listening
 func (o *Result2[T, U]) Logf(a ...any) *Result2[T, U] {
-	o.Result.logf(logfFrameLvl, a...)
+	o.Result.logf(logfFrameLvl, a)
 	return o
 }
 
@@ -262,7 +262,7 @@ func wrapStr() string {
 	return ": %w"
 }
 
-func (o *Result) logf(lvl int, a ...any) *Result {
+func (o *Result) logf(lvl int, a []any) *Result {
 	if o.Err == nil {
 		return o
 	}