Skip to content

Commit 4d85fbb

Browse files
committed
Further rename merge -> compare in compare.go
1 parent 69b4451 commit 4d85fbb

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

typed/compare.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -247,9 +247,9 @@ func (w *compareWalker) visitListItems(t *schema.List, lhs, rhs value.List) (err
247247
continue
248248
}
249249
rValues.Insert(pe, rValue)
250-
// We can merge with nil if lValue is not present.
250+
// We can compare with nil if lValue is not present.
251251
lValue, _ := lValues.Get(pe)
252-
errs = append(errs, w.mergeListItem(t, pe, lValue, rValue)...)
252+
errs = append(errs, w.compareListItem(t, pe, lValue, rValue)...)
253253
}
254254

255255
// Add items from left that are not in right.
@@ -266,7 +266,7 @@ func (w *compareWalker) visitListItems(t *schema.List, lhs, rhs value.List) (err
266266
if _, found := rValues.Get(pe); found {
267267
continue
268268
}
269-
errs = append(errs, w.mergeListItem(t, pe, lValue, nil)...)
269+
errs = append(errs, w.compareListItem(t, pe, lValue, nil)...)
270270
}
271271

272272
return
@@ -300,7 +300,7 @@ func (w *compareWalker) indexListPathElements(t *schema.List, list value.List) (
300300
return pes, observed, errs
301301
}
302302

303-
func (w *compareWalker) mergeListItem(t *schema.List, pe fieldpath.PathElement, lChild, rChild value.Value) ValidationErrors {
303+
func (w *compareWalker) compareListItem(t *schema.List, pe fieldpath.PathElement, lChild, rChild value.Value) ValidationErrors {
304304
w2 := w.prepareDescent(pe, t.ElementType, w.comparison)
305305
w2.lhs = lChild
306306
w2.rhs = rChild

0 commit comments

Comments
 (0)