diff options
author | Martin Odersky <odersky@gmail.com> | 2006-10-06 17:34:40 +0000 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2006-10-06 17:34:40 +0000 |
commit | 83b51eccb8dd72b5d5cffdd5c9b04f73dd292392 (patch) | |
tree | e3dc0f49e278d40a3b82443c4fadf6a31ab28273 /test/files/neg | |
parent | d7a4f76d25820df20c9e8cd6594fa635f666dfe3 (diff) | |
download | scala-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/neg')
-rw-r--r-- | test/files/neg/bug412.check | 2 | ||||
-rw-r--r-- | test/files/neg/bug550.check | 2 | ||||
-rw-r--r-- | test/files/neg/bug677.check | 6 | ||||
-rwxr-xr-x | test/files/neg/bug677.scala | 4 | ||||
-rw-r--r-- | test/files/neg/bug708.check | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/test/files/neg/bug412.check b/test/files/neg/bug412.check index 6caf74fb3d..8d1f487f42 100644 --- a/test/files/neg/bug412.check +++ b/test/files/neg/bug412.check @@ -1,5 +1,5 @@ bug412.scala:9 error: type mismatch; - found : scala.AllRef(null) + found : scala.Null(null) required: A.this.CX with A.this.C2 val c: CX with C2 = null; ^ diff --git a/test/files/neg/bug550.check b/test/files/neg/bug550.check index 25367af0e5..8ce38b21e4 100644 --- a/test/files/neg/bug550.check +++ b/test/files/neg/bug550.check @@ -1,7 +1,7 @@ bug550.scala:6 error: class List takes type parameters def sum[a](xs: List)(implicit m: Monoid[a]): a = ^ -bug550.scala:8 error: no implicit argument matching parameter type Monoid[scala.All] was found. +bug550.scala:8 error: no implicit argument matching parameter type Monoid[scala.Nothing] was found. sum(List(1,2,3)) ^ two errors found diff --git a/test/files/neg/bug677.check b/test/files/neg/bug677.check index 7086f259a3..90fceef364 100644 --- a/test/files/neg/bug677.check +++ b/test/files/neg/bug677.check @@ -1,6 +1,6 @@ bug677.scala:2 error: type mismatch; found : () => scala.Int - required: scala.All - val zx: All = {() => 4} - ^ + required: scala.Nothing + val zx: Nothing = {() => 4} + ^ one error found diff --git a/test/files/neg/bug677.scala b/test/files/neg/bug677.scala index 06dcbe5557..c65ee9640f 100755 --- a/test/files/neg/bug677.scala +++ b/test/files/neg/bug677.scala @@ -1,3 +1,3 @@ object ga { - val zx: All = {() => 4} -}
\ No newline at end of file + val zx: Nothing = {() => 4} +} diff --git a/test/files/neg/bug708.check b/test/files/neg/bug708.check index 305c084416..e800fdd0df 100644 --- a/test/files/neg/bug708.check +++ b/test/files/neg/bug708.check @@ -1,4 +1,4 @@ -bug708.scala:8 error: error overriding type S in trait X with bounds >: scala.All <: A.this.T; +bug708.scala:8 error: error overriding type S in trait X with bounds >: scala.Nothing <: A.this.T; type S has incompatible type scala.Any override private[A] type S = Any; ^ |