Skip to content

Commit 523722a

Browse files
committed
chore(validator_instance): update func order, registerValidation
1 parent fb1a692 commit 523722a

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

validator_instance.go

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -681,23 +681,6 @@ func (v *Validate) VarWithValueCtx(ctx context.Context, field interface{}, other
681681
return
682682
}
683683

684-
func (v *Validate) registerValidation(tag string, fn FuncCtx, bakedIn bool, nilCheckable bool) error {
685-
if len(tag) == 0 {
686-
return errors.New("function Key cannot be empty")
687-
}
688-
689-
if fn == nil {
690-
return errors.New("function cannot be empty")
691-
}
692-
693-
_, ok := restrictedTags[tag]
694-
if !bakedIn && (ok || strings.ContainsAny(tag, restrictedTagChars)) {
695-
panic(fmt.Sprintf(restrictedTagErr, tag))
696-
}
697-
v.validations[tag] = internalValidationFuncWrapper{fn: fn, runValidationOnNil: nilCheckable}
698-
return nil
699-
}
700-
701684
// VarWithKey validates a single variable with a key to be included in the returned error using tag style validation
702685
// eg.
703686
// var s string
@@ -755,3 +738,20 @@ func (v *Validate) VarWithKeyCtx(ctx context.Context, key string, field interfac
755738
v.pool.Put(vd)
756739
return
757740
}
741+
742+
func (v *Validate) registerValidation(tag string, fn FuncCtx, bakedIn bool, nilCheckable bool) error {
743+
if len(tag) == 0 {
744+
return errors.New("function Key cannot be empty")
745+
}
746+
747+
if fn == nil {
748+
return errors.New("function cannot be empty")
749+
}
750+
751+
_, ok := restrictedTags[tag]
752+
if !bakedIn && (ok || strings.ContainsAny(tag, restrictedTagChars)) {
753+
panic(fmt.Sprintf(restrictedTagErr, tag))
754+
}
755+
v.validations[tag] = internalValidationFuncWrapper{fn: fn, runValidationOnNil: nilCheckable}
756+
return nil
757+
}

0 commit comments

Comments
 (0)