Skip to content

Commit 1078b34

Browse files
committed
Remove useless empty methods in JFunctionX and JProcedureX
1 parent a421a6e commit 1078b34

27 files changed

+2
-79
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1176,8 +1176,7 @@ class DottyBackendInterface(outputDirectory: AbstractFile, val superCallsMap: Ma
11761176
else {
11771177
val arity = field.meth.tpe.widenDealias.paramTypes.size - _1.size
11781178
val returnsUnit = field.meth.tpe.widenDealias.resultType.classSymbol == UnitClass
1179-
if (returnsUnit)
1180-
ctx.requiredClass(("dotty.runtime.function.JProcedure" + arity))
1179+
if (returnsUnit) ctx.requiredClass(("dotty.runtime.function.JProcedure" + arity))
11811180
else if (arity <= 2) ctx.requiredClass(("dotty.runtime.function.JFunction" + arity))
11821181
else ctx.requiredClass(("scala.Function" + arity))
11831182
}

library/src/dotty/runtime/function/JFunction0.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88
@FunctionalInterface
99
public interface JFunction0<R> extends scala.Function0<R>, java.io.Serializable {
10-
default void $init$() {
11-
};
1210
default void apply$mcV$sp() {
1311
apply();
1412
}

library/src/dotty/runtime/function/JFunction1.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88
@FunctionalInterface
99
public interface JFunction1<T1, R> extends scala.Function1<T1, R>, java.io.Serializable {
10-
default void $init$() {
11-
};
1210

1311
@Override
1412
@SuppressWarnings("unchecked")
@@ -213,7 +211,7 @@ default <A> scala.Function1<A, R> compose(scala.Function1<A, T1> g) {
213211
default scala.Function1 compose$mcDD$sp(scala.Function1 g) {
214212
return compose(g);
215213
}
216-
214+
217215
@SuppressWarnings("unchecked")
218216
default scala.Function1 andThen$mcVI$sp(scala.Function1 g) {
219217
return andThen(g);

library/src/dotty/runtime/function/JFunction2.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99

1010
@FunctionalInterface
1111
public interface JFunction2<T1, T2, R> extends scala.Function2<T1, T2, R>, java.io.Serializable {
12-
default void $init$() {
13-
};
14-
1512
@SuppressWarnings("unchecked")
1613
default void apply$mcVII$sp(int v1, int v2) {
1714
apply((T1) ((Integer) v1), (T2) ((Integer) v2));

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99

1010
@FunctionalInterface
1111
public interface JProcedure0 extends JFunction0<BoxedUnit>, java.io.Serializable {
12-
default void $init$() {
13-
}
14-
1512
void applyVoid();
1613

1714
default BoxedUnit apply() {

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99

1010
@FunctionalInterface
1111
public interface JProcedure1<T1> extends JFunction1<T1, BoxedUnit>, java.io.Serializable {
12-
default void $init$() {
13-
}
14-
1512
void applyVoid(T1 t1);
1613

1714
default BoxedUnit apply(T1 t1) {

library/src/dotty/runtime/function/JProcedure10.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99

1010
@FunctionalInterface
1111
public interface JProcedure10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> extends scala.Function10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, BoxedUnit>, java.io.Serializable {
12-
default void $init$() {
13-
}
14-
1512
void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10);
1613

1714
default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10) {

library/src/dotty/runtime/function/JProcedure11.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99

1010
@FunctionalInterface
1111
public interface JProcedure11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> extends scala.Function11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, BoxedUnit>, java.io.Serializable {
12-
default void $init$() {
13-
}
14-
1512
void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11);
1613

1714
default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11) {

library/src/dotty/runtime/function/JProcedure12.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99

1010
@FunctionalInterface
1111
public interface JProcedure12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> extends scala.Function12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, BoxedUnit>, java.io.Serializable {
12-
default void $init$() {
13-
}
14-
1512
void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12);
1613

1714
default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12) {

library/src/dotty/runtime/function/JProcedure13.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99

1010
@FunctionalInterface
1111
public interface JProcedure13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> extends scala.Function13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, BoxedUnit>, java.io.Serializable {
12-
default void $init$() {
13-
}
14-
1512
void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13);
1613

1714
default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13) {

library/src/dotty/runtime/function/JProcedure14.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99

1010
@FunctionalInterface
1111
public interface JProcedure14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> extends scala.Function14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, BoxedUnit>, java.io.Serializable {
12-
default void $init$() {
13-
}
14-
1512
void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14);
1613

1714
default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14) {

library/src/dotty/runtime/function/JProcedure15.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99

1010
@FunctionalInterface
1111
public interface JProcedure15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> extends scala.Function15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, BoxedUnit>, java.io.Serializable {
12-
default void $init$() {
13-
}
14-
1512
void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15);
1613

1714
default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15) {

library/src/dotty/runtime/function/JProcedure16.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99

1010
@FunctionalInterface
1111
public interface JProcedure16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> extends scala.Function16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, BoxedUnit>, java.io.Serializable {
12-
default void $init$() {
13-
}
14-
1512
void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16);
1613

1714
default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16) {

library/src/dotty/runtime/function/JProcedure17.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99

1010
@FunctionalInterface
1111
public interface JProcedure17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> extends scala.Function17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, BoxedUnit>, java.io.Serializable {
12-
default void $init$() {
13-
}
14-
1512
void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17);
1613

1714
default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17) {

library/src/dotty/runtime/function/JProcedure18.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99

1010
@FunctionalInterface
1111
public interface JProcedure18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> extends scala.Function18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, BoxedUnit>, java.io.Serializable {
12-
default void $init$() {
13-
}
14-
1512
void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17, T18 t18);
1613

1714
default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17, T18 t18) {

library/src/dotty/runtime/function/JProcedure19.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99

1010
@FunctionalInterface
1111
public interface JProcedure19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> extends scala.Function19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, BoxedUnit>, java.io.Serializable {
12-
default void $init$() {
13-
}
14-
1512
void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17, T18 t18, T19 t19);
1613

1714
default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17, T18 t18, T19 t19) {

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99

1010
@FunctionalInterface
1111
public interface JProcedure2<T1, T2> extends JFunction2<T1, T2, BoxedUnit>, java.io.Serializable {
12-
default void $init$() {
13-
}
14-
1512
void applyVoid(T1 t1, T2 t2);
1613

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

library/src/dotty/runtime/function/JProcedure20.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99

1010
@FunctionalInterface
1111
public interface JProcedure20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20> extends scala.Function20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, BoxedUnit>, java.io.Serializable {
12-
default void $init$() {
13-
}
14-
1512
void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17, T18 t18, T19 t19, T20 t20);
1613

1714
default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17, T18 t18, T19 t19, T20 t20) {

library/src/dotty/runtime/function/JProcedure21.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99

1010
@FunctionalInterface
1111
public interface JProcedure21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21> extends scala.Function21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, BoxedUnit>, java.io.Serializable {
12-
default void $init$() {
13-
}
14-
1512
void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17, T18 t18, T19 t19, T20 t20, T21 t21);
1613

1714
default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17, T18 t18, T19 t19, T20 t20, T21 t21) {

library/src/dotty/runtime/function/JProcedure22.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99

1010
@FunctionalInterface
1111
public interface JProcedure22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> extends scala.Function22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, BoxedUnit>, java.io.Serializable {
12-
default void $init$() {
13-
}
14-
1512
void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17, T18 t18, T19 t19, T20 t20, T21 t21, T22 t22);
1613

1714
default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17, T18 t18, T19 t19, T20 t20, T21 t21, T22 t22) {

library/src/dotty/runtime/function/JProcedure3.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99

1010
@FunctionalInterface
1111
public interface JProcedure3<T1, T2, T3> extends scala.Function3<T1, T2, T3, BoxedUnit>, java.io.Serializable {
12-
default void $init$() {
13-
}
14-
1512
void applyVoid(T1 t1, T2 t2, T3 t3);
1613

1714
default BoxedUnit apply(T1 t1, T2 t2, T3 t3) {

library/src/dotty/runtime/function/JProcedure4.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99

1010
@FunctionalInterface
1111
public interface JProcedure4<T1, T2, T3, T4> extends scala.Function4<T1, T2, T3, T4, BoxedUnit>, java.io.Serializable {
12-
default void $init$() {
13-
}
14-
1512
void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4);
1613

1714
default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4) {

library/src/dotty/runtime/function/JProcedure5.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99

1010
@FunctionalInterface
1111
public interface JProcedure5<T1, T2, T3, T4, T5> extends scala.Function5<T1, T2, T3, T4, T5, BoxedUnit>, java.io.Serializable {
12-
default void $init$() {
13-
}
14-
1512
void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5);
1613

1714
default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5) {

library/src/dotty/runtime/function/JProcedure6.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99

1010
@FunctionalInterface
1111
public interface JProcedure6<T1, T2, T3, T4, T5, T6> extends scala.Function6<T1, T2, T3, T4, T5, T6, BoxedUnit>, java.io.Serializable {
12-
default void $init$() {
13-
}
14-
1512
void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6);
1613

1714
default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6) {

library/src/dotty/runtime/function/JProcedure7.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99

1010
@FunctionalInterface
1111
public interface JProcedure7<T1, T2, T3, T4, T5, T6, T7> extends scala.Function7<T1, T2, T3, T4, T5, T6, T7, BoxedUnit>, java.io.Serializable {
12-
default void $init$() {
13-
}
14-
1512
void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7);
1613

1714
default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7) {

library/src/dotty/runtime/function/JProcedure8.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99

1010
@FunctionalInterface
1111
public interface JProcedure8<T1, T2, T3, T4, T5, T6, T7, T8> extends scala.Function8<T1, T2, T3, T4, T5, T6, T7, T8, BoxedUnit>, java.io.Serializable {
12-
default void $init$() {
13-
}
14-
1512
void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8);
1613

1714
default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8) {

library/src/dotty/runtime/function/JProcedure9.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99

1010
@FunctionalInterface
1111
public interface JProcedure9<T1, T2, T3, T4, T5, T6, T7, T8, T9> extends scala.Function9<T1, T2, T3, T4, T5, T6, T7, T8, T9, BoxedUnit>, java.io.Serializable {
12-
default void $init$() {
13-
}
14-
1512
void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9);
1613

1714
default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9) {

0 commit comments

Comments
 (0)