summaryrefslogtreecommitdiff
path: root/test/files/run/bridges.scala
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2006-10-06 17:34:40 +0000
committerMartin Odersky <odersky@gmail.com>2006-10-06 17:34:40 +0000
commit83b51eccb8dd72b5d5cffdd5c9b04f73dd292392 (patch)
treee3dc0f49e278d40a3b82443c4fadf6a31ab28273 /test/files/run/bridges.scala
parentd7a4f76d25820df20c9e8cd6594fa635f666dfe3 (diff)
downloadscala-83b51eccb8dd72b5d5cffdd5c9b04f73dd292392.tar.gz
scala-83b51eccb8dd72b5d5cffdd5c9b04f73dd292392.tar.bz2
scala-83b51eccb8dd72b5d5cffdd5c9b04f73dd292392.zip
renamed All->Nothing, AllRef -> Null while keep...
renamed All->Nothing, AllRef -> Null while keeping the old names as aliases.
Diffstat (limited to 'test/files/run/bridges.scala')
-rw-r--r--test/files/run/bridges.scala16
1 files changed, 8 insertions, 8 deletions
diff --git a/test/files/run/bridges.scala b/test/files/run/bridges.scala
index 65ba2f13cc..9fd2c8e274 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>:AllRef<:AnyRef; def f: I ; f; }
-abstract class Foo__f { type I>:AllRef<:AnyRef; def f: I = {foo; null}; f; }
+abstract class Foo___ { type I>:Null<:AnyRef; def f: I ; f; }
+abstract class Foo__f { type I>:Null<: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>:AllRef<:AnyRef; def f: I ; f; }
-abstract class FooX_f[X] { type I>:AllRef<:AnyRef; def f: I = {foo; null}; f; }
+abstract class FooX__[X] { type I>:Null<:AnyRef; def f: I ; f; }
+abstract class FooX_f[X] { type I>:Null<: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>:AllRef<:AnyRef; def f: I ; f; }
-trait Bar__f { type I>:AllRef<:AnyRef; def f: I = {bar; null}; f; }
+trait Bar___ { type I>:Null<:AnyRef; def f: I ; f; }
+trait Bar__f { type I>:Null<: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>:AllRef<:AnyRef; def f: I ; f; }
-trait BarY_f[Y] { type I>:AllRef<:AnyRef; def f: I = {bar; null}; f; }
+trait BarY__[Y] { type I>:Null<:AnyRef; def f: I ; f; }
+trait BarY_f[Y] { type I>:Null<: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; }