commit 80cce0ee9bf742ce3d7cd815f1410e625debed9c
author Dave Cheney <dave@cheney.net> Mon May 23 17:32:36 2016 +1000
committer Dave Cheney <dave@cheney.net> Mon May 23 17:32:36 2016 +1000
tree fb8ad296696ea3562248d704b879a2dfb43a9dd9
parent daa1017c6faf12b150a39d6a3cb06b740585d7bb

Rename errors.location to errors.stack (#26)

errors.go

diff --git a/errors.go b/errors.go
index af74fc3..8ee3059 100644
--- a/errors.go
+++ b/errors.go
@@ -55,11 +55,11 @@
 	"strings"
 )
 
-// location represents a stack of programm counters.
-type location []uintptr
+// stack represents a stack of programm counters.
+type stack []uintptr
 
-func (l location) Location() (string, int) {
-	pc := l[0] - 1
+func (s stack) Location() (string, int) {
+	pc := s[0] - 1
 	fn := runtime.FuncForPC(pc)
 	if fn == nil {
 		return "unknown", 0
@@ -111,10 +111,10 @@
 func New(text string) error {
 	return struct {
 		error
-		location
+		stack
 	}{
 		errors.New(text),
-		caller(),
+		callers(),
 	}
 }
 
@@ -132,10 +132,10 @@
 func Errorf(format string, args ...interface{}) error {
 	return struct {
 		error
-		location
+		stack
 	}{
 		fmt.Errorf(format, args...),
-		caller(),
+		callers(),
 	}
 }
 
@@ -145,7 +145,7 @@
 	if cause == nil {
 		return nil
 	}
-	return wrap(cause, message, caller())
+	return wrap(cause, message, callers())
 }
 
 // Wrapf returns an error annotating the cause with the format specifier.
@@ -154,19 +154,19 @@
 	if cause == nil {
 		return nil
 	}
-	return wrap(cause, fmt.Sprintf(format, args...), caller())
+	return wrap(cause, fmt.Sprintf(format, args...), callers())
 }
 
-func wrap(err error, msg string, loc location) error {
+func wrap(err error, msg string, st stack) error {
 	return struct {
 		cause
-		location
+		stack
 	}{
 		cause{
 			cause:   err,
 			message: msg,
 		},
-		loc,
+		st,
 	}
 }
 
@@ -235,8 +235,9 @@
 	}
 }
 
-func caller() location {
-	var pcs [1]uintptr
+func callers() stack {
+	const depth = 1
+	var pcs [depth]uintptr
 	n := runtime.Callers(3, pcs[:])
-	return location(pcs[0:n])
+	return pcs[0:n]
 }