Reduce duplication in 2.12 concat, remove an unnecessary branch

typelevel · May 17, 2022 · 27a69d3 · 27a69d3
1 parent b292134
commit 27a69d3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 15 deletions.
diff --git a/core/src/main/scala-2.12/cats/compat/HashMapCompat.scala b/core/src/main/scala-2.12/cats/compat/HashMapCompat.scala
@@ -48,14 +48,6 @@ private[data] trait HashMapCompat[K, +V] { self: HashMap[K, V] =>
     * @param traversable the collection of key-value pairs to be added.
     * @return a new map that contains all key-value pairs of this map and `traversable`.
     */
-  final def concat[VV >: V](hm: HashMap[K, VV]): HashMap[K, VV] = {
-    val newRootNode = hm.iterator.foldLeft(self.rootNode: HashMap.Node[K, VV]) { case (node, (k, v)) =>
-      node.updated(k, improve(self.hashKey.hash(k)), v, 0)
-    }
-
-    if (newRootNode eq self.rootNode)
-      this
-    else
-      new HashMap(newRootNode)
-  }
+  final def concat[VV >: V](hm: HashMap[K, VV]): HashMap[K, VV] =
+    concat(hm.iterator)
 }
diff --git a/core/src/main/scala/cats/data/HashMap.scala b/core/src/main/scala/cats/data/HashMap.scala
@@ -158,11 +158,7 @@ final class HashMap[K, +V] private[data] (private[data] val rootNode: HashMap.No
   final def updated[VV >: V](key: K, value: VV): HashMap[K, VV] = {
     val keyHash = improve(hashKey.hash(key))
     val newRootNode = rootNode.updated(key, keyHash, value, 0)
-
-    if (newRootNode eq rootNode)
-      this
-    else
-      new HashMap(newRootNode)
+    new HashMap(newRootNode)
   }
 
   /**