From 4538499eca7ad64a00958bbf16ed79e94e7d74fb Mon Sep 17 00:00:00 2001 From: xuwei-k <6b656e6a69@gmail.com> Date: Thu, 3 Oct 2024 21:02:44 +0900 Subject: [PATCH] use iterator instead of deprecated toIterator --- .../main/scala/sbt/internal/inc/classpath/ClassLoaders.scala | 4 ++-- .../zinc-core/src/main/scala/sbt/internal/inc/Locate.scala | 2 +- .../scala/sbt/internal/inc/text/RelationsTextFormat.scala | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/zinc-classpath/src/main/scala/sbt/internal/inc/classpath/ClassLoaders.scala b/internal/zinc-classpath/src/main/scala/sbt/internal/inc/classpath/ClassLoaders.scala index ab85b0d2a..24148976a 100644 --- a/internal/zinc-classpath/src/main/scala/sbt/internal/inc/classpath/ClassLoaders.scala +++ b/internal/zinc-classpath/src/main/scala/sbt/internal/inc/classpath/ClassLoaders.scala @@ -191,8 +191,8 @@ trait NativeCopyLoader extends ClassLoader { private[this] def findLibrary0(name: String): String = { val mappedName = System.mapLibraryName(name) - val explicit = explicitLibraries.toIterator.filter(_.getFileName.toString == mappedName) - val search = searchPaths.toIterator flatMap relativeLibrary(mappedName) + val explicit = explicitLibraries.iterator.filter(_.getFileName.toString == mappedName) + val search = searchPaths.iterator flatMap relativeLibrary(mappedName) val combined = explicit ++ search if (combined.hasNext) copy(combined.next()) else null } diff --git a/internal/zinc-core/src/main/scala/sbt/internal/inc/Locate.scala b/internal/zinc-core/src/main/scala/sbt/internal/inc/Locate.scala index be849cdf5..ca7758a4a 100644 --- a/internal/zinc-core/src/main/scala/sbt/internal/inc/Locate.scala +++ b/internal/zinc-core/src/main/scala/sbt/internal/inc/Locate.scala @@ -49,7 +49,7 @@ object Locate { } } def find[S](name: String, gets: Stream[String => Either[Boolean, S]]): Either[Boolean, S] = - find[S](name, gets.toIterator) + find[S](name, gets.iterator) /** * Returns a function that searches the provided class path for diff --git a/internal/zinc-persist/src/main/scala/sbt/internal/inc/text/RelationsTextFormat.scala b/internal/zinc-persist/src/main/scala/sbt/internal/inc/text/RelationsTextFormat.scala index eae0ced88..495b31008 100644 --- a/internal/zinc-persist/src/main/scala/sbt/internal/inc/text/RelationsTextFormat.scala +++ b/internal/zinc-persist/src/main/scala/sbt/internal/inc/text/RelationsTextFormat.scala @@ -82,7 +82,7 @@ trait RelationsTextFormat extends FormatCommons { def read(in: BufferedReader): Relations = { def readRelation[A, B](relDesc: Descriptor[A, B]): Map[A, Set[B]] = { import relDesc._ - val items = readPairs(in)(header, keyMapper.read, valueMapper.read).toIterator + val items = readPairs(in)(header, keyMapper.read, valueMapper.read).iterator // Reconstruct the multi-map efficiently, using the writing strategy above val builder = Map.newBuilder[A, Set[B]] var currentKey = null.asInstanceOf[A]