summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2013-05-23 16:50:45 -0700
committerPaul Phillips <paulp@improving.org>2013-05-23 23:18:42 -0700
commitde12ca6ef8071820c6b2a9403ccab9aa6ed51c0b (patch)
tree20da62ee1cb063a60b7a7e4fa2d9081e11093265 /test/files
parentf81a4f92967a2dd69784864e9ab9e1624d7db35b (diff)
downloadscala-de12ca6ef8071820c6b2a9403ccab9aa6ed51c0b.tar.gz
scala-de12ca6ef8071820c6b2a9403ccab9aa6ed51c0b.tar.bz2
scala-de12ca6ef8071820c6b2a9403ccab9aa6ed51c0b.zip
SI-7486 Regressions in implicit search.
Revert e86832d7e8 and dd33e280e2.
Diffstat (limited to 'test/files')
-rw-r--r--test/files/neg/t7441.check6
-rw-r--r--test/files/neg/t7441.scala7
-rw-r--r--test/files/pos/t7486.scala8
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
- }
-}