summaryrefslogtreecommitdiff
path: root/vendor/github.com/go-playground/validator/v10/util.go
diff options
context:
space:
mode:
Diffstat (limited to 'vendor/github.com/go-playground/validator/v10/util.go')
-rw-r--r--vendor/github.com/go-playground/validator/v10/util.go11
1 files changed, 2 insertions, 9 deletions
diff --git a/vendor/github.com/go-playground/validator/v10/util.go b/vendor/github.com/go-playground/validator/v10/util.go
index 9285223a2..b1fd8cc11 100644
--- a/vendor/github.com/go-playground/validator/v10/util.go
+++ b/vendor/github.com/go-playground/validator/v10/util.go
@@ -13,7 +13,6 @@ import (
// It will dive into pointers, customTypes and return you the
// underlying value and it's kind.
func (v *validate) extractTypeInternal(current reflect.Value, nullable bool) (reflect.Value, reflect.Kind, bool) {
-
BEGIN:
switch current.Kind() {
case reflect.Ptr:
@@ -44,7 +43,6 @@ BEGIN:
default:
if v.v.hasCustomFuncs {
-
if fn, ok := v.v.customFuncs[current.Type()]; ok {
current = reflect.ValueOf(fn(current))
goto BEGIN
@@ -61,7 +59,6 @@ BEGIN:
// NOTE: when not successful ok will be false, this can happen when a nested struct is nil and so the field
// could not be retrieved because it didn't exist.
func (v *validate) getStructFieldOKInternal(val reflect.Value, namespace string) (current reflect.Value, kind reflect.Kind, nullable bool, found bool) {
-
BEGIN:
current, kind, nullable = v.ExtractType(val)
if kind == reflect.Invalid {
@@ -74,7 +71,6 @@ BEGIN:
}
switch kind {
-
case reflect.Ptr, reflect.Interface:
return
@@ -85,7 +81,6 @@ BEGIN:
var ns string
if !typ.ConvertibleTo(timeType) {
-
idx := strings.Index(namespace, namespaceSeparator)
if idx != -1 {
@@ -222,7 +217,7 @@ BEGIN:
panic("Invalid field namespace")
}
-// asInt returns the parameter as a int64
+// asInt returns the parameter as an int64
// or panics if it can't convert
func asInt(param string) int64 {
i, err := strconv.ParseInt(param, 0, 64)
@@ -256,7 +251,6 @@ func asIntFromType(t reflect.Type, param string) int64 {
// asUint returns the parameter as a uint64
// or panics if it can't convert
func asUint(param string) uint64 {
-
i, err := strconv.ParseUint(param, 0, 64)
panicIf(err)
@@ -282,7 +276,6 @@ func asFloat32(param string) float64 {
// asBool returns the parameter as a bool
// or panics if it can't convert
func asBool(param string) bool {
-
i, err := strconv.ParseBool(param)
panicIf(err)
@@ -303,7 +296,7 @@ func fieldMatchesRegexByStringerValOrString(regexFn func() *regexp.Regexp, fl Fi
case reflect.String:
return regex.MatchString(fl.Field().String())
default:
- if stringer, ok := fl.Field().Interface().(fmt.Stringer); ok {
+ if stringer, ok := getValue(fl.Field()).(fmt.Stringer); ok {
return regex.MatchString(stringer.String())
} else {
return regex.MatchString(fl.Field().String())