summaryrefslogtreecommitdiff
path: root/test/files/neg
diff options
context:
space:
mode:
authorAntonio Cunei <antonio.cunei@epfl.ch>2010-09-14 12:41:40 +0000
committerAntonio Cunei <antonio.cunei@epfl.ch>2010-09-14 12:41:40 +0000
commit3ef8c7575deb5081bf623dde9d29c44648ce59af (patch)
treed3cbb5f39dc284916994df5bdaf7184489489bfb /test/files/neg
parentceb38470116de2d7a2bdeb1f3aaacba8bf09bf60 (diff)
downloadscala-3ef8c7575deb5081bf623dde9d29c44648ce59af.tar.gz
scala-3ef8c7575deb5081bf623dde9d29c44648ce59af.tar.bz2
scala-3ef8c7575deb5081bf623dde9d29c44648ce59af.zip
Merged revisions 22977 via svnmerge from
https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk ........ r22977 | moors | 2010-09-14 14:11:54 +0200 (Tue, 14 Sep 2010) | 5 lines relax implicit divergence check patch contributed by Mark Harrah in http://article.gmane.org/gmane.comp.lang.scala/20700 reviewed by moors and odersky ........
Diffstat (limited to 'test/files/neg')
-rw-r--r--test/files/neg/t0226.check3
1 files changed, 1 insertions, 2 deletions
diff --git a/test/files/neg/t0226.check b/test/files/neg/t0226.check
index e27ffbc1e1..af81e41a6a 100644
--- a/test/files/neg/t0226.check
+++ b/test/files/neg/t0226.check
@@ -4,8 +4,7 @@ t0226.scala:5: error: not found: type A1
t0226.scala:5: error: not found: type A1
(implicit _1: Foo[List[A1]], _2: Foo[A2]): Foo[Tuple2[List[A1], A2]] =
^
-t0226.scala:8: error: diverging implicit expansion for type Test.this.Foo[((List[Char], Int), (object Nil, Int))]
-starting with method list2Foo in class Test
+t0226.scala:8: error: could not find implicit value for parameter rep: Test.this.Foo[((List[Char], Int), (object Nil, Int))]
foo(((List('b'), 3), (Nil, 4)))
^
three errors found