diff options
| author | Adriaan Moors <adriaan@lightbend.com> | 2017-04-08 10:13:21 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-08 10:13:21 -0700 |
| commit | 1ef37f0bc18be5ed2ca8c33c0ea1912eed5dac3e (patch) | |
| tree | 504be1953b98540b72cf4932b66a1c1143f4f00a /test/files/neg/t6889.scala | |
| parent | 2261f3ef4f7b2e0d14b3c2463db5878029bc5d8e (diff) | |
| parent | 0d88720aea13c3a1f136f0caa7346eefe64610ec (diff) | |
| download | scala-1ef37f0bc18be5ed2ca8c33c0ea1912eed5dac3e.tar.gz scala-1ef37f0bc18be5ed2ca8c33c0ea1912eed5dac3e.tar.bz2 scala-1ef37f0bc18be5ed2ca8c33c0ea1912eed5dac3e.zip | |
Merge pull request #5837 from adriaanm/merge-2.11.x-into-2.12.x
Catch up with 2.11.x
Diffstat (limited to 'test/files/neg/t6889.scala')
| -rw-r--r-- | test/files/neg/t6889.scala | 1 |
1 files changed, 1 insertions, 0 deletions
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 } |