Several renamings not included. no review

3 files changed, 9 insertions, 9 deletions

diff --git a/src/library/scala/collection/immutable/HashMap.scala b/src/library/scala/collection/immutable/HashMap.scala
index f40905428e..c59fdc7e07 100644
--- a/src/library/scala/collection/immutable/HashMap.scala
+++ b/src/library/scala/collection/immutable/HashMap.scala
@@ -15,7 +15,7 @@ import generic._
 import annotation.unchecked.uncheckedVariance
 
 
-import parallel.immutable.ParallelHashTrie
+import parallel.immutable.ParHashTrie
 
 
 /** This class implements immutable maps using a hash trie.
@@ -36,7 +36,7 @@ import parallel.immutable.ParallelHashTrie
  *  @define willNotTerminateInf
  */
 @serializable @SerialVersionUID(2L)
-class HashMap[A, +B] extends Map[A,B] with MapLike[A, B, HashMap[A, B]] with Parallelizable[ParallelHashTrie[A, B]] {
+class HashMap[A, +B] extends Map[A,B] with MapLike[A, B, HashMap[A, B]] with Parallelizable[ParHashTrie[A, B]] {
 
   override def size: Int = 0
 
@@ -88,7 +88,7 @@ class HashMap[A, +B] extends Map[A,B] with MapLike[A, B, HashMap[A, B]] with Par
 
   protected def merge0[B1 >: B](that: HashMap[A, B1], level: Int): HashMap[A, B1] = that
 
-  def par = ParallelHashTrie.fromTrie(this)
+  def par = ParHashTrie.fromTrie(this)
 
 }
 
diff --git a/src/library/scala/collection/mutable/ArrayBuffer.scala b/src/library/scala/collection/mutable/ArrayBuffer.scala
index a59a0db2e1..46e9e80481 100644
--- a/src/library/scala/collection/mutable/ArrayBuffer.scala
+++ b/src/library/scala/collection/mutable/ArrayBuffer.scala
@@ -12,7 +12,7 @@ package scala.collection
 package mutable
 
 import generic._
-import parallel.mutable.ParallelArray
+import parallel.mutable.ParArray
 
 /** An implementation of the `Buffer` class using an array to
  *  represent the assembled sequence internally. Append, update and random
@@ -48,7 +48,7 @@ class ArrayBuffer[A](override protected val initialSize: Int)
      with IndexedSeqOptimized[A, ArrayBuffer[A]]
      with Builder[A, ArrayBuffer[A]]
      with ResizableArray[A]
-     with Parallelizable[ParallelArray[A]] {
+     with Parallelizable[ParArray[A]] {
 
   override def companion: GenericCompanion[ArrayBuffer] = ArrayBuffer
 
@@ -66,7 +66,7 @@ class ArrayBuffer[A](override protected val initialSize: Int)
     }
   }
 
-  def par = ParallelArray.handoff[A](array.asInstanceOf[Array[A]], size)
+  def par = ParArray.handoff[A](array.asInstanceOf[Array[A]], size)
 
   /** Appends a single element to this buffer and returns
    *  the identity of the buffer. It takes constant amortized time.
diff --git a/src/library/scala/collection/mutable/ArrayOps.scala b/src/library/scala/collection/mutable/ArrayOps.scala
index 3cf6a642d2..98d635ecee 100644
--- a/src/library/scala/collection/mutable/ArrayOps.scala
+++ b/src/library/scala/collection/mutable/ArrayOps.scala
@@ -14,7 +14,7 @@ import compat.Platform.arraycopy
 
 import scala.reflect.ClassManifest
 
-import parallel.mutable.ParallelArray
+import parallel.mutable.ParArray
 
 
 /** This class serves as a wrapper for `Array`s with all the operations found in
@@ -35,7 +35,7 @@ import parallel.mutable.ParallelArray
  *  @define mayNotTerminateInf
  *  @define willNotTerminateInf
  */
-abstract class ArrayOps[T] extends ArrayLike[T, Array[T]] with Parallelizable[ParallelArray[T]] {
+abstract class ArrayOps[T] extends ArrayLike[T, Array[T]] with Parallelizable[ParArray[T]] {
 
   private def rowBuilder[U]: Builder[U, Array[U]] =
     Array.newBuilder(
@@ -55,7 +55,7 @@ abstract class ArrayOps[T] extends ArrayLike[T, Array[T]] with Parallelizable[Pa
     else
       super.toArray[U]
 
-  def par = ParallelArray.handoff(repr)
+  def par = ParArray.handoff(repr)
 
   /** Flattens a two-dimensional array by concatenating all its rows
    *  into a single array.