summaryrefslogtreecommitdiff
path: root/test/files/neg/bug900.check
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@epfl.ch>2007-04-06 09:23:03 +0000
committerAdriaan Moors <adriaan.moors@epfl.ch>2007-04-06 09:23:03 +0000
commite1c732db445d1ab0172bc25073ce865acc7d280b (patch)
tree4e1445535167194e09815e95563e4d2a9ef927f3 /test/files/neg/bug900.check
parent289fd3d7307ca117a419e71e3a20b0b811a0d33f (diff)
downloadscala-e1c732db445d1ab0172bc25073ce865acc7d280b.tar.gz
scala-e1c732db445d1ab0172bc25073ce865acc7d280b.tar.bz2
scala-e1c732db445d1ab0172bc25073ce865acc7d280b.zip
merged in tcpoly branch (at r10641)
Diffstat (limited to 'test/files/neg/bug900.check')
-rw-r--r--test/files/neg/bug900.check4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/files/neg/bug900.check b/test/files/neg/bug900.check
index 531ac5bee4..0bb5edad80 100644
--- a/test/files/neg/bug900.check
+++ b/test/files/neg/bug900.check
@@ -1,10 +1,10 @@
bug900.scala:4: error: type mismatch;
found : Foo.this.x.type (with underlying type Foo.this.bar)
- required: java.lang.Object
+ required: scala.AnyRef
Note that implicit conversions are not applicable because they are ambiguous:
both method any2stringadd in object Predef of type (scala.Any)scala.runtime.StringAdd
and method any2ArrowAssoc in object Predef of type [a](a)scala.Predef.ArrowAssoc[a]
- are possible conversion functions from Foo.this.x.type to java.lang.Object
+ are possible conversion functions from Foo.this.x.type to scala.AnyRef
def break(): x.type
^
one error found