Remove useless empty methods in JFunctionX and JProcedureX

liufengyun · liufengyun · commit 1078b34944fb · 2019-03-18T22:23:15.000+01:00
diff --git a/compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala b/compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala
@@ -1176,8 +1176,7 @@ class DottyBackendInterface(outputDirectory: AbstractFile, val superCallsMap: Ma
       else {
         val arity = field.meth.tpe.widenDealias.paramTypes.size - _1.size
         val returnsUnit = field.meth.tpe.widenDealias.resultType.classSymbol == UnitClass
-        if (returnsUnit)
-          ctx.requiredClass(("dotty.runtime.function.JProcedure" + arity))
+        if (returnsUnit) ctx.requiredClass(("dotty.runtime.function.JProcedure" + arity))
         else if (arity <= 2) ctx.requiredClass(("dotty.runtime.function.JFunction" + arity))
         else ctx.requiredClass(("scala.Function" + arity))
       }
diff --git a/library/src/dotty/runtime/function/JFunction0.java b/library/src/dotty/runtime/function/JFunction0.java
@@ -7,8 +7,6 @@
 
 @FunctionalInterface
 public interface JFunction0<R> extends scala.Function0<R>, java.io.Serializable {
-    default void $init$() {
-    };
     default void apply$mcV$sp() {
         apply();
     }
diff --git a/library/src/dotty/runtime/function/JFunction1.java b/library/src/dotty/runtime/function/JFunction1.java
@@ -7,8 +7,6 @@
 
 @FunctionalInterface
 public interface JFunction1<T1, R> extends scala.Function1<T1, R>, java.io.Serializable {
-    default void $init$() {
-    };
 
     @Override
     @SuppressWarnings("unchecked")
@@ -213,7 +211,7 @@ default <A> scala.Function1<A, R> compose(scala.Function1<A, T1> g) {
     default scala.Function1 compose$mcDD$sp(scala.Function1 g) {
         return compose(g);
     }
-    
+
     @SuppressWarnings("unchecked")
     default scala.Function1 andThen$mcVI$sp(scala.Function1 g) {
         return andThen(g);
diff --git a/library/src/dotty/runtime/function/JFunction2.java b/library/src/dotty/runtime/function/JFunction2.java
@@ -9,9 +9,6 @@
 
 @FunctionalInterface
 public interface JFunction2<T1, T2, R> extends scala.Function2<T1, T2, R>, java.io.Serializable {
-    default void $init$() {
-    };
-
     @SuppressWarnings("unchecked")
     default void apply$mcVII$sp(int v1, int v2) {
         apply((T1) ((Integer) v1), (T2) ((Integer) v2));
diff --git a/library/src/dotty/runtime/function/JProcedure0.java b/library/src/dotty/runtime/function/JProcedure0.java
@@ -9,9 +9,6 @@
 
 @FunctionalInterface
 public interface JProcedure0 extends JFunction0<BoxedUnit>, java.io.Serializable {
-    default void $init$() {
-    }
-
     void applyVoid();
 
     default BoxedUnit apply() {
diff --git a/library/src/dotty/runtime/function/JProcedure1.java b/library/src/dotty/runtime/function/JProcedure1.java
@@ -9,9 +9,6 @@
 
 @FunctionalInterface
 public interface JProcedure1<T1> extends JFunction1<T1, BoxedUnit>, java.io.Serializable {
-    default void $init$() {
-    }
-
     void applyVoid(T1 t1);
 
     default BoxedUnit apply(T1 t1) {
diff --git a/library/src/dotty/runtime/function/JProcedure10.java b/library/src/dotty/runtime/function/JProcedure10.java
@@ -9,9 +9,6 @@
 
 @FunctionalInterface
 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 {
-    default void $init$() {
-    }
-
     void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10);
 
     default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10) {
diff --git a/library/src/dotty/runtime/function/JProcedure11.java b/library/src/dotty/runtime/function/JProcedure11.java
@@ -9,9 +9,6 @@
 
 @FunctionalInterface
 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 {
-    default void $init$() {
-    }
-
     void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11);
 
     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) {
diff --git a/library/src/dotty/runtime/function/JProcedure12.java b/library/src/dotty/runtime/function/JProcedure12.java
@@ -9,9 +9,6 @@
 
 @FunctionalInterface
 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 {
-    default void $init$() {
-    }
-
     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);
 
     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) {
diff --git a/library/src/dotty/runtime/function/JProcedure13.java b/library/src/dotty/runtime/function/JProcedure13.java
@@ -9,9 +9,6 @@
 
 @FunctionalInterface
 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 {
-    default void $init$() {
-    }
-
     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);
 
     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) {
diff --git a/library/src/dotty/runtime/function/JProcedure14.java b/library/src/dotty/runtime/function/JProcedure14.java
@@ -9,9 +9,6 @@
 
 @FunctionalInterface
 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 {
-    default void $init$() {
-    }
-
     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);
 
     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) {
diff --git a/library/src/dotty/runtime/function/JProcedure15.java b/library/src/dotty/runtime/function/JProcedure15.java
@@ -9,9 +9,6 @@
 
 @FunctionalInterface
 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 {
-    default void $init$() {
-    }
-
     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);
 
     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) {
diff --git a/library/src/dotty/runtime/function/JProcedure16.java b/library/src/dotty/runtime/function/JProcedure16.java
@@ -9,9 +9,6 @@
 
 @FunctionalInterface
 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 {
-    default void $init$() {
-    }
-
     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);
 
     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) {
diff --git a/library/src/dotty/runtime/function/JProcedure17.java b/library/src/dotty/runtime/function/JProcedure17.java
@@ -9,9 +9,6 @@
 
 @FunctionalInterface
 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 {
-    default void $init$() {
-    }
-
     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);
 
     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) {
diff --git a/library/src/dotty/runtime/function/JProcedure18.java b/library/src/dotty/runtime/function/JProcedure18.java
@@ -9,9 +9,6 @@
 
 @FunctionalInterface
 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 {
-    default void $init$() {
-    }
-
     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);
 
     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) {
diff --git a/library/src/dotty/runtime/function/JProcedure19.java b/library/src/dotty/runtime/function/JProcedure19.java
@@ -9,9 +9,6 @@
 
 @FunctionalInterface
 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 {
-    default void $init$() {
-    }
-
     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);
 
     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) {
diff --git a/library/src/dotty/runtime/function/JProcedure2.java b/library/src/dotty/runtime/function/JProcedure2.java
@@ -9,9 +9,6 @@
 
 @FunctionalInterface
 public interface JProcedure2<T1, T2> extends JFunction2<T1, T2, BoxedUnit>, java.io.Serializable {
-    default void $init$() {
-    }
-
     void applyVoid(T1 t1, T2 t2);
 
     default BoxedUnit apply(T1 t1, T2 t2) {
diff --git a/library/src/dotty/runtime/function/JProcedure20.java b/library/src/dotty/runtime/function/JProcedure20.java
@@ -9,9 +9,6 @@
 
 @FunctionalInterface
 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 {
-    default void $init$() {
-    }
-
     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);
 
     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) {
diff --git a/library/src/dotty/runtime/function/JProcedure21.java b/library/src/dotty/runtime/function/JProcedure21.java
@@ -9,9 +9,6 @@
 
 @FunctionalInterface
 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 {
-    default void $init$() {
-    }
-
     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);
 
     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) {
diff --git a/library/src/dotty/runtime/function/JProcedure22.java b/library/src/dotty/runtime/function/JProcedure22.java
@@ -9,9 +9,6 @@
 
 @FunctionalInterface
 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 {
-    default void $init$() {
-    }
-
     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);
 
     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) {
diff --git a/library/src/dotty/runtime/function/JProcedure3.java b/library/src/dotty/runtime/function/JProcedure3.java
@@ -9,9 +9,6 @@
 
 @FunctionalInterface
 public interface JProcedure3<T1, T2, T3> extends scala.Function3<T1, T2, T3, BoxedUnit>, java.io.Serializable {
-    default void $init$() {
-    }
-
     void applyVoid(T1 t1, T2 t2, T3 t3);
 
     default BoxedUnit apply(T1 t1, T2 t2, T3 t3) {
diff --git a/library/src/dotty/runtime/function/JProcedure4.java b/library/src/dotty/runtime/function/JProcedure4.java
@@ -9,9 +9,6 @@
 
 @FunctionalInterface
 public interface JProcedure4<T1, T2, T3, T4> extends scala.Function4<T1, T2, T3, T4, BoxedUnit>, java.io.Serializable {
-    default void $init$() {
-    }
-
     void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4);
 
     default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4) {
diff --git a/library/src/dotty/runtime/function/JProcedure5.java b/library/src/dotty/runtime/function/JProcedure5.java
@@ -9,9 +9,6 @@
 
 @FunctionalInterface
 public interface JProcedure5<T1, T2, T3, T4, T5> extends scala.Function5<T1, T2, T3, T4, T5, BoxedUnit>, java.io.Serializable {
-    default void $init$() {
-    }
-
     void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5);
 
     default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5) {
diff --git a/library/src/dotty/runtime/function/JProcedure6.java b/library/src/dotty/runtime/function/JProcedure6.java
@@ -9,9 +9,6 @@
 
 @FunctionalInterface
 public interface JProcedure6<T1, T2, T3, T4, T5, T6> extends scala.Function6<T1, T2, T3, T4, T5, T6, BoxedUnit>, java.io.Serializable {
-    default void $init$() {
-    }
-
     void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6);
 
     default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6) {
diff --git a/library/src/dotty/runtime/function/JProcedure7.java b/library/src/dotty/runtime/function/JProcedure7.java
@@ -9,9 +9,6 @@
 
 @FunctionalInterface
 public interface JProcedure7<T1, T2, T3, T4, T5, T6, T7> extends scala.Function7<T1, T2, T3, T4, T5, T6, T7, BoxedUnit>, java.io.Serializable {
-    default void $init$() {
-    }
-
     void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7);
 
     default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7) {
diff --git a/library/src/dotty/runtime/function/JProcedure8.java b/library/src/dotty/runtime/function/JProcedure8.java
@@ -9,9 +9,6 @@
 
 @FunctionalInterface
 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 {
-    default void $init$() {
-    }
-
     void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8);
 
     default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8) {
diff --git a/library/src/dotty/runtime/function/JProcedure9.java b/library/src/dotty/runtime/function/JProcedure9.java
@@ -9,9 +9,6 @@
 
 @FunctionalInterface
 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 {
-    default void $init$() {
-    }
-
     void applyVoid(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9);
 
     default BoxedUnit apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9) {

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,6 @@`
`7`	`7`
`8`	`8`	`@FunctionalInterface`
`9`	`9`	`public interface JFunction0<R> extends scala.Function0<R>, java.io.Serializable {`
`10`		`- default void $init$() {`
`11`		`- };`
`12`	`10`	`default void apply$mcV$sp() {`
`13`	`11`	`apply();`
`14`	`12`	`}`