diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-02-04 19:45:08 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-02-04 19:45:08 -0800 |
| commit | 75ca8693f3c8468ab35e8a4cb53d4d4981d7363c (patch) | |
| tree | 2d84cedaaed9762e0310d18e6a1f01b15667c7a3 /test/files/neg/t6667.check | |
| parent | 893fad496965744f6e6fbfa4b5a0add3c5eff9fa (diff) | |
| parent | b67f8e57f4381024c0fba109ebe11d4006472d83 (diff) | |
| download | scala-75ca8693f3c8468ab35e8a4cb53d4d4981d7363c.tar.gz scala-75ca8693f3c8468ab35e8a4cb53d4d4981d7363c.tar.bz2 scala-75ca8693f3c8468ab35e8a4cb53d4d4981d7363c.zip | |
Merge pull request #2063 from retronym/ticket/6667-2.10.x-revert
[nomerge] SI-6667 Demote a new ambiguity error to a lint warning.
Diffstat (limited to 'test/files/neg/t6667.check')
| -rw-r--r-- | test/files/neg/t6667.check | 3 |
1 files changed, 2 insertions, 1 deletions
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 |