kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #38456 from thaJeztah/make_errdefs_idempotent

Browse source 
Make errdefs helpers idempotent
This commit is contained in:
Sebastiaan van Stijn 2019-01-09 11:41:50 +01:00 • committed by GitHub
commit cb501886db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
errdefs/helpers.go
View file

@ -12,8 +12,8 @@ func (e errNotFound) Cause() error {
// NotFound is a helper to create an error of the class with the same name from any error type // NotFound is a helper to create an error of the class with the same name from any error type
func NotFound(err error) error { func NotFound(err error) error {
if err == nil { if err == nil || IsNotFound(err) {
return nil return err
} }
return errNotFound{err} return errNotFound{err}
} }
@ -28,8 +28,8 @@ func (e errInvalidParameter) Cause() error {
// InvalidParameter is a helper to create an error of the class with the same name from any error type // InvalidParameter is a helper to create an error of the class with the same name from any error type
func InvalidParameter(err error) error { func InvalidParameter(err error) error {
if err == nil { if err == nil || IsInvalidParameter(err) {
return nil return err
} }
return errInvalidParameter{err} return errInvalidParameter{err}
} }
@ -44,8 +44,8 @@ func (e errConflict) Cause() error {
// Conflict is a helper to create an error of the class with the same name from any error type // Conflict is a helper to create an error of the class with the same name from any error type
func Conflict(err error) error { func Conflict(err error) error {
if err == nil { if err == nil || IsConflict(err) {
return nil return err
} }
return errConflict{err} return errConflict{err}
} }
@ -60,8 +60,8 @@ func (e errUnauthorized) Cause() error {
// Unauthorized is a helper to create an error of the class with the same name from any error type // Unauthorized is a helper to create an error of the class with the same name from any error type
func Unauthorized(err error) error { func Unauthorized(err error) error {
if err == nil { if err == nil || IsUnauthorized(err) {
return nil return err
} }
return errUnauthorized{err} return errUnauthorized{err}
} }
@ -76,8 +76,8 @@ func (e errUnavailable) Cause() error {
// Unavailable is a helper to create an error of the class with the same name from any error type // Unavailable is a helper to create an error of the class with the same name from any error type
func Unavailable(err error) error { func Unavailable(err error) error {
if err == nil { if err == nil || IsUnavailable(err) {
return nil return err
} }
return errUnavailable{err} return errUnavailable{err}
} }
@ -92,8 +92,8 @@ func (e errForbidden) Cause() error {
// Forbidden is a helper to create an error of the class with the same name from any error type // Forbidden is a helper to create an error of the class with the same name from any error type
func Forbidden(err error) error { func Forbidden(err error) error {
if err == nil { if err == nil || IsForbidden(err) {
return nil return err
} }
return errForbidden{err} return errForbidden{err}
} }
@ -108,8 +108,8 @@ func (e errSystem) Cause() error {
// System is a helper to create an error of the class with the same name from any error type // System is a helper to create an error of the class with the same name from any error type
func System(err error) error { func System(err error) error {
if err == nil { if err == nil || IsSystem(err) {
return nil return err
} }
return errSystem{err} return errSystem{err}
} }
@ -124,8 +124,8 @@ func (e errNotModified) Cause() error {
// NotModified is a helper to create an error of the class with the same name from any error type // NotModified is a helper to create an error of the class with the same name from any error type
func NotModified(err error) error { func NotModified(err error) error {
if err == nil { if err == nil || IsNotModified(err) {
return nil return err
} }
return errNotModified{err} return errNotModified{err}
} }
@ -140,8 +140,8 @@ func (e errAlreadyExists) Cause() error {
// AlreadyExists is a helper to create an error of the class with the same name from any error type // AlreadyExists is a helper to create an error of the class with the same name from any error type
func AlreadyExists(err error) error { func AlreadyExists(err error) error {
if err == nil { if err == nil || IsAlreadyExists(err) {
return nil return err
} }
return errAlreadyExists{err} return errAlreadyExists{err}
} }
@ -156,8 +156,8 @@ func (e errNotImplemented) Cause() error {
// NotImplemented is a helper to create an error of the class with the same name from any error type // NotImplemented is a helper to create an error of the class with the same name from any error type
func NotImplemented(err error) error { func NotImplemented(err error) error {
if err == nil { if err == nil || IsNotImplemented(err) {
return nil return err
} }
return errNotImplemented{err} return errNotImplemented{err}
} }
@ -172,8 +172,8 @@ func (e errUnknown) Cause() error {
// Unknown is a helper to create an error of the class with the same name from any error type // Unknown is a helper to create an error of the class with the same name from any error type
func Unknown(err error) error { func Unknown(err error) error {
if err == nil { if err == nil || IsUnknown(err) {
return nil return err
} }
return errUnknown{err} return errUnknown{err}
} }
@ -188,8 +188,8 @@ func (e errCancelled) Cause() error {
// Cancelled is a helper to create an error of the class with the same name from any error type // Cancelled is a helper to create an error of the class with the same name from any error type
func Cancelled(err error) error { func Cancelled(err error) error {
if err == nil { if err == nil || IsCancelled(err) {
return nil return err
} }
return errCancelled{err} return errCancelled{err}
} }
@ -204,8 +204,8 @@ func (e errDeadline) Cause() error {
// Deadline is a helper to create an error of the class with the same name from any error type // Deadline is a helper to create an error of the class with the same name from any error type
func Deadline(err error) error { func Deadline(err error) error {
if err == nil { if err == nil || IsDeadline(err) {
return nil return err
} }
return errDeadline{err} return errDeadline{err}
} }
@ -220,8 +220,8 @@ func (e errDataLoss) Cause() error {
// DataLoss is a helper to create an error of the class with the same name from any error type // DataLoss is a helper to create an error of the class with the same name from any error type
func DataLoss(err error) error { func DataLoss(err error) error {
if err == nil { if err == nil || IsDataLoss(err) {
return nil return err
} }
return errDataLoss{err} return errDataLoss{err}
} }