Moved parallel collections to library dir, chan...

Moved parallel collections to library dir, changed sabbus script. Added
`par` to some of the classes. No review.

2 files changed, 4 insertions, 4 deletions

diff --git a/test/benchmarks/src/scala/collection/parallel/benchmarks/hashtries/Combine.scala b/test/benchmarks/src/scala/collection/parallel/benchmarks/hashtries/Combine.scala
index 16f791a710..3a070fb6ff 100644
--- a/test/benchmarks/src/scala/collection/parallel/benchmarks/hashtries/Combine.scala
+++ b/test/benchmarks/src/scala/collection/parallel/benchmarks/hashtries/Combine.scala
@@ -21,7 +21,7 @@ class Combine(val size: Int, val parallelism: Int, val runWhat: String) extends
   def runpar = throw new UnsupportedOperationException
   def runseq = runhashtrie
   def runhashtrie = {
-    hashtrie combine thattrie
+    hashtrie merge thattrie
     // println
     // println("both tries:         " + HashTrie.bothtries)
     // println("one trie, one item: " + HashTrie.onetrie)
@@ -29,7 +29,7 @@ class Combine(val size: Int, val parallelism: Int, val runWhat: String) extends
     // System exit 1
   }
   def rundestructive = {
-    hashtrie combine thattrie
+    hashtrie merge thattrie
   }
   def runappendtrie = hashtrie ++ thattrie
   def runhashmap = hashmap ++ thatmap
diff --git a/test/benchmarks/src/scala/collection/parallel/benchmarks/hashtries/MultipleCombine.scala b/test/benchmarks/src/scala/collection/parallel/benchmarks/hashtries/MultipleCombine.scala
index a944a7fb39..033c211849 100644
--- a/test/benchmarks/src/scala/collection/parallel/benchmarks/hashtries/MultipleCombine.scala
+++ b/test/benchmarks/src/scala/collection/parallel/benchmarks/hashtries/MultipleCombine.scala
@@ -37,7 +37,7 @@ class MultipleCombine(val size: Int, val parallelism: Int, val runWhat: String)
   def runhashtrie = {
     initHashTrie
     var trie = hashtrie
-    for (r <- 0 until combines) trie = trie combine thattries(r)
+    for (r <- 0 until combines) trie = trie merge thattries(r)
   }
   def runappendtrie = {
     initHashTrie
@@ -52,7 +52,7 @@ class MultipleCombine(val size: Int, val parallelism: Int, val runWhat: String)
   def rundestructive = {
     initHashTrie
     var trie = hashtrie
-    for (r <- 0 until combines) trie = trie combine thattries(r)
+    for (r <- 0 until combines) trie = trie merge thattries(r)
   }
   def companion = MultipleCombine
   def comparisonMap = Map("hashtrie" -> runhashtrie _, "hashmap" -> runhashmap _, "appendtrie" -> runappendtrie _, "destruct" -> rundestructive _)