-
Notifications
You must be signed in to change notification settings - Fork 30
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Old code from scala.collection.generic package has been imported from the 2.12.x branch. - Make ParIterableLike extend IterableOnce - Operations that used to take GenIterable collections as parameter now have two overloads, one taking a ParIterable and another taking an Iterable - VectorIterator has been deprecated, which is unfortunate because it is used for implementing ParVector. As a consequence, we now get a deprecation warning when we compile the project - Inline GenTraversableFactory and GenericCompanion from scala/scala - Move the contents that was previously in GenericCompanion into the GenericParCompanion trait - Remove ParallelConsistencyTest, which does not make sense anymore since sequential collection don’t take “generic” collections as parameter. - Move ExposedArraySeq logic to ParArray. - Parallel collections are not anymore comparable with sequential collections. Tests systematically replace `==` with `sameElements`. - Add support for the `to` conversion method in both directions (sequential to parallel and parallel to sequential). `toSeq`, `toIterable`, `toSet` and `toMap` used to be overridden to return parallel collections. I’ve kept that choice (although that makes it impossible to inherit from `IterableOnceOps`, then). - Restore usage of DoublingUnrolledBuffer - Restore FlatHashTable from scala/scala@9008c2f. Systematically use `areEqual` in tests with no strict order. - Implementation of the sequential Set returned by the `seq` member has been copied from scala/scala@056e1e9.
- Loading branch information
Showing
83 changed files
with
4,344 additions
and
1,066 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
package scala.collection | ||
|
||
private[collection] object DebugUtils { | ||
|
||
def buildString(closure: (Any => Unit) => Unit): String = { | ||
val output = new collection.mutable.StringBuilder | ||
closure { any => | ||
output ++= any.toString | ||
output += '\n' | ||
} | ||
|
||
output.result() | ||
} | ||
|
||
def arrayString[T](array: Array[T], from: Int, until: Int): String = { | ||
array.slice(from, until) map ({ | ||
case null => "n/a" | ||
case x => "" + x | ||
}: scala.PartialFunction[T, String]) mkString " | " | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
/* __ *\ | ||
** ________ ___ / / ___ Scala API ** | ||
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL ** | ||
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** | ||
** /____/\___/_/ |_/____/_/ | | ** | ||
** |/ ** | ||
\* */ | ||
|
||
package scala | ||
package collection | ||
|
||
/** A marker trait for collections which have their operations parallelised. | ||
* | ||
* @since 2.9 | ||
* @author Aleksandar Prokopec | ||
*/ | ||
trait Parallel |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.