netbird/easyjson
0
0
Fork 0
mirror of https://github.com/netbirdio/easyjson.git synced 2026-05-22 18:44:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Don't pass field tags into nested types"

Browse Source 
This reverts commit 9e9dfede4e.
This commit is contained in:
Alexandr Mayorskiy
2020-04-15 00:45:56 +03:00
parent 0aa9db2e59
commit 3b0c433891
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gen/decoder.go
+5 -5
View File
@@ -171,7 +171,7 @@ func (g *Generator) genTypeDecoderNoCheck(t reflect.Type, out string, tags field
fmt.Fprintln(g.out, ws+" for !in.IsDelim(']') {")
fmt.Fprintln(g.out, ws+" var "+tmpVar+" "+g.getType(elem))
if err := g.genTypeDecoder(elem, tmpVar, fieldTags{}, indent+2); err != nil {
if err := g.genTypeDecoder(elem, tmpVar, tags, indent+2); err != nil {
return err
}
@@ -205,7 +205,7 @@ func (g *Generator) genTypeDecoderNoCheck(t reflect.Type, out string, tags field
fmt.Fprintln(g.out, ws+" for !in.IsDelim(']') {")
fmt.Fprintln(g.out, ws+" if "+iterVar+" < "+fmt.Sprint(length)+" {")
if err := g.genTypeDecoder(elem, "("+out+")["+iterVar+"]", fieldTags{}, indent+3); err != nil {
if err := g.genTypeDecoder(elem, "("+out+")["+iterVar+"]", tags, indent+3); err != nil {
return err
}
@@ -239,7 +239,7 @@ func (g *Generator) genTypeDecoderNoCheck(t reflect.Type, out string, tags field
fmt.Fprintln(g.out, ws+" "+out+" = new("+g.getType(t.Elem())+")")
fmt.Fprintln(g.out, ws+" }")
if err := g.genTypeDecoder(t.Elem(), "*"+out, fieldTags{}, indent+1); err != nil {
if err := g.genTypeDecoder(t.Elem(), "*"+out, tags, indent+1); err != nil {
return err
}
@@ -280,7 +280,7 @@ func (g *Generator) genTypeDecoderNoCheck(t reflect.Type, out string, tags field
fmt.Fprintln(g.out, ws+" key := "+g.getType(key)+"("+keyDec+")")
} else {
fmt.Fprintln(g.out, ws+" var key "+g.getType(key))
if err := g.genTypeDecoder(key, "key", fieldTags{}, indent+2); err != nil {
if err := g.genTypeDecoder(key, "key", tags, indent+2); err != nil {
return err
}
}
@@ -288,7 +288,7 @@ func (g *Generator) genTypeDecoderNoCheck(t reflect.Type, out string, tags field
fmt.Fprintln(g.out, ws+" in.WantColon()")
fmt.Fprintln(g.out, ws+" var "+tmpVar+" "+g.getType(elem))
if err := g.genTypeDecoder(elem, tmpVar, fieldTags{}, indent+2); err != nil {
if err := g.genTypeDecoder(elem, tmpVar, tags, indent+2); err != nil {
return err
}
tests/basic_test.go
-1
View File
@@ -37,7 +37,6 @@ var testCases = []struct {
{&arrayValue, arrayString},
{&mapsValue, mapsString},
{&deepNestValue, deepNestString},
{&deepNestOptionalValue, deepNestOptionalString},
{&IntsValue, IntsString},
{&mapStringStringValue, mapStringStringString},
{&namedTypeValue, namedTypeValueString},