Skip to content

Commit 2441e09

Browse files
committed
visitListOperand -> indexListPathElements
1 parent 063c06f commit 2441e09

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

typed/merge.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,9 @@ func (w *mergingWalker) visitListItems(t *schema.List, lhs, rhs value.List) (err
174174
}
175175
out := make([]interface{}, 0, outLen)
176176

177-
lhsOrder, observedLHS, lhsErrs := w.visitListOperand(t, lhs)
177+
lhsOrder, observedLHS, lhsErrs := w.indexListPathElements(t, lhs)
178178
errs = append(errs, lhsErrs...)
179-
rhsOrder, observedRHS, rhsErrs := w.visitListOperand(t, rhs)
179+
rhsOrder, observedRHS, rhsErrs := w.indexListPathElements(t, rhs)
180180
errs = append(errs, rhsErrs...)
181181
seen := fieldpath.MakePathElementSet(outLen)
182182

@@ -240,7 +240,7 @@ func (w *mergingWalker) visitListItems(t *schema.List, lhs, rhs value.List) (err
240240
return errs
241241
}
242242

243-
func (w *mergingWalker) visitListOperand(t *schema.List, list value.List) ([]fieldpath.PathElement, fieldpath.PathElementValueMap, ValidationErrors) {
243+
func (w *mergingWalker) indexListPathElements(t *schema.List, list value.List) ([]fieldpath.PathElement, fieldpath.PathElementValueMap, ValidationErrors) {
244244
var errs ValidationErrors
245245
length := 0
246246
if list != nil {

0 commit comments

Comments
 (0)