Drop NecessaryEvil now that the fix for scala/scala-collection-cont…

…rib#239 has been released.
sageserpent-open · Oct 21, 2024 · 202aa69 · 202aa69
1 parent f5b0b12
commit 202aa69
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 53 deletions.
diff --git a/src/main/scala/com/sageserpent/kineticmerge/Main.scala b/src/main/scala/com/sageserpent/kineticmerge/Main.scala
@@ -20,6 +20,7 @@ import scopt.{DefaultOEffectSetup, OParser}
 
 import scala.annotation.varargs
 import scala.collection.BuildFrom
+import scala.collection.decorators.mapDecorator
 import scala.io.Source
 import scala.util.Try
 
@@ -685,9 +686,6 @@ object Main extends StrictLogging:
         theirChanges: Map[Path, Change]
     ): Workflow[List[(Path, MergeInput)]] =
 
-      // TODO: use `ourChanges.mergeByKey(theirChanges)` if
-      // https://github.com/scala/scala-collection-contrib/issues/239 leads to a
-      // bug-fix.
       val outerJoin = ourChanges.mergeByKey(theirChanges)
 
       outerJoin.toList

diff --git a/src/main/scala/com/sageserpent/kineticmerge/NecessaryEvil.scala b/src/main/scala/com/sageserpent/kineticmerge/NecessaryEvil.scala
diff --git a/src/main/scala/com/sageserpent/kineticmerge/core/MatchesContext.scala b/src/main/scala/com/sageserpent/kineticmerge/core/MatchesContext.scala
@@ -2,10 +2,10 @@ package com.sageserpent.kineticmerge.core
 
 import com.sageserpent.kineticmerge.core.Match.*
 import com.sageserpent.kineticmerge.core.merge.MergeAlgebra
-import com.sageserpent.kineticmerge.mergeByKeyWith
 import com.typesafe.scalalogging.StrictLogging
 import monocle.syntax.all.*
 
+import scala.collection.decorators.mapDecorator
 import scala.collection.immutable.MultiDict
 
 class MatchesContext[Element](