feat!: replace WrappedErrors with Unwrap

sagikazarmark · sagikazarmark · commit 44474a23a60e · 2024-06-02T09:46:15.000+02:00
Signed-off-by: Mark Sagi-Kazar &lt;mark.sagikazar@gmail.com&gt;
diff --git a/error.go b/error.go
@@ -25,9 +25,8 @@ func (e *joinedError) Error() string {
 		len(e.Errors), strings.Join(points, "\n"))
 }
 
-// WrappedErrors implements the errwrap.Wrapper interface to make this
-// return value more useful with the errwrap and go-multierror libraries.
-func (e *joinedError) WrappedErrors() []error {
+// Unwrap implements the Unwrap function added in Go 1.20.
+func (e *joinedError) Unwrap() []error {
 	if e == nil {
 		return nil
 	}
@@ -40,6 +39,7 @@ func (e *joinedError) WrappedErrors() []error {
 	return result
 }
 
+// TODO: replace with errors.Join when Go 1.20 is minimum version.
 func appendErrors(errors []string, err error) []string {
 	switch e := err.(type) {
 	case *joinedError:

Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,8 @@ func (e *joinedError) Error() string {`
`25`	`25`	`len(e.Errors), strings.Join(points, "\n"))`
`26`	`26`	`}`
`27`	`27`
`28`		`-// WrappedErrors implements the errwrap.Wrapper interface to make this`
`29`		`-// return value more useful with the errwrap and go-multierror libraries.`
`30`		`-func (e *joinedError) WrappedErrors() []error {`
	`28`	`+// Unwrap implements the Unwrap function added in Go 1.20.`
	`29`	`+func (e *joinedError) Unwrap() []error {`
`31`	`30`	`if e == nil {`
`32`	`31`	`return nil`
`33`	`32`	`}`
`@@ -40,6 +39,7 @@ func (e *joinedError) WrappedErrors() []error {`
`40`	`39`	`return result`
`41`	`40`	`}`
`42`	`41`
	`42`	`+// TODO: replace with errors.Join when Go 1.20 is minimum version.`
`43`	`43`	`func appendErrors(errors []string, err error) []string {`
`44`	`44`	`switch e := err.(type) {`
`45`	`45`	`case *joinedError:`