try variadic helper

Author: jub0bs

errutil.go

@@ -114,37 +114,32 @@ func Find[T error](err error) (T, bool) {
 		return zero, false
 	}
 	var ptr *T
-	return find(err, &ptr)
+	return find(&ptr, err)
 }
 
-func find[T error](err error, ptr2 **T) (T, bool) {
-	x, ok := err.(T)
-	if ok {
-		return x, true
-	}
-	if x, ok := err.(interface{ As(any) bool }); ok {
-		if *ptr2 == nil {
-			*ptr2 = new(T)
-		}
-		if x.As(*ptr2) {
-			return **ptr2, true
+func find[T error](ptr2 **T, errs ...error) (T, bool) {
+	for _, err := range errs {
+		x, ok := err.(T)
+		if ok {
+			return x, true
 		}
-	}
-	switch x := err.(type) {
-	case interface{ Unwrap() error }:
-		err = x.Unwrap()
-		if err == nil {
-			break
+		if x, ok := err.(interface{ As(any) bool }); ok {
+			if *ptr2 == nil {
+				*ptr2 = new(T)
+			}
+			if x.As(*ptr2) {
+				return **ptr2, true
+			}
 		}
-		return find(err, ptr2)
-	case interface{ Unwrap() []error }:
-		for _, err := range x.Unwrap() {
+		switch x := err.(type) {
+		case interface{ Unwrap() error }:
+			err = x.Unwrap()
 			if err == nil {
-				continue
-			}
-			if x, ok := find(err, ptr2); ok {
-				return x, true
+				break
 			}
+			return find(ptr2, err)
+		case interface{ Unwrap() []error }:
+			return find(ptr2, x.Unwrap()...)
 		}
 	}
 	var zero T