Skip to content

Commit 186e8cc

Browse files
committed
Change StreamConverters to use the implementation from 2.13.0-RC1
This drops the Stepper and Accumulator implementations from this repository. It introduces new extension methods that use the implementations from 2.13.0-RC1, but with the names from 2.12 java8-compat. For example, `stream.accumulate` continues works when using java8-compat for 2.13. When using `scala.jdk.StreamConverters`, the user would have to write `stream.toScala(Accumulator)`. The core use cases should continue to work, see the changes to test files
1 parent 5d9bd5d commit 186e8cc

40 files changed

+721
-4993
lines changed

project/CodeGen.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -519,9 +519,9 @@ object CodeGen {
519519

520520
val specialized =
521521
List("V", "V,IJFD", "V,IJD,IJD").flatMap(specialize).map { case (i, a, sp) =>
522-
s" public static scala.Function$i<$a> procSpecialized(JFunction$i$sp f) { return f; }" } ++
522+
s" public static scala.Function$i<$a> procSpecialized(JFunction$i$sp f) { return (scala.Function$i<$a>)(Object)f; }" } ++
523523
List("BSIJCFDZ", "ZIFJD,IJFD", "ZIFJD,IJD,IJD").flatMap(specialize).map { case (i, a, sp) =>
524-
s" public static scala.Function$i<$a> funcSpecialized(JFunction$i$sp f) { return f; }" }
524+
s" public static scala.Function$i<$a> funcSpecialized(JFunction$i$sp f) { return (scala.Function$i<$a>)(Object)f; }" }
525525

526526
(blocks.map(_._1) ++ blocks.map(_._2)) :+
527527
( "JFunction",

src/main/java/scala/compat/java8/ScalaStreamSupport.java

Lines changed: 143 additions & 577 deletions
Large diffs are not rendered by default.

src/main/java/scala/compat/java8/runtime/CollectionInternals.java

Lines changed: 0 additions & 52 deletions
This file was deleted.

src/main/scala/scala/compat/java8/SpliteratorConverters.scala

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)