diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2013-05-27 06:35:37 -0700 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2013-05-27 06:35:37 -0700 |
commit | 6cc39842f79bcf266ca3f49eca1f2a1ba46ed817 (patch) | |
tree | cf7678821c44fad81c5c58d2afefb4141eee6604 /test/files | |
parent | 0da2b2c96b6dc91d95a54725bc04381fc0eda43b (diff) | |
parent | de12ca6ef8071820c6b2a9403ccab9aa6ed51c0b (diff) | |
download | scala-6cc39842f79bcf266ca3f49eca1f2a1ba46ed817.tar.gz scala-6cc39842f79bcf266ca3f49eca1f2a1ba46ed817.tar.bz2 scala-6cc39842f79bcf266ca3f49eca1f2a1ba46ed817.zip |
Merge pull request #2590 from paulp/issue/7486
SI-7486 Regressions in implicit search.
Diffstat (limited to 'test/files')
-rw-r--r-- | test/files/neg/t7441.check | 6 | ||||
-rw-r--r-- | test/files/neg/t7441.scala | 7 | ||||
-rw-r--r-- | test/files/pos/t7486.scala | 8 |
3 files changed, 0 insertions, 21 deletions
diff --git a/test/files/neg/t7441.check b/test/files/neg/t7441.check deleted file mode 100644 index f259457197..0000000000 --- a/test/files/neg/t7441.check +++ /dev/null @@ -1,6 +0,0 @@ -t7441.scala:4: error: type mismatch; - found : Int(1) - required: List[Any] - def test = apply(1) - ^ -one error found diff --git a/test/files/neg/t7441.scala b/test/files/neg/t7441.scala deleted file mode 100644 index dad7421e3f..0000000000 --- a/test/files/neg/t7441.scala +++ /dev/null @@ -1,7 +0,0 @@ -object Test { - object Bar { - def apply(xs: List[Any]): Int = 0 - def test = apply(1) - } - implicit def foo = 1 -} diff --git a/test/files/pos/t7486.scala b/test/files/pos/t7486.scala deleted file mode 100644 index 6dd7f4c4ac..0000000000 --- a/test/files/pos/t7486.scala +++ /dev/null @@ -1,8 +0,0 @@ -object Test{ - var locker = 0 - // remove implicit, or change to `locker = locker + 1` to make it compile. - implicit val davyJones0 = { - locker += 0 - 0 - } -} |