lzc256
/
tailscale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util/multierr: implement Go 1.20+'s multiple error Unwrap 

Now that Go 1.20 is released, multierr.Error can implement
Unwrap() []error

Updates #7123

Signed-off-by: Andrew Dunham <andrew@du.nham.ca>
Change-Id: Ic28c2579de6799801836c447afbca8cdcba732cf
pull/7164/head
Andrew Dunham 2023-02-02 12:53:24 -05:00
parent 5ba2543828
commit 2dc3dc21a8
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
util/multierr/multierr.go
View File

@ -33,15 +33,12 @@ func (e Error) Errors() []error {
return slices.Clone(e.errs) return slices.Clone(e.errs)
} }
// TODO(https://go.dev/cl/53435): Implement Unwrap when Go 1.20 is released. // Unwrap returns the underlying errors as-is.
/*
// Unwrap returns the underlying errors as is.
func (e Error) Unwrap() []error { func (e Error) Unwrap() []error {
// Do not clone since Unwrap requires callers to not mutate the slice. // Do not clone since Unwrap requires callers to not mutate the slice.
// See the documentation in the Go "errors" package. // See the documentation in the Go "errors" package.
return e.errs return e.errs
} }
*/
// New returns an error composed from errs. // New returns an error composed from errs.
// Some errors in errs get special treatment: // Some errors in errs get special treatment:
@ -135,13 +132,6 @@ func Range(err error, fn func(error) bool) bool {
return false return false
} }
} }
// TODO(https://go.dev/cl/53435): Delete this when Error implements Unwrap.
case Error:
for _, err := range err.errs {
if !Range(err, fn) {
return false
}
}
} }
return true return true
} }