Merge pull request #4561 from sjrd/no-toiterable

Remove all uses of toIterable in code compiled with Scala 2.13.x.
scala-js · Sep 29, 2021 · 0d04e61 · 0d04e61
2 parents ccd8cf0 + a5b1ea3
commit 0d04e61
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/junit-test/output-jvm/src/test/scala/org/scalajs/junit/utils/JUnitTestPlatformImpl.scala b/junit-test/output-jvm/src/test/scala/org/scalajs/junit/utils/JUnitTestPlatformImpl.scala
@@ -37,7 +37,7 @@ object JUnitTestPlatformImpl {
   }
 
   def writeLines(lines: List[String], file: String): Unit =
-    Files.write(Paths.get(file), lines.toIterable.asJava, UTF_8)
+    Files.write(Paths.get(file), (lines: Iterable[String]).asJava, UTF_8)
 
   def readLines(file: String): List[String] =
     Files.readAllLines(Paths.get(file), UTF_8).asScala.toList

diff --git a/...r/custom-linker/custom-linker/src/main/scala/customlinker/EntryPointAnalyzerBackend.scala b/...r/custom-linker/custom-linker/src/main/scala/customlinker/EntryPointAnalyzerBackend.scala
@@ -32,7 +32,7 @@ final class EntryPointAnalyzerBackend(linkerConfig: StandardConfig,
       implicit ec: ExecutionContext): Future[Report] = {
 
     val modules = moduleSet.modules.flatMap(_.externalDependencies).toSet
-    Files.write(entryPointOutputFile, modules.toIterable.asJava,
+    Files.write(entryPointOutputFile, (modules: Iterable[String]).asJava,
         StandardCharsets.UTF_8)
 
     standard.emit(moduleSet, output, logger)

diff --git a/scalalib/overrides-2.13/scala/Enumeration.scala b/scalalib/overrides-2.13/scala/Enumeration.scala
@@ -292,8 +292,8 @@ abstract class Enumeration (initial: Int) extends Serializable {
     override protected def fromSpecific(coll: IterableOnce[Value]) = ValueSet.fromSpecific(coll)
     override protected def newSpecificBuilder = ValueSet.newBuilder
 
-    def map(f: Value => Value): ValueSet = fromSpecific(new View.Map(toIterable, f))
-    def flatMap(f: Value => IterableOnce[Value]): ValueSet = fromSpecific(new View.FlatMap(toIterable, f))
+    def map(f: Value => Value): ValueSet = fromSpecific(new View.Map(this, f))
+    def flatMap(f: Value => IterableOnce[Value]): ValueSet = fromSpecific(new View.FlatMap(this, f))
 
     // necessary for disambiguation:
     override def map[B](f: Value => B)(implicit @implicitNotFound(ValueSet.ordMsg) ev: Ordering[B]): immutable.SortedSet[B] =