summaryrefslogtreecommitdiff
path: root/test/files/buildmanager/t2556_3/t2556_3.check
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2011-11-08 22:14:30 +0000
committerPaul Phillips <paulp@improving.org>2011-11-08 22:14:30 +0000
commitf9fb5ca997dde7a49fc9d748ca0298befc77b907 (patch)
tree01fe607bafdb12c9f48208002e6420ab83c45535 /test/files/buildmanager/t2556_3/t2556_3.check
parentbcc5eebedb8869e73e0d39aaf5c6b3164048aad1 (diff)
downloadscala-f9fb5ca997dde7a49fc9d748ca0298befc77b907.tar.gz
scala-f9fb5ca997dde7a49fc9d748ca0298befc77b907.tar.bz2
scala-f9fb5ca997dde7a49fc9d748ca0298befc77b907.zip
Updates for the ten tests I broke recently.
Wow, ten tests, that's unexpected. No review.
Diffstat (limited to 'test/files/buildmanager/t2556_3/t2556_3.check')
-rw-r--r--test/files/buildmanager/t2556_3/t2556_3.check10
1 files changed, 8 insertions, 2 deletions
diff --git a/test/files/buildmanager/t2556_3/t2556_3.check b/test/files/buildmanager/t2556_3/t2556_3.check
index 72236ca0d1..bf26602494 100644
--- a/test/files/buildmanager/t2556_3/t2556_3.check
+++ b/test/files/buildmanager/t2556_3/t2556_3.check
@@ -7,6 +7,12 @@ Changes: Map(class A -> List(), class B -> List(Changed(Class(B))[List((A,Object
invalidate C.scala because parents have changed [Changed(Class(B))[List((A,Object), (ScalaObject,ScalaObject))]]
invalidate B.scala because it references invalid (no longer inherited) definition [ParentChanged(Class(C))]
compiling Set(B.scala, C.scala)
-B.scala:3: error: value x is not a member of C
+B.scala:3: error: type mismatch;
+ found : C
+ required: ?{val x: ?}
+Note that implicit conversions are not applicable because they are ambiguous:
+ both method any2Ensuring in object Predef of type [A](x: A)Ensuring[A]
+ and method any2ArrowAssoc in object Predef of type [A](x: A)ArrowAssoc[A]
+ are possible conversion functions from C to ?{val x: ?}
println( (new C).x )
- ^
+ ^