Merge remote-tracking branch 'scala/master' into merge-2.10.x

8 files changed, 20 insertions, 18 deletions

diff --git a/test/files/run/existentials3-new.check b/test/files/run/existentials3-new.check
index c0233d2267..7f02866a29 100644
--- a/test/files/run/existentials3-new.check
+++ b/test/files/run/existentials3-new.check
@@ -1,8 +1,8 @@
 Bar.type, t=TypeRef, s=type Bar.type
 Bar, t=TypeRef, s=type Bar
-Test.ToS, t=RefinedType, s=f3
-Test.ToS, t=RefinedType, s=f4
-Test.ToS, t=RefinedType, s=f5
+Test.ToS, t=RefinedType, s=<refinement of Test.ToS>
+Test.ToS, t=RefinedType, s=<refinement of Test.ToS>
+Test.ToS, t=RefinedType, s=<refinement of Test.ToS>
 () => Test.ToS, t=TypeRef, s=trait Function0
 () => Test.ToS, t=TypeRef, s=trait Function0
 $anon, t=TypeRef, s=type $anon
@@ -12,9 +12,9 @@ List[Seq[Int]], t=TypeRef, s=class List
 List[Seq[U forSome { type U <: Int }]], t=TypeRef, s=class List
 Bar.type, t=TypeRef, s=type Bar.type
 Bar, t=TypeRef, s=type Bar
-Test.ToS, t=RefinedType, s=g3 
-Test.ToS, t=RefinedType, s=g4 
-Test.ToS, t=RefinedType, s=g5 
+Test.ToS, t=RefinedType, s=<refinement of Test.ToS>
+Test.ToS, t=RefinedType, s=<refinement of Test.ToS>
+Test.ToS, t=RefinedType, s=<refinement of Test.ToS>
 () => Test.ToS, t=TypeRef, s=trait Function0
 () => Test.ToS, t=TypeRef, s=trait Function0
 $anon, t=TypeRef, s=type $anon
