Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a shorthand for AppendInvoke #65

Merged
merged 3 commits into from Sep 6, 2022
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 19 additions & 0 deletions error.go
Expand Up @@ -660,3 +660,22 @@ func Close(closer io.Closer) Invoker {
func AppendInvoke(into *error, invoker Invoker) {
AppendInto(into, invoker.Invoke())
}

// AppendFunc is a shorthand for [AppendInvoke].
// It allows using function or method value directly
// without having to wrap it into an [Invoker] interface.
//
// func doSomething(...) (err error) {
// w, err := startWorker(...)
// if err != nil {
// return err
// }
//
// // multierr will call w.Stop() when this function returns and
// // if the operation fails, it appends its error into the
// // returned error.
// defer multierr.AppendFunc(&err, w.Stop)
// }
func AppendFunc(into *error, fn func() error) {
AppendInvoke(into, Invoke(fn))
}
20 changes: 20 additions & 0 deletions error_test.go
Expand Up @@ -675,6 +675,26 @@ func TestAppendIntoNil(t *testing.T) {
})
}

func TestAppendFunc(t *testing.T) {
var (
errDeferred = errors.New("deferred func called")
errOriginal = errors.New("original error")
)

stopFunc := func() error {
return errDeferred
}

do := func() (err error) {
defer AppendFunc(&err, stopFunc)

return errOriginal
}

err := do()
sywhang marked this conversation as resolved.
Show resolved Hide resolved
assert.Equal(t, []error{errOriginal, errDeferred}, Errors(err), "both deferred and original error must be returned")
}

func errorPtr(err error) *error {
return &err
}
Expand Down