From 4d3818f9f70722642bb01572e7a0e584a5f4fe07 Mon Sep 17 00:00:00 2001 From: xuwei-k <6b656e6a69@gmail.com> Date: Thu, 3 May 2018 23:03:44 +0900 Subject: [PATCH] use foldLeft instead of /: https://github.com/scala/scala/blob/02776afa797fdf320dfefbaeb4b70431ee085b25/src/library/scala/collection/IterableOnce.scala#L465 --- .../main/scala/sbt/librarymanagement/ConflictWarning.scala | 2 +- ivy/src/main/scala/sbt/internal/librarymanagement/Ivy.scala | 2 +- .../ivyint/CachedResolutionResolveEngine.scala | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/main/scala/sbt/librarymanagement/ConflictWarning.scala b/core/src/main/scala/sbt/librarymanagement/ConflictWarning.scala index 02355408f..5fea69f37 100644 --- a/core/src/main/scala/sbt/librarymanagement/ConflictWarning.scala +++ b/core/src/main/scala/sbt/librarymanagement/ConflictWarning.scala @@ -49,7 +49,7 @@ object ConflictWarning { if (differentFullNames.size > 1) differentFullNames else Set.empty[String] } } - (Map.empty[(String, String), Set[String]] /: mismatches)(merge) + mismatches.foldLeft(Map.empty[(String, String), Set[String]])(merge) } private[this] def merge[A, B](m: Map[A, Set[B]], b: (A, Set[B])): Map[A, Set[B]] = if (b._2.isEmpty) m diff --git a/ivy/src/main/scala/sbt/internal/librarymanagement/Ivy.scala b/ivy/src/main/scala/sbt/internal/librarymanagement/Ivy.scala index 5a257844e..b50914ea9 100644 --- a/ivy/src/main/scala/sbt/internal/librarymanagement/Ivy.scala +++ b/ivy/src/main/scala/sbt/internal/librarymanagement/Ivy.scala @@ -774,7 +774,7 @@ private[sbt] object IvySbt { elem: scala.xml.Elem, extra: Map[String, String] ): scala.xml.Elem = - (elem /: extra) { + extra.foldLeft(elem) { case (e, (key, value)) => e % new scala.xml.UnprefixedAttribute(key, value, scala.xml.Null) } private def hasInfo(module: ModuleID, x: scala.xml.NodeSeq) = { diff --git a/ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/CachedResolutionResolveEngine.scala b/ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/CachedResolutionResolveEngine.scala index d2d8086ba..cf24d61d3 100644 --- a/ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/CachedResolutionResolveEngine.scala +++ b/ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/CachedResolutionResolveEngine.scala @@ -957,9 +957,9 @@ private[sbt] trait CachedResolutionResolveEngine extends ResolveEngine { }: _*) // This emulates test-internal extending test configuration etc. val remappedConfigs: Map[String, Vector[String]] = - (remappedConfigs0 /: rootModuleConfs) { (acc0, c) => + rootModuleConfs.foldLeft(remappedConfigs0) { (acc0, c) => val ps = parentConfigs(c.getName) - (acc0 /: ps) { (acc, parent) => + ps.foldLeft(acc0) { (acc, parent) => val vs0 = acc.getOrElse(c.getName, Vector()) val vs = acc.getOrElse(parent, Vector()) acc.updated(c.getName, (vs0 ++ vs).distinct)