From 4bb2f4e9689b6beaa82519b791b7372fe50b63fb Mon Sep 17 00:00:00 2001 From: Ethan Atkins Date: Wed, 21 Aug 2019 21:35:51 -0700 Subject: [PATCH] Used Seq instead of Stream Streams generically perform poorly and weren't needed here. --- .../src/main/scala/sbt/internal/util/Settings.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 a46abc0b9..44e935324 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 @@ -537,9 +537,9 @@ trait Init[ScopeType] { // Take all the original defs and DerivedSettings along with locals, replace each DerivedSetting with the actual // settings that were derived. val allDefs = addLocal(init)(scopeLocal) - allDefs flatMap { - case d: DerivedSetting[_] => (derivedToStruct get d map (_.outputs)).toStream.flatten; - case s => Stream(s) + allDefs.flatMap { + case d: DerivedSetting[_] => (derivedToStruct get d map (_.outputs)).toSeq.flatten + case s => s :: Nil } }