Skip to content

Commit ce3dc0b

Browse files
authored
Merge pull request #1474 from Friendseeker/delete-MultiMap-2
[1.x] avoid deprecated collection.mutable.MultiMap
2 parents 0787c42 + 71ec027 commit ce3dc0b

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

internal/zinc-testing/src/main/scala/xsbti/TestCallback.scala

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -181,11 +181,18 @@ object TestCallback {
181181
}
182182

183183
private def pairsToMultiMap[A, B](pairs: Seq[(A, B)]): Map[A, Set[B]] = {
184-
import scala.collection.mutable.{ HashMap, MultiMap }
185-
val emptyMultiMap = new HashMap[A, scala.collection.mutable.Set[B]] with MultiMap[A, B]
186-
val multiMap = pairs.foldLeft(emptyMultiMap) {
187-
case (acc, (key, value)) =>
188-
acc.addBinding(key, value)
184+
import scala.collection.mutable.HashMap
185+
val multiMap = HashMap.empty[A, scala.collection.mutable.Set[B]]
186+
pairs.foreach {
187+
case (key, value) =>
188+
multiMap.get(key) match {
189+
case None =>
190+
val set = collection.mutable.Set.empty[B]
191+
set += value
192+
multiMap(key) = set
193+
case Some(set) =>
194+
set += value
195+
}
189196
}
190197
// convert all collections to immutable variants
191198
multiMap.toMap.mapValues(_.toSet).toMap.withDefaultValue(Set.empty)

0 commit comments

Comments
 (0)