From 1700b89ea4fe9d2c9b88debe985d01530037c469 Mon Sep 17 00:00:00 2001 From: Ethan Atkins Date: Wed, 21 Aug 2019 21:35:38 -0700 Subject: [PATCH] Parallelize Init.addLocal During akka startup, addLocal was caused twice and prior to this change, it took roughly 200ms per call on my computer. After this change, it took about 100ms. --- .../src/main/scala/sbt/internal/util/Settings.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/util-collection/src/main/scala/sbt/internal/util/Settings.scala b/internal/util-collection/src/main/scala/sbt/internal/util/Settings.scala index 5aa6f18e6..a46abc0b9 100644 --- a/internal/util-collection/src/main/scala/sbt/internal/util/Settings.scala +++ b/internal/util-collection/src/main/scala/sbt/internal/util/Settings.scala @@ -234,7 +234,7 @@ trait Init[ScopeType] { if (s.definitive) s :: Nil else ss :+ s def addLocal(init: Seq[Setting[_]])(implicit scopeLocal: ScopeLocal): Seq[Setting[_]] = - init.flatMap(_.dependencies flatMap scopeLocal) ++ init + init.par.map(_.dependencies flatMap scopeLocal).toVector.flatten ++ init def delegate(sMap: ScopedMap)( implicit delegates: ScopeType => Seq[ScopeType],