Merge pull request #1424 from xuwei-k/toIterator

sbt · Oct 3, 2024 · 18b136a · 18b136a
2 parents 120c669 + 4538499
commit 18b136a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 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
@@ -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
@@ -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
@@ -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]