diff options
| author | Lukas Rytz <lukas.rytz@gmail.com> | 2016-09-30 15:41:03 +0200 |
|---|---|---|
| committer | Adriaan Moors <adriaan@lightbend.com> | 2016-09-30 16:10:05 -0700 |
| commit | 0e0614c866526d8922a34e3aab1afc64d7b4f01c (patch) | |
| tree | 6cd286aa256ccfe4e58ae4a8f2e4c2e2e9e9c6de /test/files/run/mixin-signatures.check | |
| parent | 759b0daaf448f08f3233ee5fdaa3bc29f0732dfc (diff) | |
| download | scala-0e0614c866526d8922a34e3aab1afc64d7b4f01c.tar.gz scala-0e0614c866526d8922a34e3aab1afc64d7b4f01c.tar.bz2 scala-0e0614c866526d8922a34e3aab1afc64d7b4f01c.zip | |
Default -Xmixin-force-forwarders to true
Also eliminates the warning when a mixin forwarder cannot be implemented
because the target method is a java-defined default method in an
interface that is not a direct parent of the class.
The test t5148 is moved to neg, as expected: It was moved to pos when
disabling mixin forwarders in 33e7106. Same for the changed error
message in t4749.
Diffstat (limited to 'test/files/run/mixin-signatures.check')
| -rw-r--r-- | test/files/run/mixin-signatures.check | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/test/files/run/mixin-signatures.check b/test/files/run/mixin-signatures.check index 9961992e2d..77bff79ac8 100644 --- a/test/files/run/mixin-signatures.check +++ b/test/files/run/mixin-signatures.check @@ -1,23 +1,19 @@ class Test$bar1$ { - public default java.lang.String Foo1.f(java.lang.Object) - generic: public default java.lang.String Foo1.f(T) + public java.lang.String Test$bar1$.f(java.lang.Object) public java.lang.Object Test$bar1$.f(java.lang.Object) <bridge> <synthetic> public java.lang.String Test$bar1$.g(java.lang.String) public java.lang.Object Test$bar1$.g(java.lang.Object) <bridge> <synthetic> public java.lang.String Test$bar1$.g(java.lang.Object) <bridge> <synthetic> - public default java.lang.Object Base.h(java.lang.Object) - generic: public default R Base.h(T) + public java.lang.Object Test$bar1$.h(java.lang.Object) } class Test$bar2$ { - public default java.lang.Object Foo2.f(java.lang.String) - generic: public default R Foo2.f(java.lang.String) + public java.lang.Object Test$bar2$.f(java.lang.String) public java.lang.Object Test$bar2$.f(java.lang.Object) <bridge> <synthetic> public java.lang.String Test$bar2$.g(java.lang.String) public java.lang.Object Test$bar2$.g(java.lang.Object) <bridge> <synthetic> public java.lang.Object Test$bar2$.g(java.lang.String) <bridge> <synthetic> - public default java.lang.Object Base.h(java.lang.Object) - generic: public default R Base.h(T) + public java.lang.Object Test$bar2$.h(java.lang.Object) } class Test$bar3$ { @@ -27,8 +23,7 @@ class Test$bar3$ { public java.lang.String Test$bar3$.g(java.lang.String) public java.lang.Object Test$bar3$.g(java.lang.Object) <bridge> <synthetic> public java.lang.String Test$bar3$.g(java.lang.Object) <bridge> <synthetic> - public default java.lang.Object Base.h(java.lang.Object) - generic: public default R Base.h(T) + public java.lang.Object Foo3.h(java.lang.Object) } class Test$bar4$ { @@ -38,8 +33,7 @@ class Test$bar4$ { public java.lang.String Test$bar4$.g(java.lang.String) public java.lang.Object Test$bar4$.g(java.lang.Object) <bridge> <synthetic> public java.lang.Object Test$bar4$.g(java.lang.String) <bridge> <synthetic> - public default java.lang.Object Base.h(java.lang.Object) - generic: public default R Base.h(T) + public java.lang.Object Foo4.h(java.lang.Object) } class Test$bar5$ { @@ -51,8 +45,7 @@ class Test$bar5$ { public java.lang.Object Test$bar5$.g(java.lang.Object) <bridge> <synthetic> public java.lang.Object Test$bar5$.g(java.lang.String) <bridge> <synthetic> public java.lang.String Test$bar5$.g(java.lang.Object) <bridge> <synthetic> - public default java.lang.Object Base.h(java.lang.Object) - generic: public default R Base.h(T) + public java.lang.Object Test$bar5$.h(java.lang.Object) } interface Foo1 { |