From ca17d23ff175487e63dcd89cbdefab1f8f4bc891 Mon Sep 17 00:00:00 2001 From: franklin Date: Thu, 6 Jul 2023 11:28:22 +0200 Subject: [PATCH] chore: use new Unwrap() []error --- errors/wrappederror.go | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/errors/wrappederror.go b/errors/wrappederror.go index 12ec753..9b1aa8d 100644 --- a/errors/wrappederror.go +++ b/errors/wrappederror.go @@ -1,12 +1,11 @@ package keelerrors -import "errors" - type wrappedError struct { err error cause error } +// NewWrappedError returns a new wrapped error func NewWrappedError(err, cause error) error { return &wrappedError{ err: err, @@ -14,22 +13,10 @@ func NewWrappedError(err, cause error) error { } } -func (e *wrappedError) As(target interface{}) bool { - return errors.As(e.err, target) || errors.As(e.cause, target) -} - -func (e *wrappedError) Is(target error) bool { - return errors.Is(e.err, target) || errors.Is(e.cause, target) -} - -func (e *wrappedError) Cause() error { - return e.cause -} - -func (e *wrappedError) Unwrap() error { - return e.err -} - func (e *wrappedError) Error() string { return e.err.Error() + ": " + e.cause.Error() } + +func (e *wrappedError) Unwrap() []error { + return []error{e.err, e.cause} +}