Merge v2.10.1-326-g4f8c306' into merge/v2.10.1-326-g4f8c306-to-master

    ================================================================

    Merge commit 'v2.10.1-326-g4f8c306' into merge/v2.10.1-326-g4f8c306-to-master

    Conflicts:
        src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala
        src/reflect/scala/reflect/runtime/JavaMirrors.scala

    ================================================================

    Merge -s ours 4e64a27 ([nomaster commit range])

    ================================================================

    Merge commit '0ae7e55' into merge/v2.10.1-326-g4f8c306-to-master

    Conflicts:
        src/compiler/scala/tools/nsc/typechecker/Macros.scala

1 files changed, 34 insertions, 14 deletions

diff --git a/test/files/neg/t3224.scala b/test/files/neg/t3224.scala
index 774de3335a..b7af8a67b5 100755
--- a/test/files/neg/t3224.scala
+++ b/test/files/neg/t3224.scala
@@ -1,30 +1,50 @@
 object Texts{
-  def textL[T](list: List[T]) = {     
-    list match{                        
-      case List() => "Empty"              
-      case List(_) => "One"      
+  def textL[T](list: List[T]) = {
+    list match{
+      case List() => "Empty"
+      case List(_) => "One"
       case List(_*) => "Many"
     }
   }
 
-  def textA[T](array: Array[T]) = {     
-    array match{                        
-      case Array() => "Empty"              
-      case Array(_) => "One"      
+  def textA[T](array: Array[T]) = {
+    array match{
+      case Array() => "Empty"
+      case Array(_) => "One"
       case Array(_*) => "Many"
     }
   }
 }
 
 object Test extends App {
+  {
+    implicit def array2list[T](array: Array[T]) = {
+      println(array.toList.size)
+      array.toList
+    }
+
+    println(Texts textL List())
+    println(Texts textL List(1))
+    println(Texts textL List(1, 1));
+
+    println(Texts textL Array())
+    println(Texts textL Array(1))
+    println(Texts textL Array(1, 1))
 
-  implicit def array2list[T](array: Array[T]) = {
-    println(array.toList.size)
-    array.toList
+    println(Texts textA List())
+    println(Texts textA List(1))
+    println(Texts textA List(1, 1));
+
+    println(Texts textA Array())
+    println(Texts textA Array(1))
+    println(Texts textA Array(1, 1))
   }
 
-  
-  println(Texts textL List()); println(Texts textL List(1)); println(Texts textL List(1, 1));
+  {
+    implicit def array2list[T](array: Array[T]) = array.toList
+    def size[T](list: List[T]) = list.size
 
-  println(Texts textL Array()); println(Texts textL Array(1)); println(Texts textL Array(1, 1))
+    assert(size(array2list(Array())) == 0)
+    assert(size(Array()) == 0)
+  }
 }