diff options
| author | François Garillot <francois@garillot.net> | 2013-09-24 10:21:10 +0200 |
|---|---|---|
| committer | François Garillot <francois@garillot.net> | 2013-09-24 10:21:10 +0200 |
| commit | 710401d8aec814d95b25ca2104036aa414a5db35 (patch) | |
| tree | e6374925f1719b65ceb51202aacfb6257754ff6f /test/files/neg/divergent-implicit.check | |
| parent | 7d570b54c3c895bc8948adeca2e463d135e38feb (diff) | |
| download | scala-710401d8aec814d95b25ca2104036aa414a5db35.tar.gz scala-710401d8aec814d95b25ca2104036aa414a5db35.tar.bz2 scala-710401d8aec814d95b25ca2104036aa414a5db35.zip | |
Revert "Merge pull request #2957 from paulp/pr/parser-improvements"
This reverts commit 884e1ce762d98b29594146d37b85384581d9ba96, reversing
changes made to f6fcc4431f272c707d49de68add532c452dd4b0f.
Diffstat (limited to 'test/files/neg/divergent-implicit.check')
| -rw-r--r-- | test/files/neg/divergent-implicit.check | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/files/neg/divergent-implicit.check b/test/files/neg/divergent-implicit.check index b5c607cf59..5f20df1b91 100644 --- a/test/files/neg/divergent-implicit.check +++ b/test/files/neg/divergent-implicit.check @@ -10,9 +10,9 @@ starting with method cast in object Test1 divergent-implicit.scala:14: error: diverging implicit expansion for type Test2.Baz => Test2.Bar starting with method baz2bar in object Test2 val x: Bar = new Foo - ^ + ^ divergent-implicit.scala:15: error: diverging implicit expansion for type Test2.Foo => Test2.Bar starting with method foo2bar in object Test2 val y: Bar = new Baz - ^ + ^ four errors found |