summaryrefslogtreecommitdiff
path: root/test/files/neg/implicits.check
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@epfl.ch>2010-09-14 14:23:28 +0000
committerAdriaan Moors <adriaan.moors@epfl.ch>2010-09-14 14:23:28 +0000
commit3b8129c77b9426a621163d4e5bf54943f58692a1 (patch)
treecfd3a9c7c28b0b135bd06d65275803770e5b99f5 /test/files/neg/implicits.check
parent45b659cd413a1411c90cd27261d8260229f93898 (diff)
downloadscala-3b8129c77b9426a621163d4e5bf54943f58692a1.tar.gz
scala-3b8129c77b9426a621163d4e5bf54943f58692a1.tar.bz2
scala-3b8129c77b9426a621163d4e5bf54943f58692a1.zip
closes #1693: improve implicit conversion disam...
closes #1693: improve implicit conversion disambiguation by incorporating the expected type of the member that triggered the conversion back-ported fix by Martin in embeddings branch. review by odersky (just in case it shouldn't have been back-ported)
Diffstat (limited to 'test/files/neg/implicits.check')
-rw-r--r--test/files/neg/implicits.check11
1 files changed, 1 insertions, 10 deletions
diff --git a/test/files/neg/implicits.check b/test/files/neg/implicits.check
index 337560f423..d975ccfa84 100644
--- a/test/files/neg/implicits.check
+++ b/test/files/neg/implicits.check
@@ -1,12 +1,3 @@
-implicits.scala:21: error: type mismatch;
- found : Pos
- required: ?{val +: ?}
-Note that implicit conversions are not applicable because they are ambiguous:
- both method any2plus in object Sub of type (x: Any)Sub.Plus
- and method pos2int in object Super of type (p: Pos)Int
- are possible conversion functions from Pos to ?{val +: ?}
- f(p+1)
- ^
implicits.scala:38: error: type mismatch;
found : test2.HSome[java.lang.String,test2.HMap]
required: Int
@@ -17,4 +8,4 @@ implicits.scala:46: error: type mismatch;
required: scala.List[Mxml]
children.toList.flatMap ( e => {
^
-three errors found
+two errors found