diff options
Diffstat (limited to 'test/files/run')
-rw-r--r-- | test/files/run/bridges.scala | 16 | ||||
-rw-r--r-- | test/files/run/bugs.scala | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/test/files/run/bridges.scala b/test/files/run/bridges.scala index bf3781fde0..65ba2f13cc 100644 --- a/test/files/run/bridges.scala +++ b/test/files/run/bridges.scala @@ -39,21 +39,21 @@ import Help.bar; import Help.mix; import Help.sub; -abstract class Foo___ { type I<:AnyRef; def f: I ; f; } -abstract class Foo__f { type I<:AnyRef; def f: I = {foo; null}; f; } +abstract class Foo___ { type I>:AllRef<:AnyRef; def f: I ; f; } +abstract class Foo__f { type I>:AllRef<:AnyRef; def f: I = {foo; null}; f; } abstract class Foo_I_ { class I ; def f: I ; f; } abstract class Foo_If { class I ; def f: I = {foo; null}; f; } -abstract class FooX__[X] { type I<:AnyRef; def f: I ; f; } -abstract class FooX_f[X] { type I<:AnyRef; def f: I = {foo; null}; f; } +abstract class FooX__[X] { type I>:AllRef<:AnyRef; def f: I ; f; } +abstract class FooX_f[X] { type I>:AllRef<:AnyRef; def f: I = {foo; null}; f; } abstract class FooXI_[X] { class I ; def f: I ; f; } abstract class FooXIf[X] { class I ; def f: I = {foo; null}; f; } -trait Bar___ { type I<:AnyRef; def f: I ; f; } -trait Bar__f { type I<:AnyRef; def f: I = {bar; null}; f; } +trait Bar___ { type I>:AllRef<:AnyRef; def f: I ; f; } +trait Bar__f { type I>:AllRef<:AnyRef; def f: I = {bar; null}; f; } trait Bar_I_ { class I ; def f: I ; f; } trait Bar_If { class I ; def f: I = {bar; null}; f; } -trait BarY__[Y] { type I<:AnyRef; def f: I ; f; } -trait BarY_f[Y] { type I<:AnyRef; def f: I = {bar; null}; f; } +trait BarY__[Y] { type I>:AllRef<:AnyRef; def f: I ; f; } +trait BarY_f[Y] { type I>:AllRef<:AnyRef; def f: I = {bar; null}; f; } trait BarYI_[Y] { class I ; def f: I ; f; } trait BarYIf[Y] { class I ; def f: I = {bar; null}; f; } diff --git a/test/files/run/bugs.scala b/test/files/run/bugs.scala index 8d611dae6a..6c24a198de 100644 --- a/test/files/run/bugs.scala +++ b/test/files/run/bugs.scala @@ -335,7 +335,7 @@ object Bug257Test { // version - A abstract class Bug266AFoo { - type T <: AnyRef; + type T >: AllRef <: AnyRef; abstract class I0 { def f(x: T): Unit; f(null); } } |