diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/files/buildmanager/t2556_3/t2556_3.check | 4 | ||||
| -rw-r--r-- | test/files/neg/bug900.check | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/files/buildmanager/t2556_3/t2556_3.check b/test/files/buildmanager/t2556_3/t2556_3.check index af0c63eebc..01dfa79b12 100644 --- a/test/files/buildmanager/t2556_3/t2556_3.check +++ b/test/files/buildmanager/t2556_3/t2556_3.check @@ -11,8 +11,8 @@ B.scala:3: error: type mismatch; found : C required: ?{val x: ?} Note that implicit conversions are not applicable because they are ambiguous: - both method any2ArrowAssoc in object Predef of type [A](x: A)ArrowAssoc[A] - and method any2Ensuring in object Predef of type [A](x: A)Ensuring[A] + 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 ) ^ diff --git a/test/files/neg/bug900.check b/test/files/neg/bug900.check index 6085ffea06..95f71557b8 100644 --- a/test/files/neg/bug900.check +++ b/test/files/neg/bug900.check @@ -2,7 +2,7 @@ bug900.scala:4: error: type mismatch; found : Foo.this.x.type (with underlying type Foo.this.bar) required: AnyRef Note that implicit conversions are not applicable because they are ambiguous: - both method any2stringadd in object Predef of type (x: Any)scala.runtime.StringAdd + 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 Foo.this.x.type to AnyRef def break(): x.type |