mediocregopher/mediocre-go-lib
1
0
Fork 0
Code Releases Activity

merr: make New take in optional key/value pairs for convenience

Browse Source
This commit is contained in:
Brian Picciano 2019-01-25 17:32:53 -05:00
parent b33b157e15
commit ddd26259b2
2 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
merr/kv_test.go
View File

@ -15,12 +15,13 @@ func TestKV(t *T) {
massert.Len(KV(nil).KV(), 0), massert.Len(KV(nil).KV(), 0),
)) ))
er := New("foo") er := New("foo", "bar", "baz")
kv := KV(er).KV() kv := KV(er).KV()
massert.Fatal(t, massert.Comment( massert.Fatal(t, massert.Comment(
massert.All( massert.All(
massert.Len(kv, 2), massert.Len(kv, 3),
massert.Equal("foo", kv["err"]), massert.Equal("foo", kv["err"]),
massert.Equal("baz", kv["bar"]),
massert.Equal(true, massert.Equal(true,
strings.HasPrefix(kv["errSrc"].(string), "merr/kv_test.go:")), strings.HasPrefix(kv["errSrc"].(string), "merr/kv_test.go:")),
), ),
@ -36,8 +37,9 @@ func TestKV(t *T) {
kv = KV(er).KV() kv = KV(er).KV()
massert.Fatal(t, massert.Comment( massert.Fatal(t, massert.Comment(
massert.All( massert.All(
massert.Len(kv, 3), massert.Len(kv, 4),
massert.Equal("foo", kv["err"]), massert.Equal("foo", kv["err"]),
massert.Equal("baz", kv["bar"]),
massert.Equal(true, massert.Equal(true,
strings.HasPrefix(kv["errSrc"].(string), "merr/kv_test.go:")), strings.HasPrefix(kv["errSrc"].(string), "merr/kv_test.go:")),
massert.Equal("1", kv["k"]), massert.Equal("1", kv["k"]),
@ -49,8 +51,9 @@ func TestKV(t *T) {
kv = KV(er).KV() kv = KV(er).KV()
massert.Fatal(t, massert.Comment( massert.Fatal(t, massert.Comment(
massert.All( massert.All(
massert.Len(kv, 4), massert.Len(kv, 5),
massert.Equal("foo", kv["err"]), massert.Equal("foo", kv["err"]),
massert.Equal("baz", kv["bar"]),
massert.Equal(true, massert.Equal(true,
strings.HasPrefix(kv["errSrc"].(string), "merr/kv_test.go:")), strings.HasPrefix(kv["errSrc"].(string), "merr/kv_test.go:")),
massert.Equal("1", kv["merr.A(k)"]), massert.Equal("1", kv["merr.A(k)"]),
@ -63,8 +66,9 @@ func TestKV(t *T) {
kv = KV(er).KV() kv = KV(er).KV()
massert.Fatal(t, massert.Comment( massert.Fatal(t, massert.Comment(
massert.All( massert.All(
massert.Len(kv, 5), massert.Len(kv, 6),
massert.Equal("foo", kv["err"]), massert.Equal("foo", kv["err"]),
massert.Equal("baz", kv["bar"]),
massert.Equal(true, massert.Equal(true,
strings.HasPrefix(kv["errSrc"].(string), "merr/kv_test.go:")), strings.HasPrefix(kv["errSrc"].(string), "merr/kv_test.go:")),
massert.Equal("1", kv["merr.A(k)"]), massert.Equal("1", kv["merr.A(k)"]),

24
merr/merr.go
View File

@ -83,13 +83,25 @@ func Wrap(e error) error {
// New returns a new error with the given string as its error string. New // New returns a new error with the given string as its error string. New
// automatically wraps the error in merr's inner type, which embeds information // automatically wraps the error in merr's inner type, which embeds information
// like the stack trace. // like the stack trace.
func New(str string) error { //
return wrap(errors.New(str), false, 1) // For convenience, visible key/values may be passed into New at this point. For
// example, the following two are equivalent:
//
// merr.WithValue(merr.New("foo"), "bar", "baz", true)
// merr.New("foo", "bar", "baz")
//
func New(str string, kvs ...interface{}) error {
if len(kvs)%2 != 0 {
panic("key passed in without corresponding value")
} }
err := wrap(errors.New(str), false, 1)
// Errorf is like New, but allows for formatting of the string. for i := 0; i < len(kvs); i += 2 {
func Errorf(str string, args ...interface{}) error { err.attr[kvs[i]] = val{
return wrap(fmt.Errorf(str, args...), false, 1) visible: true,
val: kvs[i+1],
}
}
return err
} }
func (er *err) visibleAttrs() [][2]string { func (er *err) visibleAttrs() [][2]string {