Use errors.Is to detect wrapped EOF errors

MarcoPolo · Mar 10, 2022 · ae38a94 · ae38a94
1 parent e120cdc
commit ae38a94
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 15 deletions.
diff --git a/gen.go b/gen.go
@@ -59,6 +59,7 @@ import (
 	"io"
 	"math"
 	"sort"
+	"errors"
 
 {{ range .Imports }}{{ .Name }} "{{ .PkgPath }}"
 {{ end }}
@@ -1043,8 +1044,8 @@ func (t *{{ .Name}}) UnmarshalCBOR(r io.Reader) (err error) {
 		return err
 	}
 	defer func() {
-		if err == io.EOF {
-			err = io.ErrUnexpectedEOF
+		if errors.Is(err, io.EOF) {
+			err = xerrors.Errorf("%w: %v", io.ErrUnexpectedEOF, err)
 		}
 	}()
 
@@ -1207,8 +1208,8 @@ func (t *{{ .Name}}) UnmarshalCBOR(r io.Reader) (err error) {
 		return err
 	}
 	defer func() {
-		if err == io.EOF {
-			err = io.ErrUnexpectedEOF
+		if errors.Is(err, io.EOF) {
+			err = xerrors.Errorf("%w: %v", io.ErrUnexpectedEOF, err)
 		}
 	}()
 

diff --git a/testing/cbor_gen.go b/testing/cbor_gen.go
diff --git a/testing/cbor_map_gen.go b/testing/cbor_map_gen.go