From 2d1242bd5e2486c1ba785d39e81408d418dacc13 Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Tue, 20 Oct 2009 20:19:28 +0000 Subject: Fixes for 66.67% of the tests failing from the ... Fixes for 66.67% of the tests failing from the Ordering commit. Other third is going to take a closer look. --- test/files/neg/bug900.check | 4 ++-- test/files/neg/unit2anyref.check | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'test/files/neg') diff --git a/test/files/neg/bug900.check b/test/files/neg/bug900.check index 459ea38bc3..6085ffea06 100644 --- a/test/files/neg/bug900.check +++ b/test/files/neg/bug900.check @@ -2,8 +2,8 @@ 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 orderingToOrdered in object Predef of type [T](x: T)(implicit ord: Ordering[T])Ordered[T] - and method any2stringadd in object Predef of type (x: Any)scala.runtime.StringAdd + both method any2stringadd in object Predef of type (x: Any)scala.runtime.StringAdd + 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 ^ diff --git a/test/files/neg/unit2anyref.check b/test/files/neg/unit2anyref.check index 6459949341..7af4564ffb 100644 --- a/test/files/neg/unit2anyref.check +++ b/test/files/neg/unit2anyref.check @@ -2,8 +2,8 @@ unit2anyref.scala:2: error: type mismatch; found : Unit required: AnyRef Note that implicit conversions are not applicable because they are ambiguous: - both method orderingToOrdered in object Predef of type [T](x: T)(implicit ord: Ordering[T])Ordered[T] - and method any2stringadd in object Predef of type (x: Any)scala.runtime.StringAdd + both method any2stringadd in object Predef of type (x: Any)scala.runtime.StringAdd + and method any2ArrowAssoc in object Predef of type [A](x: A)ArrowAssoc[A] are possible conversion functions from Unit to AnyRef val x: AnyRef = () // this should not succeed. ^ -- cgit v1.2.3