Skip to content

Commit 645776b

Browse files
authored
Merge pull request scala/scala#8999 from retronym/topic/red-black-tree-equals
[nomerge] Revert backported RBTree changes that are 2.13.x only
2 parents 3b60031 + d93c379 commit 645776b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

library/src/scala/collection/immutable/RedBlackTree.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,8 +281,8 @@ private[collection] object RedBlackTree {
281281
balanceLeft(tree, upd(tree.left, k, v, overwrite))
282282
else if (cmp > 0)
283283
balanceRight(tree, upd(tree.right, k, v, overwrite))
284-
else if (overwrite && (v.asInstanceOf[AnyRef] ne tree.value.asInstanceOf[AnyRef]))
285-
mkTree(isBlackTree(tree), tree.key, v, tree.left, tree.right)
284+
else if ((overwrite && (v.asInstanceOf[AnyRef] ne tree.value.asInstanceOf[AnyRef])) || k != tree.key)
285+
mkTree(isBlackTree(tree), k, v, tree.left, tree.right)
286286
else tree
287287
}
288288
private[this] def updNth[A, B, B1 >: B](tree: Tree[A, B], idx: Int, k: A, v: B1): Tree[A, B1] = if (tree eq null) {

0 commit comments

Comments
 (0)