Update STARR, remove manual mixins in JFunctionN.

These manual mixins were forwarding to the impl classes have
just been removed. We can now rely on default methods instead.

Update Tests:

 - Fix test/files/pos/t1237.scala, we can't have an outer field
   in an interface, always use the outer method.
 - Don't crash on meaningless trait early init fields
   test/files/neg/t2796.scala
 - Remove impl class relate parts of inner class test

Author: retronym

src/compiler/scala/tools/nsc/transform/Constructors.scala

@@ -589,7 +589,7 @@ abstract class Constructors extends Statics with Transform with ast.TreeDSL {
       for (stat <- primaryConstrBody.stats) {
         constrStatBuf += stat
         stat match {
-          case ValDef(mods, name, _, _) if mods hasFlag PRESUPER =>
+          case ValDef(mods, name, _, _) if mods.hasFlag(PRESUPER) && !stat.symbol.enclClass.isTrait => // PRESUPER doesn't work in traits, a warning has alreay been issued
             // stat is the constructor-local definition of the field value
             val fields = presupers filter (_.getterName == name)
             assert(fields.length == 1, s"expected exactly one field by name $name in $presupers of $clazz's early initializers")

src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala

@@ -259,6 +259,7 @@ abstract class ExplicitOuter extends InfoTransform
         // otherwise it is NoSymbol
         val outerFld =
           if (outerAcc.owner == currentClass &&
+            !outerAcc.owner.isTrait &&
             base.tpe =:= currentClass.thisType &&
             outerAcc.owner.isEffectivelyFinal)
             outerField(currentClass) suchThat (_.owner == currentClass)

src/library/scala/runtime/java8/JFunction1.java

@@ -7,18 +7,6 @@
 
 @FunctionalInterface
 public interface JFunction1<T1, R> extends scala.Function1<T1, R> {
-    default void $init$() {
-    };
-
-    @Override
-    default <A> scala.Function1<T1, A> andThen(scala.Function1<R, A> g) {
-        return scala.Function1$class.andThen(this, g);
-    }
-
-    @Override
-    default <A> scala.Function1<A, R> compose(scala.Function1<A, T1> g) {
-        return scala.Function1$class.compose(this, g);
-    }
     default void apply$mcVI$sp(int v1) {
         apply((T1) scala.runtime.BoxesRunTime.boxToInteger(v1));
     }

src/library/scala/runtime/java8/JFunction10.java

@@ -7,16 +7,4 @@
 
 @FunctionalInterface
 public interface JFunction10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, R> extends scala.Function10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, R> {
-    default void $init$() {
-    };
-
-    default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, scala.Function1<T6, scala.Function1<T7, scala.Function1<T8, scala.Function1<T9, scala.Function1<T10, R>>>>>>>>>> curried() {
-      return scala.Function10$class.curried(this);
-    }
-
-    default scala.Function1<scala.Tuple10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>, R> tupled() {
-      return scala.Function10$class.tupled(this);
-    }
-
-
 }

src/library/scala/runtime/java8/JFunction11.java

@@ -7,16 +7,4 @@
 
 @FunctionalInterface
 public interface JFunction11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, R> extends scala.Function11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, R> {
-    default void $init$() {
-    };
-
-    default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, scala.Function1<T6, scala.Function1<T7, scala.Function1<T8, scala.Function1<T9, scala.Function1<T10, scala.Function1<T11, R>>>>>>>>>>> curried() {
-      return scala.Function11$class.curried(this);
-    }
-
-    default scala.Function1<scala.Tuple11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>, R> tupled() {
-      return scala.Function11$class.tupled(this);
-    }
-
-
 }

src/library/scala/runtime/java8/JFunction12.java

@@ -7,16 +7,4 @@
 
 @FunctionalInterface
 public interface JFunction12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, R> extends scala.Function12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, R> {
-    default void $init$() {
-    };
-
-    default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, scala.Function1<T6, scala.Function1<T7, scala.Function1<T8, scala.Function1<T9, scala.Function1<T10, scala.Function1<T11, scala.Function1<T12, R>>>>>>>>>>>> curried() {
-      return scala.Function12$class.curried(this);
-    }
-
-    default scala.Function1<scala.Tuple12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>, R> tupled() {
-      return scala.Function12$class.tupled(this);
-    }
-
-
 }

src/library/scala/runtime/java8/JFunction13.java

@@ -7,16 +7,4 @@
 
 @FunctionalInterface
 public interface JFunction13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, R> extends scala.Function13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, R> {
-    default void $init$() {
-    };
-
-    default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, scala.Function1<T6, scala.Function1<T7, scala.Function1<T8, scala.Function1<T9, scala.Function1<T10, scala.Function1<T11, scala.Function1<T12, scala.Function1<T13, R>>>>>>>>>>>>> curried() {
-      return scala.Function13$class.curried(this);
-    }
-
-    default scala.Function1<scala.Tuple13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>, R> tupled() {
-      return scala.Function13$class.tupled(this);
-    }
-
-
 }

src/library/scala/runtime/java8/JFunction14.java

@@ -7,16 +7,4 @@
 
 @FunctionalInterface
 public interface JFunction14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, R> extends scala.Function14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, R> {
-    default void $init$() {
-    };
-
-    default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, scala.Function1<T6, scala.Function1<T7, scala.Function1<T8, scala.Function1<T9, scala.Function1<T10, scala.Function1<T11, scala.Function1<T12, scala.Function1<T13, scala.Function1<T14, R>>>>>>>>>>>>>> curried() {
-      return scala.Function14$class.curried(this);
-    }
-
-    default scala.Function1<scala.Tuple14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>, R> tupled() {
-      return scala.Function14$class.tupled(this);
-    }
-
-
 }

src/library/scala/runtime/java8/JFunction15.java

@@ -7,16 +7,4 @@
 
 @FunctionalInterface
 public interface JFunction15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, R> extends scala.Function15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, R> {
-    default void $init$() {
-    };
-
-    default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, scala.Function1<T6, scala.Function1<T7, scala.Function1<T8, scala.Function1<T9, scala.Function1<T10, scala.Function1<T11, scala.Function1<T12, scala.Function1<T13, scala.Function1<T14, scala.Function1<T15, R>>>>>>>>>>>>>>> curried() {
-      return scala.Function15$class.curried(this);
-    }
-
-    default scala.Function1<scala.Tuple15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>, R> tupled() {
-      return scala.Function15$class.tupled(this);
-    }
-
-
 }

src/library/scala/runtime/java8/JFunction16.java

@@ -7,16 +7,4 @@
 
 @FunctionalInterface
 public interface JFunction16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, R> extends scala.Function16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, R> {
-    default void $init$() {
-    };
-
-    default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, scala.Function1<T6, scala.Function1<T7, scala.Function1<T8, scala.Function1<T9, scala.Function1<T10, scala.Function1<T11, scala.Function1<T12, scala.Function1<T13, scala.Function1<T14, scala.Function1<T15, scala.Function1<T16, R>>>>>>>>>>>>>>>> curried() {
-      return scala.Function16$class.curried(this);
-    }
-
-    default scala.Function1<scala.Tuple16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>, R> tupled() {
-      return scala.Function16$class.tupled(this);
-    }
-
-
 }

src/library/scala/runtime/java8/JFunction17.java

@@ -7,16 +7,4 @@
 
 @FunctionalInterface
 public interface JFunction17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, R> extends scala.Function17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, R> {
-    default void $init$() {
-    };
-
-    default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, scala.Function1<T6, scala.Function1<T7, scala.Function1<T8, scala.Function1<T9, scala.Function1<T10, scala.Function1<T11, scala.Function1<T12, scala.Function1<T13, scala.Function1<T14, scala.Function1<T15, scala.Function1<T16, scala.Function1<T17, R>>>>>>>>>>>>>>>>> curried() {
-      return scala.Function17$class.curried(this);
-    }
-
-    default scala.Function1<scala.Tuple17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17>, R> tupled() {
-      return scala.Function17$class.tupled(this);
-    }
-
-
 }

src/library/scala/runtime/java8/JFunction18.java

@@ -7,16 +7,4 @@
 
 @FunctionalInterface
 public interface JFunction18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, R> extends scala.Function18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, R> {
-    default void $init$() {
-    };
-
-    default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, scala.Function1<T6, scala.Function1<T7, scala.Function1<T8, scala.Function1<T9, scala.Function1<T10, scala.Function1<T11, scala.Function1<T12, scala.Function1<T13, scala.Function1<T14, scala.Function1<T15, scala.Function1<T16, scala.Function1<T17, scala.Function1<T18, R>>>>>>>>>>>>>>>>>> curried() {
-      return scala.Function18$class.curried(this);
-    }
-
-    default scala.Function1<scala.Tuple18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18>, R> tupled() {
-      return scala.Function18$class.tupled(this);
-    }
-
-
 }

src/library/scala/runtime/java8/JFunction19.java

@@ -7,16 +7,4 @@
 
 @FunctionalInterface
 public interface JFunction19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, R> extends scala.Function19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, R> {
-    default void $init$() {
-    };
-
-    default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, scala.Function1<T6, scala.Function1<T7, scala.Function1<T8, scala.Function1<T9, scala.Function1<T10, scala.Function1<T11, scala.Function1<T12, scala.Function1<T13, scala.Function1<T14, scala.Function1<T15, scala.Function1<T16, scala.Function1<T17, scala.Function1<T18, scala.Function1<T19, R>>>>>>>>>>>>>>>>>>> curried() {
-      return scala.Function19$class.curried(this);
-    }
-
-    default scala.Function1<scala.Tuple19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19>, R> tupled() {
-      return scala.Function19$class.tupled(this);
-    }
-
-
 }

src/library/scala/runtime/java8/JFunction2.java

@@ -7,17 +7,6 @@
 
 @FunctionalInterface
 public interface JFunction2<T1, T2, R> extends scala.Function2<T1, T2, R> {
-    default void $init$() {
-    };
-
-    default scala.Function1<T1, scala.Function1<T2, R>> curried() {
-      return scala.Function2$class.curried(this);
-    }
-
-    default scala.Function1<scala.Tuple2<T1, T2>, R> tupled() {
-      return scala.Function2$class.tupled(this);
-    }
-
     default void apply$mcVII$sp(int v1, int v2) {
         apply((T1) scala.runtime.BoxesRunTime.boxToInteger(v1), (T2) scala.runtime.BoxesRunTime.boxToInteger(v2));
     }

src/library/scala/runtime/java8/JFunction20.java

@@ -7,16 +7,4 @@
 
 @FunctionalInterface
 public interface JFunction20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, R> extends scala.Function20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, R> {
-    default void $init$() {
-    };
-
-    default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, scala.Function1<T6, scala.Function1<T7, scala.Function1<T8, scala.Function1<T9, scala.Function1<T10, scala.Function1<T11, scala.Function1<T12, scala.Function1<T13, scala.Function1<T14, scala.Function1<T15, scala.Function1<T16, scala.Function1<T17, scala.Function1<T18, scala.Function1<T19, scala.Function1<T20, R>>>>>>>>>>>>>>>>>>>> curried() {
-      return scala.Function20$class.curried(this);
-    }
-
-    default scala.Function1<scala.Tuple20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20>, R> tupled() {
-      return scala.Function20$class.tupled(this);
-    }
-
-
 }

src/library/scala/runtime/java8/JFunction21.java

@@ -7,16 +7,4 @@
 
 @FunctionalInterface
 public interface JFunction21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, R> extends scala.Function21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, R> {
-    default void $init$() {
-    };
-
-    default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, scala.Function1<T6, scala.Function1<T7, scala.Function1<T8, scala.Function1<T9, scala.Function1<T10, scala.Function1<T11, scala.Function1<T12, scala.Function1<T13, scala.Function1<T14, scala.Function1<T15, scala.Function1<T16, scala.Function1<T17, scala.Function1<T18, scala.Function1<T19, scala.Function1<T20, scala.Function1<T21, R>>>>>>>>>>>>>>>>>>>>> curried() {
-      return scala.Function21$class.curried(this);
-    }
-
-    default scala.Function1<scala.Tuple21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21>, R> tupled() {
-      return scala.Function21$class.tupled(this);
-    }
-
-
 }

src/library/scala/runtime/java8/JFunction22.java

@@ -7,16 +7,4 @@
 
 @FunctionalInterface
 public interface JFunction22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, R> 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, R> {
-    default void $init$() {
-    };
-
-    default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, scala.Function1<T6, scala.Function1<T7, scala.Function1<T8, scala.Function1<T9, scala.Function1<T10, scala.Function1<T11, scala.Function1<T12, scala.Function1<T13, scala.Function1<T14, scala.Function1<T15, scala.Function1<T16, scala.Function1<T17, scala.Function1<T18, scala.Function1<T19, scala.Function1<T20, scala.Function1<T21, scala.Function1<T22, R>>>>>>>>>>>>>>>>>>>>>> curried() {
-      return scala.Function22$class.curried(this);
-    }
-
-    default scala.Function1<scala.Tuple22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22>, R> tupled() {
-      return scala.Function22$class.tupled(this);
-    }
-
-
 }

src/library/scala/runtime/java8/JFunction3.java

@@ -7,16 +7,4 @@
 
 @FunctionalInterface
 public interface JFunction3<T1, T2, T3, R> extends scala.Function3<T1, T2, T3, R> {
-    default void $init$() {
-    };
-
-    default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, R>>> curried() {
-      return scala.Function3$class.curried(this);
-    }
-
-    default scala.Function1<scala.Tuple3<T1, T2, T3>, R> tupled() {
-      return scala.Function3$class.tupled(this);
-    }
-
-
 }

src/library/scala/runtime/java8/JFunction4.java

@@ -7,16 +7,4 @@
 
 @FunctionalInterface
 public interface JFunction4<T1, T2, T3, T4, R> extends scala.Function4<T1, T2, T3, T4, R> {
-    default void $init$() {
-    };
-
-    default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, R>>>> curried() {
-      return scala.Function4$class.curried(this);
-    }
-
-    default scala.Function1<scala.Tuple4<T1, T2, T3, T4>, R> tupled() {
-      return scala.Function4$class.tupled(this);
-    }
-
-
 }

src/library/scala/runtime/java8/JFunction5.java

@@ -7,16 +7,4 @@
 
 @FunctionalInterface
 public interface JFunction5<T1, T2, T3, T4, T5, R> extends scala.Function5<T1, T2, T3, T4, T5, R> {
-    default void $init$() {
-    };
-
-    default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, R>>>>> curried() {
-      return scala.Function5$class.curried(this);
-    }
-
-    default scala.Function1<scala.Tuple5<T1, T2, T3, T4, T5>, R> tupled() {
-      return scala.Function5$class.tupled(this);
-    }
-
-
 }

src/library/scala/runtime/java8/JFunction6.java

@@ -7,16 +7,4 @@
 
 @FunctionalInterface
 public interface JFunction6<T1, T2, T3, T4, T5, T6, R> extends scala.Function6<T1, T2, T3, T4, T5, T6, R> {
-    default void $init$() {
-    };
-
-    default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, scala.Function1<T6, R>>>>>> curried() {
-      return scala.Function6$class.curried(this);
-    }
-
-    default scala.Function1<scala.Tuple6<T1, T2, T3, T4, T5, T6>, R> tupled() {
-      return scala.Function6$class.tupled(this);
-    }
-
-
 }

src/library/scala/runtime/java8/JFunction7.java

@@ -7,16 +7,4 @@
 
 @FunctionalInterface
 public interface JFunction7<T1, T2, T3, T4, T5, T6, T7, R> extends scala.Function7<T1, T2, T3, T4, T5, T6, T7, R> {
-    default void $init$() {
-    };
-
-    default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, scala.Function1<T6, scala.Function1<T7, R>>>>>>> curried() {
-      return scala.Function7$class.curried(this);
-    }
-
-    default scala.Function1<scala.Tuple7<T1, T2, T3, T4, T5, T6, T7>, R> tupled() {
-      return scala.Function7$class.tupled(this);
-    }
-
-
 }

src/library/scala/runtime/java8/JFunction8.java

@@ -7,16 +7,4 @@
 
 @FunctionalInterface
 public interface JFunction8<T1, T2, T3, T4, T5, T6, T7, T8, R> extends scala.Function8<T1, T2, T3, T4, T5, T6, T7, T8, R> {
-    default void $init$() {
-    };
-
-    default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, scala.Function1<T6, scala.Function1<T7, scala.Function1<T8, R>>>>>>>> curried() {
-      return scala.Function8$class.curried(this);
-    }
-
-    default scala.Function1<scala.Tuple8<T1, T2, T3, T4, T5, T6, T7, T8>, R> tupled() {
-      return scala.Function8$class.tupled(this);
-    }
-
-
 }

src/library/scala/runtime/java8/JFunction9.java

@@ -7,16 +7,4 @@
 
 @FunctionalInterface
 public interface JFunction9<T1, T2, T3, T4, T5, T6, T7, T8, T9, R> extends scala.Function9<T1, T2, T3, T4, T5, T6, T7, T8, T9, R> {
-    default void $init$() {
-    };
-
-    default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, scala.Function1<T6, scala.Function1<T7, scala.Function1<T8, scala.Function1<T9, R>>>>>>>>> curried() {
-      return scala.Function9$class.curried(this);
-    }
-
-    default scala.Function1<scala.Tuple9<T1, T2, T3, T4, T5, T6, T7, T8, T9>, R> tupled() {
-      return scala.Function9$class.tupled(this);
-    }
-
-
 }