Errors include context information about erroneous field

Author: shabbyrobe

_generated/convert_test.go

@@ -12,8 +12,8 @@ func TestConvertFromEncodeError(t *testing.T) {
 	var buf bytes.Buffer
 	w := msgp.NewWriter(&buf)
 	err := e.EncodeMsg(w)
-	if err != errConvertFrom {
-		t.Fatalf("expected conversion error, found %v", err.Error())
+	if msgp.Cause(err) != errConvertFrom {
+		t.Fatalf("expected conversion error, found '%v'", err.Error())
 	}
 }
 
@@ -30,7 +30,8 @@ func TestConvertToEncodeError(t *testing.T) {
 
 	r := msgp.NewReader(&buf)
 	err = (&out).DecodeMsg(r)
-	if err != errConvertTo {
+
+	if msgp.Cause(err) != errConvertTo {
 		t.Fatalf("expected conversion error, found %v", err.Error())
 	}
 }
@@ -39,7 +40,7 @@ func TestConvertFromMarshalError(t *testing.T) {
 	e := ConvertErr{ConvertErrVal(fromFailStr)}
 	var b []byte
 	_, err := e.MarshalMsg(b)
-	if err != errConvertFrom {
+	if msgp.Cause(err) != errConvertFrom {
 		t.Fatalf("expected conversion error, found %v", err.Error())
 	}
 }
@@ -53,7 +54,7 @@ func TestConvertToMarshalError(t *testing.T) {
 	}
 
 	_, err = (&out).UnmarshalMsg(b)
-	if err != errConvertTo {
+	if msgp.Cause(err) != errConvertTo {
 		t.Fatalf("expected conversion error, found %v", err.Error())
 	}
 }

_generated/def.go

@@ -194,7 +194,7 @@ type Custom struct {
 	Bts   CustomBytes          `msg:"bts"`
 	Mp    map[string]*Embedded `msg:"mp"`
 	Enums []MyEnum             `msg:"enums"` // test explicit enum shim
-	Some  FileHandle           `msg:file_handle`
+	Some  FileHandle           `msg:"file_handle"`
 }
 
 type Files []*os.File

_generated/errorwrap.go

@@ -0,0 +1,60 @@
+package _generated
+
+//go:generate msgp
+
+// The leaves of interest in this crazy structs are strings. The test case
+// looks for strings in the serialised msgpack and makes them unreadable.
+
+type ErrorCtxMapChild struct {
+	Val string
+}
+
+type ErrorCtxAsMap struct {
+	Val      string
+	Child    *ErrorCtxMapChild
+	Children []*ErrorCtxMapChild
+	Map      map[string]string
+
+	Nest struct {
+		Val      string
+		Child    *ErrorCtxMapChild
+		Children []*ErrorCtxMapChild
+		Map      map[string]string
+
+		Nest struct {
+			Val      string
+			Child    *ErrorCtxMapChild
+			Children []*ErrorCtxMapChild
+			Map      map[string]string
+		}
+	}
+}
+
+//msgp:tuple ErrorCtxTupleChild
+
+type ErrorCtxTupleChild struct {
+	Val string
+}
+
+//msgp:tuple ErrorCtxAsTuple
+
+type ErrorCtxAsTuple struct {
+	Val      string
+	Child    *ErrorCtxTupleChild
+	Children []*ErrorCtxTupleChild
+	Map      map[string]string
+
+	Nest struct {
+		Val      string
+		Child    *ErrorCtxTupleChild
+		Children []*ErrorCtxTupleChild
+		Map      map[string]string
+
+		Nest struct {
+			Val      string
+			Child    *ErrorCtxTupleChild
+			Children []*ErrorCtxTupleChild
+			Map      map[string]string
+		}
+	}
+}