ostiwe/go-toml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Encode: don't inherit omitempty (#803)

Browse Source 
Fixes #786.
This commit is contained in:
Thomas Pelletier
2022-08-15 11:29:46 -04:00
committed by GitHub
parent 67bc5422f3
commit 2d8433b69e
2 changed files with 50 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
marshaler.go
+5 -5
View File
@@ -346,8 +346,8 @@ func isNil(v reflect.Value) bool {
}
}
func shouldOmitEmpty(ctx encoderCtx, options valueOptions, v reflect.Value) bool {
return (ctx.options.omitempty || options.omitempty) && isEmptyValue(v)
func shouldOmitEmpty(options valueOptions, v reflect.Value) bool {
return options.omitempty && isEmptyValue(v)
}
func (enc *Encoder) encodeKv(b []byte, ctx encoderCtx, options valueOptions, v reflect.Value) ([]byte, error) {
@@ -801,7 +801,7 @@ func (enc *Encoder) encodeTable(b []byte, ctx encoderCtx, t table) ([]byte, erro
hasNonEmptyKV := false
for _, kv := range t.kvs {
if shouldOmitEmpty(ctx, kv.Options, kv.Value) {
if shouldOmitEmpty(kv.Options, kv.Value) {
continue
}
hasNonEmptyKV = true
@@ -818,7 +818,7 @@ func (enc *Encoder) encodeTable(b []byte, ctx encoderCtx, t table) ([]byte, erro
first := true
for _, table := range t.tables {
if shouldOmitEmpty(ctx, table.Options, table.Value) {
if shouldOmitEmpty(table.Options, table.Value) {
continue
}
if first {
@@ -850,7 +850,7 @@ func (enc *Encoder) encodeTableInline(b []byte, ctx encoderCtx, t table) ([]byte
first := true
for _, kv := range t.kvs {
if shouldOmitEmpty(ctx, kv.Options, kv.Value) {
if shouldOmitEmpty(kv.Options, kv.Value) {
continue
}