From b67f8e57f4381024c0fba109ebe11d4006472d83 Mon Sep 17 00:00:00 2001 From: Jason Zaugg Date: Mon, 4 Feb 2013 19:53:32 +0100 Subject: [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. --- test/files/neg/t6667.check | 3 ++- test/files/neg/t6667.flags | 1 + test/files/neg/t6667b.check | 3 ++- test/files/neg/t6667b.flags | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 test/files/neg/t6667.flags create mode 100644 test/files/neg/t6667b.flags (limited to 'test') diff --git a/test/files/neg/t6667.check b/test/files/neg/t6667.check index 43313fa4fe..b04251d7c1 100644 --- a/test/files/neg/t6667.check +++ b/test/files/neg/t6667.check @@ -1,4 +1,5 @@ -t6667.scala:8: error: ambiguous implicit values: +t6667.scala:8: 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 inScope1 in object Test of type => C and value inScope2 in object Test of type => C match expected type C diff --git a/test/files/neg/t6667.flags b/test/files/neg/t6667.flags new file mode 100644 index 0000000000..6c1dd108ae --- /dev/null +++ b/test/files/neg/t6667.flags @@ -0,0 +1 @@ +-Xfatal-warnings -Xlint \ No newline at end of file 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 diff --git a/test/files/neg/t6667b.flags b/test/files/neg/t6667b.flags new file mode 100644 index 0000000000..6c1dd108ae --- /dev/null +++ b/test/files/neg/t6667b.flags @@ -0,0 +1 @@ +-Xfatal-warnings -Xlint \ No newline at end of file -- cgit v1.2.3