Skip to content

Commit 7ce2182

Browse files
committed
Avoid raw types in the parents of specialized JFunction*
Since the last commit, `samMethod` looks for the single abstract method before erasure for correctness, and somehow this caused the implementation of `apply` in the various specialized JFunction classes to not be seen as overrides anymore. Replacing the raw type `JFunction1` by `JFunction1<Object, Object>` in the extends clauses of each interface fixes that (this is always the correct type to use because the generic signature we emit for `Function1[Int, Int]` is `Function1<Object, Object>` and not `Function1<Integer, Integer>`, the rationale for this is explained in scala/scala@e42733e).
1 parent b1971b4 commit 7ce2182

File tree

78 files changed

+78
-78
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+78
-78
lines changed

library/src/dotty/runtime/function/JFunction1$mcDD$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
package dotty.runtime.function;
77

88
@FunctionalInterface
9-
public interface JFunction1$mcDD$sp extends JFunction1 {
9+
public interface JFunction1$mcDD$sp extends JFunction1<Object, Object> {
1010
abstract double apply$mcDD$sp(double v1);
1111

1212
default Object apply(Object t) { return (Double) apply$mcDD$sp(scala.runtime.BoxesRunTime.unboxToDouble(t)); }

library/src/dotty/runtime/function/JFunction1$mcDF$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
package dotty.runtime.function;
77

88
@FunctionalInterface
9-
public interface JFunction1$mcDF$sp extends JFunction1 {
9+
public interface JFunction1$mcDF$sp extends JFunction1<Object, Object> {
1010
abstract double apply$mcDF$sp(float v1);
1111

1212
default Object apply(Object t) { return (Double) apply$mcDF$sp(scala.runtime.BoxesRunTime.unboxToFloat(t)); }

library/src/dotty/runtime/function/JFunction1$mcDI$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
package dotty.runtime.function;
77

88
@FunctionalInterface
9-
public interface JFunction1$mcDI$sp extends JFunction1 {
9+
public interface JFunction1$mcDI$sp extends JFunction1<Object, Object> {
1010
abstract double apply$mcDI$sp(int v1);
1111

1212
default Object apply(Object t) { return (Double) apply$mcDI$sp(scala.runtime.BoxesRunTime.unboxToInt(t)); }

library/src/dotty/runtime/function/JFunction1$mcDJ$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
package dotty.runtime.function;
77

88
@FunctionalInterface
9-
public interface JFunction1$mcDJ$sp extends JFunction1 {
9+
public interface JFunction1$mcDJ$sp extends JFunction1<Object, Object> {
1010
abstract double apply$mcDJ$sp(long v1);
1111

1212
default Object apply(Object t) { return (Double) apply$mcDJ$sp(scala.runtime.BoxesRunTime.unboxToLong(t)); }

library/src/dotty/runtime/function/JFunction1$mcFD$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
package dotty.runtime.function;
77

88
@FunctionalInterface
9-
public interface JFunction1$mcFD$sp extends JFunction1 {
9+
public interface JFunction1$mcFD$sp extends JFunction1<Object, Object> {
1010
abstract float apply$mcFD$sp(double v1);
1111

1212
default Object apply(Object t) { return (Float) apply$mcFD$sp(scala.runtime.BoxesRunTime.unboxToDouble(t)); }

library/src/dotty/runtime/function/JFunction1$mcFF$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
package dotty.runtime.function;
77

88
@FunctionalInterface
9-
public interface JFunction1$mcFF$sp extends JFunction1 {
9+
public interface JFunction1$mcFF$sp extends JFunction1<Object, Object> {
1010
abstract float apply$mcFF$sp(float v1);
1111

1212
default Object apply(Object t) { return (Float) apply$mcFF$sp(scala.runtime.BoxesRunTime.unboxToFloat(t)); }

library/src/dotty/runtime/function/JFunction1$mcFI$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
package dotty.runtime.function;
77

88
@FunctionalInterface
9-
public interface JFunction1$mcFI$sp extends JFunction1 {
9+
public interface JFunction1$mcFI$sp extends JFunction1<Object, Object> {
1010
abstract float apply$mcFI$sp(int v1);
1111

1212
default Object apply(Object t) { return (Float) apply$mcFI$sp(scala.runtime.BoxesRunTime.unboxToInt(t)); }

library/src/dotty/runtime/function/JFunction1$mcFJ$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
package dotty.runtime.function;
77

88
@FunctionalInterface
9-
public interface JFunction1$mcFJ$sp extends JFunction1 {
9+
public interface JFunction1$mcFJ$sp extends JFunction1<Object, Object> {
1010
abstract float apply$mcFJ$sp(long v1);
1111

1212
default Object apply(Object t) { return (Float) apply$mcFJ$sp(scala.runtime.BoxesRunTime.unboxToLong(t)); }

library/src/dotty/runtime/function/JFunction1$mcID$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
package dotty.runtime.function;
77

88
@FunctionalInterface
9-
public interface JFunction1$mcID$sp extends JFunction1 {
9+
public interface JFunction1$mcID$sp extends JFunction1<Object, Object> {
1010
abstract int apply$mcID$sp(double v1);
1111

1212
default Object apply(Object t) { return (Integer) apply$mcID$sp(scala.runtime.BoxesRunTime.unboxToDouble(t)); }

library/src/dotty/runtime/function/JFunction1$mcIF$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
package dotty.runtime.function;
77

88
@FunctionalInterface
9-
public interface JFunction1$mcIF$sp extends JFunction1 {
9+
public interface JFunction1$mcIF$sp extends JFunction1<Object, Object> {
1010
abstract int apply$mcIF$sp(float v1);
1111

1212
default Object apply(Object t) { return (Integer) apply$mcIF$sp(scala.runtime.BoxesRunTime.unboxToFloat(t)); }

0 commit comments

Comments
 (0)