Skip to content

Commit c62ee7c

Browse files
Dean KarnDean Karn
authored andcommitted
Merge pull request #148 from bluesuncorp/v6-development
Minor code cleanup no functional changes
2 parents 0cd5e89 + 494e136 commit c62ee7c

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

validator.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ func (v *Validate) traverseField(topStruct reflect.Value, currentStruct reflect.
384384
for _, t := range strings.Split(tag, tagSeparator) {
385385

386386
if t == diveTag {
387-
tags = append(tags, &tagCache{tagVals: [][]string{[]string{t}}})
387+
tags = append(tags, &tagCache{tagVals: [][]string{{t}}})
388388
break
389389
}
390390

validator_test.go

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -725,9 +725,9 @@ func TestInterfaceErrValidation(t *testing.T) {
725725

726726
var errStructPtr2Array [][]*Inner
727727

728-
errStructPtr2Array = append(errStructPtr2Array, []*Inner{&Inner{"ok"}, &Inner{""}, &Inner{""}})
729-
errStructPtr2Array = append(errStructPtr2Array, []*Inner{&Inner{"ok"}, &Inner{""}, &Inner{""}})
730-
errStructPtr2Array = append(errStructPtr2Array, []*Inner{&Inner{"ok"}, &Inner{""}, nil})
728+
errStructPtr2Array = append(errStructPtr2Array, []*Inner{{"ok"}, {""}, {""}})
729+
errStructPtr2Array = append(errStructPtr2Array, []*Inner{{"ok"}, {""}, {""}})
730+
errStructPtr2Array = append(errStructPtr2Array, []*Inner{{"ok"}, {""}, nil})
731731

732732
tmsp2 := &TestMultiDimensionalStructsPtr2{
733733
Errs: errStructPtr2Array,
@@ -807,7 +807,7 @@ func TestMapDiveValidation(t *testing.T) {
807807
Errs map[int]Inner `validate:"gt=0,dive"`
808808
}
809809

810-
mi := map[int]Inner{0: Inner{"ok"}, 3: Inner{""}, 4: Inner{"ok"}}
810+
mi := map[int]Inner{0: {"ok"}, 3: {""}, 4: {"ok"}}
811811

812812
ms := &TestMapStruct{
813813
Errs: mi,
@@ -843,7 +843,7 @@ func TestMapDiveValidation(t *testing.T) {
843843
Errs map[int]*Inner `validate:"gt=0,dive,required"`
844844
}
845845

846-
mip := map[int]*Inner{0: &Inner{"ok"}, 3: nil, 4: &Inner{"ok"}}
846+
mip := map[int]*Inner{0: {"ok"}, 3: nil, 4: {"ok"}}
847847

848848
msp := &TestMapStructPtr{
849849
Errs: mip,
@@ -858,7 +858,7 @@ func TestMapDiveValidation(t *testing.T) {
858858
Errs map[int]*Inner `validate:"gt=0,dive,omitempty,required"`
859859
}
860860

861-
mip2 := map[int]*Inner{0: &Inner{"ok"}, 3: nil, 4: &Inner{"ok"}}
861+
mip2 := map[int]*Inner{0: {"ok"}, 3: nil, 4: {"ok"}}
862862

863863
msp2 := &TestMapStructPtr2{
864864
Errs: mip2,
@@ -945,8 +945,8 @@ func TestArrayDiveValidation(t *testing.T) {
945945

946946
var errStructArray [][]Inner
947947

948-
errStructArray = append(errStructArray, []Inner{Inner{"ok"}, Inner{""}, Inner{""}})
949-
errStructArray = append(errStructArray, []Inner{Inner{"ok"}, Inner{""}, Inner{""}})
948+
errStructArray = append(errStructArray, []Inner{{"ok"}, {""}, {""}})
949+
errStructArray = append(errStructArray, []Inner{{"ok"}, {""}, {""}})
950950

951951
tms := &TestMultiDimensionalStructs{
952952
Errs: errStructArray,
@@ -966,9 +966,9 @@ func TestArrayDiveValidation(t *testing.T) {
966966

967967
var errStructPtrArray [][]*Inner
968968

969-
errStructPtrArray = append(errStructPtrArray, []*Inner{&Inner{"ok"}, &Inner{""}, &Inner{""}})
970-
errStructPtrArray = append(errStructPtrArray, []*Inner{&Inner{"ok"}, &Inner{""}, &Inner{""}})
971-
errStructPtrArray = append(errStructPtrArray, []*Inner{&Inner{"ok"}, &Inner{""}, nil})
969+
errStructPtrArray = append(errStructPtrArray, []*Inner{{"ok"}, {""}, {""}})
970+
errStructPtrArray = append(errStructPtrArray, []*Inner{{"ok"}, {""}, {""}})
971+
errStructPtrArray = append(errStructPtrArray, []*Inner{{"ok"}, {""}, nil})
972972

973973
tmsp := &TestMultiDimensionalStructsPtr{
974974
Errs: errStructPtrArray,
@@ -991,9 +991,9 @@ func TestArrayDiveValidation(t *testing.T) {
991991

992992
var errStructPtr2Array [][]*Inner
993993

994-
errStructPtr2Array = append(errStructPtr2Array, []*Inner{&Inner{"ok"}, &Inner{""}, &Inner{""}})
995-
errStructPtr2Array = append(errStructPtr2Array, []*Inner{&Inner{"ok"}, &Inner{""}, &Inner{""}})
996-
errStructPtr2Array = append(errStructPtr2Array, []*Inner{&Inner{"ok"}, &Inner{""}, nil})
994+
errStructPtr2Array = append(errStructPtr2Array, []*Inner{{"ok"}, {""}, {""}})
995+
errStructPtr2Array = append(errStructPtr2Array, []*Inner{{"ok"}, {""}, {""}})
996+
errStructPtr2Array = append(errStructPtr2Array, []*Inner{{"ok"}, {""}, nil})
997997

998998
tmsp2 := &TestMultiDimensionalStructsPtr2{
999999
Errs: errStructPtr2Array,
@@ -1015,9 +1015,9 @@ func TestArrayDiveValidation(t *testing.T) {
10151015

10161016
var errStructPtr3Array [][]*Inner
10171017

1018-
errStructPtr3Array = append(errStructPtr3Array, []*Inner{&Inner{"ok"}, &Inner{""}, &Inner{""}})
1019-
errStructPtr3Array = append(errStructPtr3Array, []*Inner{&Inner{"ok"}, &Inner{""}, &Inner{""}})
1020-
errStructPtr3Array = append(errStructPtr3Array, []*Inner{&Inner{"ok"}, &Inner{""}, nil})
1018+
errStructPtr3Array = append(errStructPtr3Array, []*Inner{{"ok"}, {""}, {""}})
1019+
errStructPtr3Array = append(errStructPtr3Array, []*Inner{{"ok"}, {""}, {""}})
1020+
errStructPtr3Array = append(errStructPtr3Array, []*Inner{{"ok"}, {""}, nil})
10211021

10221022
tmsp3 := &TestMultiDimensionalStructsPtr3{
10231023
Errs: errStructPtr3Array,

0 commit comments

Comments
 (0)