new starr, with some changes to varargs handling.

2 files changed, 42 insertions, 42 deletions

diff --git a/src/library/scala/LowPriorityImplicits.scala b/src/library/scala/LowPriorityImplicits.scala
index afa3eaeb08..ea12c07d63 100644
--- a/src/library/scala/LowPriorityImplicits.scala
+++ b/src/library/scala/LowPriorityImplicits.scala
@@ -20,29 +20,29 @@ import collection.immutable.WrappedString
  */
 class LowPriorityImplicits {
 
-  implicit def genericArrayWrapper[T](xs: Array[T]): WrappedArray[T] = (xs: AnyRef) match { // !!! drop the AnyRef and get unreachable code errors!
-    case x: Array[AnyRef] => arrayWrapper[AnyRef](x).asInstanceOf[WrappedArray[T]]
-    case x: Array[Int] => arrayWrapper(x).asInstanceOf[WrappedArray[T]]
-    case x: Array[Double] => arrayWrapper(x).asInstanceOf[WrappedArray[T]]
-    case x: Array[Long] => arrayWrapper(x).asInstanceOf[WrappedArray[T]]
-    case x: Array[Float] => arrayWrapper(x).asInstanceOf[WrappedArray[T]]
-    case x: Array[Char] => arrayWrapper(x).asInstanceOf[WrappedArray[T]]
-    case x: Array[Byte] => arrayWrapper(x).asInstanceOf[WrappedArray[T]]
-    case x: Array[Short] => arrayWrapper(x).asInstanceOf[WrappedArray[T]]
-    case x: Array[Boolean] => arrayWrapper(x).asInstanceOf[WrappedArray[T]]
-    case x: Array[Unit] => arrayWrapper(x).asInstanceOf[WrappedArray[T]]
+  implicit def genericWapArray[T](xs: Array[T]): WrappedArray[T] = (xs: AnyRef) match { // !!! drop the AnyRef and get unreachable code errors!
+    case x: Array[AnyRef] => wrapArray[AnyRef](x).asInstanceOf[WrappedArray[T]]
+    case x: Array[Int] => wrapArray(x).asInstanceOf[WrappedArray[T]]
+    case x: Array[Double] => wrapArray(x).asInstanceOf[WrappedArray[T]]
+    case x: Array[Long] => wrapArray(x).asInstanceOf[WrappedArray[T]]
+    case x: Array[Float] => wrapArray(x).asInstanceOf[WrappedArray[T]]
+    case x: Array[Char] => wrapArray(x).asInstanceOf[WrappedArray[T]]
+    case x: Array[Byte] => wrapArray(x).asInstanceOf[WrappedArray[T]]
+    case x: Array[Short] => wrapArray(x).asInstanceOf[WrappedArray[T]]
+    case x: Array[Boolean] => wrapArray(x).asInstanceOf[WrappedArray[T]]
+    case x: Array[Unit] => wrapArray(x).asInstanceOf[WrappedArray[T]]
   }
 
-  implicit def arrayWrapper[T <: AnyRef](xs: Array[T]): WrappedArray[T] = new WrappedArray.ofRef[T](xs.asInstanceOf[Array[AnyRef]])
-  implicit def arrayWrapper(xs: Array[Int]): WrappedArray[Int] = new WrappedArray.ofInt(xs)
-  implicit def arrayWrapper(xs: Array[Double]): WrappedArray[Double] = new WrappedArray.ofDouble(xs)
-  implicit def arrayWrapper(xs: Array[Long]): WrappedArray[Long] = new WrappedArray.ofLong(xs)
-  implicit def arrayWrapper(xs: Array[Float]): WrappedArray[Float] = new WrappedArray.ofFloat(xs)
-  implicit def arrayWrapper(xs: Array[Char]): WrappedArray[Char] = new WrappedArray.ofChar(xs)
-  implicit def arrayWrapper(xs: Array[Byte]): WrappedArray[Byte] = new WrappedArray.ofByte(xs)
-  implicit def arrayWrapper(xs: Array[Short]): WrappedArray[Short] = new WrappedArray.ofShort(xs)
-  implicit def arrayWrapper(xs: Array[Boolean]): WrappedArray[Boolean] = new WrappedArray.ofBoolean(xs)
-  implicit def arrayWrapper(xs: Array[Unit]): WrappedArray[Unit] = new WrappedArray.ofUnit(xs)
+  implicit def wrapArray[T <: AnyRef](xs: Array[T]): WrappedArray[T] = new WrappedArray.ofRef[T](xs.asInstanceOf[Array[AnyRef]])
+  implicit def wrapArray(xs: Array[Int]): WrappedArray[Int] = new WrappedArray.ofInt(xs)
+  implicit def wrapArray(xs: Array[Double]): WrappedArray[Double] = new WrappedArray.ofDouble(xs)
+  implicit def wrapArray(xs: Array[Long]): WrappedArray[Long] = new WrappedArray.ofLong(xs)
+  implicit def wrapArray(xs: Array[Float]): WrappedArray[Float] = new WrappedArray.ofFloat(xs)
+  implicit def wrapArray(xs: Array[Char]): WrappedArray[Char] = new WrappedArray.ofChar(xs)
+  implicit def wrapArray(xs: Array[Byte]): WrappedArray[Byte] = new WrappedArray.ofByte(xs)
+  implicit def wrapArray(xs: Array[Short]): WrappedArray[Short] = new WrappedArray.ofShort(xs)
+  implicit def wrapArray(xs: Array[Boolean]): WrappedArray[Boolean] = new WrappedArray.ofBoolean(xs)
+  implicit def wrapArray(xs: Array[Unit]): WrappedArray[Unit] = new WrappedArray.ofUnit(xs)
 
   implicit def wrapString(s: String): WrappedString = new WrappedString(s)
   implicit def unwrapString(ws: WrappedString): String = ws.self
diff --git a/src/library/scala/Predef.scala b/src/library/scala/Predef.scala
index 35c67e061c..1412fbc924 100644
--- a/src/library/scala/Predef.scala
+++ b/src/library/scala/Predef.scala
@@ -218,29 +218,29 @@ object Predef extends LowPriorityImplicits {
 
   implicit def any2stringadd(x: Any) = new runtime.StringAdd(x)
 
-  implicit def genericAugmentArray[T](xs: Array[T]): ArrayOps[T] = (xs: AnyRef) match { // !!! drop the AnyRef and get unreachable code errors!
-    case x: Array[AnyRef] => augmentArray[AnyRef](x).asInstanceOf[ArrayOps[T]]
-    case x: Array[Int] => augmentArray(x).asInstanceOf[ArrayOps[T]]
-    case x: Array[Double] => augmentArray(x).asInstanceOf[ArrayOps[T]]
-    case x: Array[Long] => augmentArray(x).asInstanceOf[ArrayOps[T]]
-    case x: Array[Float] => augmentArray(x).asInstanceOf[ArrayOps[T]]
-    case x: Array[Char] => augmentArray(x).asInstanceOf[ArrayOps[T]]
-    case x: Array[Byte] => augmentArray(x).asInstanceOf[ArrayOps[T]]
-    case x: Array[Short] => augmentArray(x).asInstanceOf[ArrayOps[T]]
-    case x: Array[Boolean] => augmentArray(x).asInstanceOf[ArrayOps[T]]
-    case x: Array[Unit] => augmentArray(x).asInstanceOf[ArrayOps[T]]
+  implicit def genericArrayOps[T](xs: Array[T]): ArrayOps[T] = (xs: AnyRef) match { // !!! drop the AnyRef and get unreachable code errors!
+    case x: Array[AnyRef] => arrayOps[AnyRef](x).asInstanceOf[ArrayOps[T]]
+    case x: Array[Int] => arrayOps(x).asInstanceOf[ArrayOps[T]]
+    case x: Array[Double] => arrayOps(x).asInstanceOf[ArrayOps[T]]
+    case x: Array[Long] => arrayOps(x).asInstanceOf[ArrayOps[T]]
+    case x: Array[Float] => arrayOps(x).asInstanceOf[ArrayOps[T]]
+    case x: Array[Char] => arrayOps(x).asInstanceOf[ArrayOps[T]]
+    case x: Array[Byte] => arrayOps(x).asInstanceOf[ArrayOps[T]]
+    case x: Array[Short] => arrayOps(x).asInstanceOf[ArrayOps[T]]
+    case x: Array[Boolean] => arrayOps(x).asInstanceOf[ArrayOps[T]]
+    case x: Array[Unit] => arrayOps(x).asInstanceOf[ArrayOps[T]]
   }
 
-  implicit def augmentArray[T <: AnyRef](xs: Array[T]): ArrayOps[T] = new ArrayOps.ofRef[T](xs.asInstanceOf[Array[AnyRef]])
-  implicit def augmentArray(xs: Array[Int]): ArrayOps[Int] = new ArrayOps.ofInt(xs)
-  implicit def augmentArray(xs: Array[Double]): ArrayOps[Double] = new ArrayOps.ofDouble(xs)
-  implicit def augmentArray(xs: Array[Long]): ArrayOps[Long] = new ArrayOps.ofLong(xs)
-  implicit def augmentArray(xs: Array[Float]): ArrayOps[Float] = new ArrayOps.ofFloat(xs)
-  implicit def augmentArray(xs: Array[Char]): ArrayOps[Char] = new ArrayOps.ofChar(xs)
-  implicit def augmentArray(xs: Array[Byte]): ArrayOps[Byte] = new ArrayOps.ofByte(xs)
-  implicit def augmentArray(xs: Array[Short]): ArrayOps[Short] = new ArrayOps.ofShort(xs)
-  implicit def augmentArray(xs: Array[Boolean]): ArrayOps[Boolean] = new ArrayOps.ofBoolean(xs)
-  implicit def augmentArray(xs: Array[Unit]): ArrayOps[Unit] = new ArrayOps.ofUnit(xs)
+  implicit def arrayOps[T <: AnyRef](xs: Array[T]): ArrayOps[T] = new ArrayOps.ofRef[T](xs.asInstanceOf[Array[AnyRef]])
+  implicit def arrayOps(xs: Array[Int]): ArrayOps[Int] = new ArrayOps.ofInt(xs)
+  implicit def arrayOps(xs: Array[Double]): ArrayOps[Double] = new ArrayOps.ofDouble(xs)
+  implicit def arrayOps(xs: Array[Long]): ArrayOps[Long] = new ArrayOps.ofLong(xs)
+  implicit def arrayOps(xs: Array[Float]): ArrayOps[Float] = new ArrayOps.ofFloat(xs)
+  implicit def arrayOps(xs: Array[Char]): ArrayOps[Char] = new ArrayOps.ofChar(xs)
+  implicit def arrayOps(xs: Array[Byte]): ArrayOps[Byte] = new ArrayOps.ofByte(xs)
+  implicit def arrayOps(xs: Array[Short]): ArrayOps[Short] = new ArrayOps.ofShort(xs)
+  implicit def arrayOps(xs: Array[Boolean]): ArrayOps[Boolean] = new ArrayOps.ofBoolean(xs)
+  implicit def arrayOps(xs: Array[Unit]): ArrayOps[Unit] = new ArrayOps.ofUnit(xs)
 
   implicit def exceptionWrapper(exc: Throwable) = new runtime.RichException(exc)