summaryrefslogtreecommitdiff
path: root/test/files/neg/t6667b.check
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2013-02-04 19:53:32 +0100
committerJason Zaugg <jzaugg@gmail.com>2013-02-04 19:53:32 +0100
commitb67f8e57f4381024c0fba109ebe11d4006472d83 (patch)
treea71d15a5c71202f68db01242db19093c89876c11 /test/files/neg/t6667b.check
parent8d25d05e9bf848d763e7b657d9c7e96ea5cb8daf (diff)
downloadscala-b67f8e57f4381024c0fba109ebe11d4006472d83.tar.gz
scala-b67f8e57f4381024c0fba109ebe11d4006472d83.tar.bz2
scala-b67f8e57f4381024c0fba109ebe11d4006472d83.zip
[nomerge] SI-6667 Demote a new ambiguity error to a lint warning.
In the interests of not breaking source compability. A few projects are relying on this bug. Should not be merged to master.
Diffstat (limited to 'test/files/neg/t6667b.check')
-rw-r--r--test/files/neg/t6667b.check3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/files/neg/t6667b.check b/test/files/neg/t6667b.check
index 99cea9a47c..5d56e776c3 100644
--- a/test/files/neg/t6667b.check
+++ b/test/files/neg/t6667b.check
@@ -4,7 +4,8 @@ t6667b.scala:16: error: ambiguous implicit values:
match expected type Test.Box
new Test()
^
-t6667b.scala:19: error: ambiguous implicit values:
+t6667b.scala:19: error: Search of in-scope implicits was ambiguous, and the implicit scope was searched. In Scala 2.11.0, this code will not compile. See SI-6667.
+ambiguous implicit values:
both value a in object Test of type => Test.Box
and value b of type Test.Box
match expected type Test.Box