diff --git a/README.md b/README.md index a52ceaf..7a7d84e 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Package validator ================ [![Join the chat at https://gitter.im/go-playground/validator](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/go-playground/validator?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) -![Project status](https://img.shields.io/badge/version-9.2.1-green.svg) +![Project status](https://img.shields.io/badge/version-9.2.2-green.svg) [![Build Status](https://semaphoreci.com/api/v1/joeybloggs/validator/branches/v9/badge.svg)](https://semaphoreci.com/joeybloggs/validator) [![Coverage Status](https://coveralls.io/repos/go-playground/validator/badge.svg?branch=v9&service=github)](https://coveralls.io/github/go-playground/validator?branch=v9) [![Go Report Card](https://goreportcard.com/badge/github.com/go-playground/validator)](https://goreportcard.com/report/github.com/go-playground/validator) diff --git a/cache.go b/cache.go index aabe17f..d596bd5 100644 --- a/cache.go +++ b/cache.go @@ -70,7 +70,7 @@ func (tc *tagCache) Set(key string, value *cTag) { type cStruct struct { name string - fields map[int]*cField + fields []*cField fn StructLevelFunc } @@ -108,7 +108,7 @@ func (v *Validate) extractStructCache(current reflect.Value, sName string) *cStr return cs } - cs = &cStruct{name: sName, fields: make(map[int]*cField), fn: v.structLevelFuncs[typ]} + cs = &cStruct{name: sName, fields: make([]*cField, 0), fn: v.structLevelFuncs[typ]} numFields := current.NumField() @@ -153,13 +153,13 @@ func (v *Validate) extractStructCache(current reflect.Value, sName string) *cStr ctag = new(cTag) } - cs.fields[i] = &cField{ + cs.fields = append(cs.fields, &cField{ idx: i, name: fld.Name, altName: customName, cTags: ctag, namesEqual: fld.Name == customName, - } + }) } v.structCache.Set(typ, cs) diff --git a/validator.go b/validator.go index 94d9e8d..4324e39 100644 --- a/validator.go +++ b/validator.go @@ -53,7 +53,11 @@ func (v *validate) validateStruct(parent reflect.Value, current reflect.Value, t // so if nil or if not nil and the structonly tag isn't present if ct == nil || ct.typeof != typeStructOnly { - for _, f := range cs.fields { + var f *cField + + for i := 0; i < len(cs.fields); i++ { + + f = cs.fields[i] if v.isPartial {