epicknex/structs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #104 from ferhatelmas/simplification

Browse Source 
structs: some simplification
This commit is contained in:
Fatih Arslan 2018-01-22 14:26:37 +03:00 committed by GitHub
commit cb93195a59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
structs.go
View File

@ -203,9 +203,7 @@ func (s *Struct) Values() []interface{} {
if IsStruct(val.Interface()) && !tagOpts.Has("omitnested") { if IsStruct(val.Interface()) && !tagOpts.Has("omitnested") {
// look out for embedded structs, and convert them to a // look out for embedded structs, and convert them to a
// []interface{} to be added to the final values slice // []interface{} to be added to the final values slice
for _, embeddedVal := range Values(val.Interface()) { t = append(t, Values(val.Interface())...)
t = append(t, embeddedVal)
}
} else { } else {
t = append(t, val.Interface()) t = append(t, val.Interface())
} }
@ -573,7 +571,7 @@ func (s *Struct) nested(val reflect.Value) interface{} {
break break
} }
slices := make([]interface{}, val.Len(), val.Len()) slices := make([]interface{}, val.Len())
for x := 0; x < val.Len(); x++ { for x := 0; x < val.Len(); x++ {
slices[x] = s.nested(val.Index(x)) slices[x] = s.nested(val.Index(x))
} }