summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan@lightbend.com>2017-02-23 15:44:37 -0800
committerAdriaan Moors <adriaan@lightbend.com>2017-02-23 16:22:25 -0800
commit78d917393ea03ef94f892549f87cbc2cabba8ac6 (patch)
tree072959664621782b246a75ae3383fd2719665da4 /test
parent011cc7ec86105640a6d606998f769986630fb62a (diff)
downloadscala-78d917393ea03ef94f892549f87cbc2cabba8ac6.tar.gz
scala-78d917393ea03ef94f892549f87cbc2cabba8ac6.tar.bz2
scala-78d917393ea03ef94f892549f87cbc2cabba8ac6.zip
SI-10206 tighten fix for SI-6889
There are more supertypes of `AnyRef` than you might think: `?{def clone: ?}` is one example...
Diffstat (limited to 'test')
-rw-r--r--test/files/neg/t6889.check7
-rw-r--r--test/files/neg/t6889.scala1
2 files changed, 6 insertions, 2 deletions
diff --git a/test/files/neg/t6889.check b/test/files/neg/t6889.check
index a77e8a010c..c14c3b09c0 100644
--- a/test/files/neg/t6889.check
+++ b/test/files/neg/t6889.check
@@ -1,7 +1,10 @@
t6889.scala:16: error: the result type of an implicit conversion must be more specific than AnyRef
def f(x: Dingo): AnyRef = x // fail - no conversion to AnyRef
^
-t6889.scala:17: error: an expression of type Null is ineligible for implicit conversion
+t6889.scala:17: error: the result type of an implicit conversion must be more specific than Object
+ def f2(x: Dingo): Object = x // fail - no conversion to Object
+ ^
+t6889.scala:18: error: an expression of type Null is ineligible for implicit conversion
var x: Int = null // fail - no conversion from Null
^
-two errors found
+three errors found
diff --git a/test/files/neg/t6889.scala b/test/files/neg/t6889.scala
index ef1963669c..3fc235bf7e 100644
--- a/test/files/neg/t6889.scala
+++ b/test/files/neg/t6889.scala
@@ -14,5 +14,6 @@ object Test {
trait Dingo extends Any with bippy.Bippy[foo.unrelated.Unrelated]
def f(x: Dingo): AnyRef = x // fail - no conversion to AnyRef
+ def f2(x: Dingo): Object = x // fail - no conversion to Object
var x: Int = null // fail - no conversion from Null
}