SagerNet/sing
1
0
Fork 0
mirror of https://github.com/SagerNet/sing.git synced 2025-04-05 12:57:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename mutli error unwrap method

Browse source
This commit is contained in:
世界 2023-02-26 21:33:38 +08:00
parent 7def9588a5
commit e839483670
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/exceptions/error.go
View file

@ -17,7 +17,7 @@ type Handler interface {
} }
type MultiError interface { type MultiError interface {
UnwrapMulti() []error Unwrap() []error
} }
func New(message ...any) error { func New(message ...any) error {

6
common/exceptions/multi.go
View file

@ -16,7 +16,7 @@ func (e *multiError) Error() string {
return strings.Join(F.MapToString(e.errors), " | ") return strings.Join(F.MapToString(e.errors), " | ")
} }
func (e *multiError) UnwrapMulti() []error { func (e *multiError) Unwrap() []error {
return e.errors return e.errors
} }
@ -37,7 +37,7 @@ func Errors(errors ...error) error {
func Expand(err error) []error { func Expand(err error) []error {
if multiErr, isMultiErr := err.(MultiError); isMultiErr { if multiErr, isMultiErr := err.(MultiError); isMultiErr {
return ExpandAll(multiErr.UnwrapMulti()) return ExpandAll(multiErr.Unwrap())
} }
return []error{err} return []error{err}
} }
@ -64,7 +64,7 @@ func IsMulti(err error, targetList ...error) bool {
if !isMulti { if !isMulti {
return false return false
} }
return common.All(multiErr.UnwrapMulti(), func(it error) bool { return common.All(multiErr.Unwrap(), func(it error) bool {
return IsMulti(it, targetList...) return IsMulti(it, targetList...)
}) })
} }