diff --git a/test/files/run/macro-term-declared-in-trait.check b/test/files/run/macro-term-declared-in-trait.check
index 0d70ac74f3..0f3756ddb6 100644
--- a/test/files/run/macro-term-declared-in-trait.check
+++ b/test/files/run/macro-term-declared-in-trait.check
@@ -1,6 +1,6 @@
 prefix = Expr[Nothing]({
   final class $anon extends AnyRef with Base {
-    def <init>(): anonymous class $anon = {
+    def <init>(): <$anon: Base> = {
       $anon.super.<init>();
       ()
     };
diff --git a/test/files/run/t5256g.check b/test/files/run/t5256g.check
index c9c8d6e63d..cef3a413c2 100644
--- a/test/files/run/t5256g.check
+++ b/test/files/run/t5256g.check
@@ -1,3 +1,5 @@
-anonymous class $anon$1
+$anon
 Test.$anon$1
-A with B{def <init>(): A with B}
+A with B {
+  def <init>(): A with B
+}
diff --git a/test/files/run/t5256h.check b/test/files/run/t5256h.check
index 1b23a71a4c..1a4a92a684 100644
--- a/test/files/run/t5256h.check
+++ b/test/files/run/t5256h.check
@@ -1,4 +1,4 @@
-anonymous class $anon$1
+$anon
 Test.$anon$1
 java.lang.Object {
   final private val x: Int
diff --git a/test/files/run/t6028.check b/test/files/run/t6028.check
index 46974589d3..b37bf51d73 100644
--- a/test/files/run/t6028.check
+++ b/test/files/run/t6028.check
@@ -11,7 +11,7 @@ package <empty> {
     def foo(methodParam: Int): Function0 = {
       val methodLocal: Int = 0;
       {
-        (new anonymous class $anonfun$foo$1(T.this, methodParam, methodLocal): Function0)
+        (new <$anon: Function0>(T.this, methodParam, methodLocal): Function0)
       }
     };
     def bar(barParam: Int): Object = {
@@ -21,11 +21,11 @@ package <empty> {
     def tryy(tryyParam: Int): Function0 = {
       var tryyLocal: runtime.IntRef = scala.runtime.IntRef.create(0);
       {
-        (new anonymous class $anonfun$tryy$1(T.this, tryyParam, tryyLocal): Function0)
+        (new <$anon: Function0>(T.this, tryyParam, tryyLocal): Function0)
       }
     };
     @SerialVersionUID(0) final <synthetic> class $anonfun$foo$1 extends runtime.AbstractFunction0$mcI$sp with Serializable {
-      def <init>($outer: T, methodParam$1: Int, methodLocal$1: Int): anonymous class $anonfun$foo$1 = {
+      def <init>($outer: T, methodParam$1: Int, methodLocal$1: Int): <$anon: Function0> = {
         $anonfun$foo$1.super.<init>();
         ()
       };
@@ -61,7 +61,7 @@ package <empty> {
       scala.this.Predef.print(scala.Int.box(barParam$1))
     };
     @SerialVersionUID(0) final <synthetic> class $anonfun$tryy$1 extends runtime.AbstractFunction0$mcV$sp with Serializable {
-      def <init>($outer: T, tryyParam$1: Int, tryyLocal$1: runtime.IntRef): anonymous class $anonfun$tryy$1 = {
+      def <init>($outer: T, tryyParam$1: Int, tryyLocal$1: runtime.IntRef): <$anon: Function0> = {
         $anonfun$tryy$1.super.<init>();
         ()
       };
diff --git a/test/files/run/t6555.check b/test/files/run/t6555.check
index a18a8e8023..9ac115a13f 100644
--- a/test/files/run/t6555.check
+++ b/test/files/run/t6555.check
@@ -7,14 +7,14 @@ package <empty> {
     };
     private[this] val f: Int => Int = {
       @SerialVersionUID(0) final <synthetic> class $anonfun extends scala.runtime.AbstractFunction1$mcII$sp with Serializable {
-        def <init>(): anonymous class $anonfun = {
+        def <init>(): <$anon: Int => Int> = {
           $anonfun.super.<init>();
           ()
         };
         final def apply(param: Int): Int = $anonfun.this.apply$mcII$sp(param);
         <specialized> def apply$mcII$sp(param: Int): Int = param
       };
-      (new anonymous class $anonfun(): Int => Int)
+      (new <$anon: Int => Int>(): Int => Int)
     };
     <stable> <accessor> def f(): Int => Int = Foo.this.f
   }
diff --git a/test/files/run/toolbox_typecheck_macrosdisabled.check b/test/files/run/toolbox_typecheck_macrosdisabled.check
index 688f37927c..3de296f1ad 100644
--- a/test/files/run/toolbox_typecheck_macrosdisabled.check
+++ b/test/files/run/toolbox_typecheck_macrosdisabled.check
@@ -2,7 +2,7 @@
   val $u: ru.type = ru;
   val $m: $u.Mirror = ru.runtimeMirror({
   final class $anon extends scala.AnyRef {
-    def <init>(): anonymous class $anon = {
+    def <init>(): <$anon: AnyRef> = {
       $anon.super.<init>();
       ()
     };
diff --git a/test/files/run/toolbox_typecheck_macrosdisabled2.check b/test/files/run/toolbox_typecheck_macrosdisabled2.check
index bdcdb421fd..9810946024 100644
--- a/test/files/run/toolbox_typecheck_macrosdisabled2.check
+++ b/test/files/run/toolbox_typecheck_macrosdisabled2.check
@@ -2,7 +2,7 @@
   val $u: ru.type = ru;
   val $m: $u.Mirror = ru.runtimeMirror({
   final class $anon extends scala.AnyRef {
-    def <init>(): anonymous class $anon = {
+    def <init>(): <$anon: AnyRef> = {
       $anon.super.<init>();
       ()
     };