diff options
| author | Adriaan Moors <adriaan@lightbend.com> | 2017-03-21 11:53:54 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-21 11:53:54 -0700 |
| commit | 99f41a15d16be6707b6c33b5a16093e016db81eb (patch) | |
| tree | ec2a2d24fb84fddc2084b66d64c764d34418b2bc /test/files/neg | |
| parent | 363d9e58761c87e2d30f52d60e11b8f0ea6d45ca (diff) | |
| parent | 849d09b9e10d025df7f91494315f927f68bc9dd6 (diff) | |
| download | scala-99f41a15d16be6707b6c33b5a16093e016db81eb.tar.gz scala-99f41a15d16be6707b6c33b5a16093e016db81eb.tar.bz2 scala-99f41a15d16be6707b6c33b5a16093e016db81eb.zip | |
Merge pull request #5736 from adriaanm/t10206
SI-10206 tighten fix for SI-6889
Diffstat (limited to 'test/files/neg')
| -rw-r--r-- | test/files/neg/t6889.check | 7 | ||||
| -rw-r--r-- | test/files/neg/t6889.scala | 1 |
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 } |