Deprecation and convention adherence patrol.

Iterators should have def next(), not def next.  Clearing
a mutable structure should be done with clear(), not clear.
And etc.  No review.

1 files changed, 2 insertions, 23 deletions

diff --git a/src/library/scala/collection/parallel/mutable/ResizableParArrayCombiner.scala b/src/library/scala/collection/parallel/mutable/ResizableParArrayCombiner.scala
index 2cb0f541d8..eadc93d422 100644
--- a/src/library/scala/collection/parallel/mutable/ResizableParArrayCombiner.scala
+++ b/src/library/scala/collection/parallel/mutable/ResizableParArrayCombiner.scala
@@ -8,8 +8,6 @@
 
 package scala.collection.parallel.mutable
 
-
-
 import scala.collection.generic.Sizing
 import scala.collection.mutable.ArraySeq
 import scala.collection.mutable.ArrayBuffer
@@ -18,12 +16,8 @@ import scala.collection.parallel.TaskSupport
 import scala.collection.parallel.unsupportedop
 import scala.collection.parallel.Combiner
 
-
-
 /** An array combiner that uses a chain of arraybuffers to store elements. */
-trait ResizableParArrayCombiner[T]
-extends LazyCombiner[T, ParArray[T], ExposedArrayBuffer[T]]
-{
+trait ResizableParArrayCombiner[T] extends LazyCombiner[T, ParArray[T], ExposedArrayBuffer[T]] {
 //self: EnvironmentPassingCombiner[T, ParArray[T]] =>
   import collection.parallel.tasksupport._
 
@@ -40,8 +34,7 @@ extends LazyCombiner[T, ParArray[T], ExposedArrayBuffer[T]]
 
     new ParArray(arrayseq)
   } else { // optimisation if there is only 1 array
-    val pa = new ParArray(new ExposedArraySeq[T](chain(0).internalArray, size))
-    pa
+    new ParArray(new ExposedArraySeq[T](chain(0).internalArray, size))
   }
 
   override def toString = "ResizableParArrayCombiner(" + size + "): " //+ chain
@@ -88,25 +81,11 @@ extends LazyCombiner[T, ParArray[T], ExposedArrayBuffer[T]]
     }
     def shouldSplitFurther = howmany > collection.parallel.thresholdFromSize(size, parallelismLevel)
   }
-
 }
 
-
 object ResizableParArrayCombiner {
   def apply[T](c: ArrayBuffer[ExposedArrayBuffer[T]]): ResizableParArrayCombiner[T] = {
     new { val chain = c } with ResizableParArrayCombiner[T] // was: with EnvironmentPassingCombiner[T, ParArray[T]]
   }
   def apply[T](): ResizableParArrayCombiner[T] = apply(new ArrayBuffer[ExposedArrayBuffer[T]] += new ExposedArrayBuffer[T])
 }
-
-
-
-
-
-
-
-
-
-
-
-