closed #2624: instantiate type params after eta...

closed #2624: instantiate type params after eta expansion of polymorphic
method does not blow the stack on pos/t0674 (previous private fix did
typed(tree); instantiate(tree) instead of instantiate(typed(tree)))

fixed check file for neg/bug608 -- got better error message

1 files changed, 12 insertions, 12 deletions

diff --git a/test/files/neg/bug608.scala b/test/files/neg/bug608.scala
index 24f515651a..34dc4c0352 100644
--- a/test/files/neg/bug608.scala
+++ b/test/files/neg/bug608.scala
@@ -1,17 +1,17 @@
 trait CrashDueToTypeError {
-	def id[a](x :a) :a = x
+  def id[a](x :a) :a = x
 
-	trait Bifunctor {
-		type a; //	 content
-		type s <: Bifunctor
+  trait Bifunctor {
+    type a; //   content
+    type s <: Bifunctor
 
-		// uncomment        this-vvvvvvvvvvvvvvvvvvvvvvvvvvvv, and it compiles
-		def bimap[c](f :a=>c) :s{/*type s=Bifunctor.this.s;*/type a=c; }
-	}
+    // uncomment        this-vvvvvvvvvvvvvvvvvvvvvvvvvvvv, and it compiles
+    def bimap[c](f :a=>c) :s{/*type s=Bifunctor.this.s;*/type a=c; }
+  }
 
-	def hylo[hs <: Bifunctor,ha,hb,hc]
-	    (f :hb=>hs{type s=hs; type a=ha},
-	     g :hs{type s=hs; type a=ha}=>hc)(x :hb)
-	     :hc
-	     = g(f(x).bimap(id))
+  def hylo[hs <: Bifunctor,ha,hb,hc]
+      (f :hb=>hs{type s=hs; type a=ha},
+       g :hs{type s=hs; type a=ha}=>hc)(x :hb)
+       :hc
+       = g(f(x).bimap(id))
 }