Skip to content

Commit 3b60031

Browse files
authored
Merge pull request scala/scala#8980 from mkeskells/2.12.x_Map_++_regression
fix regression in Map ++
2 parents 54b0730 + 3cfe787 commit 3b60031

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

library/src/scala/collection/immutable/HashMap.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1049,7 +1049,7 @@ object HashMap extends ImmutableMapFactory[HashMap] with BitOperations.Int {
10491049

10501050
/** The root node of the partially build hashmap */
10511051
private var rootNode: HashMap[A, B] = HashMap.empty
1052-
private def plusPlusMerger = liftMerger[A, B](null)
1052+
private def plusPlusMerger = liftMerger[A, B](null).invert
10531053
private def isMutable(hs: HashMap[A, B]) = {
10541054
hs.isInstanceOf[HashTrieMap[A, B]] && hs.size == -1
10551055
}

0 commit comments

Comments
 (0)