Skip to content

Commit 414956c

Browse files
committed
Stop using JFunction{0, 1, 2}
Since Scala 2.12, the regular scala.Function{0, 1, 2} are valid SAM types, so these interfaces aren't needed anymore.
1 parent e9f980e commit 414956c

File tree

7 files changed

+3
-4
lines changed

7 files changed

+3
-4
lines changed

compiler/src/dotty/tools/backend/jvm/BCodeBodyBuilder.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,6 @@ trait BCodeBodyBuilder extends BCodeSkelBuilder {
328328
val arity = app.meth.tpe.widenDealias.firstParamTypes.size - env.size
329329
val returnsUnit = app.meth.tpe.widenDealias.resultType.classSymbol == defn.UnitClass
330330
if (returnsUnit) requiredClass(("scala.runtime.function.JProcedure" + arity))
331-
else if (arity <= 2) requiredClass(("scala.runtime.function.JFunction" + arity))
332331
else requiredClass(("scala.Function" + arity))
333332
}
334333
}

library/src/scala/runtime/function/JProcedure0.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import scala.runtime.BoxedUnit;
99

1010
@FunctionalInterface
11-
public interface JProcedure0 extends JFunction0<BoxedUnit>, java.io.Serializable {
11+
public interface JProcedure0 extends scala.Function0<BoxedUnit>, java.io.Serializable {
1212
void applyVoid();
1313

1414
default BoxedUnit apply() {

library/src/scala/runtime/function/JProcedure1.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import scala.runtime.BoxedUnit;
99

1010
@FunctionalInterface
11-
public interface JProcedure1<T1> extends JFunction1<T1, BoxedUnit>, java.io.Serializable {
11+
public interface JProcedure1<T1> extends scala.Function1<T1, BoxedUnit>, java.io.Serializable {
1212
void applyVoid(T1 t1);
1313

1414
default BoxedUnit apply(T1 t1) {

library/src/scala/runtime/function/JProcedure2.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import scala.runtime.BoxedUnit;
99

1010
@FunctionalInterface
11-
public interface JProcedure2<T1, T2> extends JFunction2<T1, T2, BoxedUnit>, java.io.Serializable {
11+
public interface JProcedure2<T1, T2> extends scala.Function2<T1, T2, BoxedUnit>, java.io.Serializable {
1212
void applyVoid(T1 t1, T2 t2);
1313

1414
default BoxedUnit apply(T1 t1, T2 t2) {

0 commit comments

Comments
 (0)