From 1f90d081391d4f5911960fd28d81d7ea5e554a8f Mon Sep 17 00:00:00 2001 From: Marcel van Lohuizen Date: Wed, 13 Mar 2019 16:25:02 +0100 Subject: fmt: make type of fmt.Errorf the same as that of errors.New This applies only for cases where %w is not used. The purpose of this change is to reduce test failures where tests depend on these two being the same type, as they previously were. Change-Id: I2dd28b93fe1d59f3cfbb4eb0875d1fb8ee699746 Reviewed-on: https://go-review.googlesource.com/c/go/+/167402 Run-TryBot: Marcel van Lohuizen TryBot-Result: Gobot Gobot Reviewed-by: Damien Neil --- src/fmt/errors.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/fmt/errors.go') diff --git a/src/fmt/errors.go b/src/fmt/errors.go index 7506b6a20b..06416425c3 100644 --- a/src/fmt/errors.go +++ b/src/fmt/errors.go @@ -6,6 +6,7 @@ package fmt import ( "errors" + "internal/errinternal" "strings" ) @@ -21,7 +22,7 @@ import ( func Errorf(format string, a ...interface{}) error { err, wrap := lastError(format, a) if err == nil { - return &noWrapError{Sprintf(format, a...), nil, errors.Caller(1)} + return errinternal.NewError(Sprintf(format, a...), nil) } // TODO: this is not entirely correct. The error value could be @@ -33,7 +34,7 @@ func Errorf(format string, a ...interface{}) error { if wrap { return &wrapError{msg, err, errors.Caller(1)} } - return &noWrapError{msg, err, errors.Caller(1)} + return errinternal.NewError(msg, err) } func lastError(format string, a []interface{}) (err error, wrap bool) { -- cgit v1.3-5-g45d5