summaryrefslogtreecommitdiff
path: root/internal/mkserialize/mkserialize.go
diff options
context:
space:
mode:
authorHimbeerserverDE <himbeerserverde@gmail.com>2023-12-09 15:05:31 +0100
committerHimbeerserverDE <himbeerserverde@gmail.com>2023-12-09 15:05:31 +0100
commit8f944dcbbb256ea658f4622a13f3b734dc94fe3a (patch)
treeeb65df0692addec15d3f8d10daaadc97c65a0e3b /internal/mkserialize/mkserialize.go
parent78a1d0d22093eab85cc806bbfe0cd2d972f9ce0a (diff)
Revert "nested trailing data errors: still attempt deserialization"
This reverts commit f52a9a1956f5cdabfc88c818cedafec1f3e47ec9.
Diffstat (limited to 'internal/mkserialize/mkserialize.go')
-rw-r--r--internal/mkserialize/mkserialize.go11
1 files changed, 2 insertions, 9 deletions
diff --git a/internal/mkserialize/mkserialize.go b/internal/mkserialize/mkserialize.go
index f5dbeb4..4535aaa 100644
--- a/internal/mkserialize/mkserialize.go
+++ b/internal/mkserialize/mkserialize.go
@@ -200,13 +200,8 @@ func genSerialize(t types.Type, expr string, pos token.Pos, doc *ast.CommentGrou
lenhdr = types.Typ[types.Uint32]
case "//mt:opt":
fmt.Println("if err := pcall(func() {")
- defer func() {
- fmt.Println("}); err != nil && err != io.EOF {")
- fmt.Println("if _, ok := err.(rudp.TrailingDataError); ok {")
- fmt.Println("defer chk(err)")
- fmt.Println("} else { chk(err) }")
- fmt.Println("}")
- }()
+ defer fmt.Println("}); err != nil && err != io.EOF",
+ "{ chk(err) }")
default:
pragma = false
}
@@ -272,9 +267,7 @@ func genSerialize(t types.Type, expr string, pos token.Pos, doc *ast.CommentGrou
fmt.Println("}); err != nil",
`{`,
`if err == io.EOF { chk(io.EOF) };`,
- `if _, ok := err.(rudp.TrailingDataError); ok { defer chk(err) } else {`,
`chk(fmt.Errorf("%s: %w", `+strconv.Quote(t.String())+`, err))`,
- `}`,
`}`)
case *types.Struct:
st := pos2node(pos)[0].(*ast.StructType)