aboutsummaryrefslogtreecommitdiff
path: root/src/errors/errors.go
diff options
context:
space:
mode:
Diffstat (limited to 'src/errors/errors.go')
-rw-r--r--src/errors/errors.go34
1 files changed, 2 insertions, 32 deletions
diff --git a/src/errors/errors.go b/src/errors/errors.go
index 51175b13c8..b8a46921be 100644
--- a/src/errors/errors.go
+++ b/src/errors/errors.go
@@ -5,46 +5,16 @@
// Package errors implements functions to manipulate errors.
package errors
-import (
- "internal/errinternal"
- "runtime"
-)
-
// New returns an error that formats as the given text.
-//
-// The returned error contains a Frame set to the caller's location and
-// implements Formatter to show this information when printed with details.
func New(text string) error {
- // Inline call to errors.Callers to improve performance.
- var s Frame
- runtime.Callers(2, s.frames[:])
- return &errorString{text, nil, s}
-}
-
-func init() {
- errinternal.NewError = func(text string, err error) error {
- var s Frame
- runtime.Callers(3, s.frames[:])
- return &errorString{text, err, s}
- }
+ return &errorString{text}
}
// errorString is a trivial implementation of error.
type errorString struct {
- s string
- err error
- frame Frame
+ s string
}
func (e *errorString) Error() string {
- if e.err != nil {
- return e.s + ": " + e.err.Error()
- }
return e.s
}
-
-func (e *errorString) FormatError(p Printer) (next error) {
- p.Print(e.s)
- e.frame.Format(p)
- return e.err
-}