From 710401d8aec814d95b25ca2104036aa414a5db35 Mon Sep 17 00:00:00 2001 From: François Garillot Date: Tue, 24 Sep 2013 10:21:10 +0200 Subject: Revert "Merge pull request #2957 from paulp/pr/parser-improvements" This reverts commit 884e1ce762d98b29594146d37b85384581d9ba96, reversing changes made to f6fcc4431f272c707d49de68add532c452dd4b0f. --- test/files/neg/divergent-implicit.check | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test/files/neg/divergent-implicit.check') 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 -- cgit v1.2.3