diff options
author | James Iry <jamesiry@gmail.com> | 2013-02-06 13:42:47 -0800 |
---|---|---|
committer | James Iry <jamesiry@gmail.com> | 2013-02-06 13:42:47 -0800 |
commit | db02585dafdc509de289177826df2eed8eb38326 (patch) | |
tree | 5a17155fbb54aee35b6a60009277543c75556ea9 | |
parent | b99af13e7046d4270e0826d63c1b6cca9f41722f (diff) | |
parent | 015ff514e18bdcd016f7175202286ac4c0d42831 (diff) | |
download | scala-db02585dafdc509de289177826df2eed8eb38326.tar.gz scala-db02585dafdc509de289177826df2eed8eb38326.tar.bz2 scala-db02585dafdc509de289177826df2eed8eb38326.zip |
Merge pull request #2080 from JamesIry/2.10.x_SI-5017
[nomaster] Revert "SI-5017 Poor performance of :+ operator on Arrays"
-rw-r--r-- | src/library/scala/collection/mutable/ArrayOps.scala | 14 | ||||
-rw-r--r-- | test/files/run/array-addition.check | 4 | ||||
-rw-r--r-- | test/files/run/array-addition.scala | 11 |
3 files changed, 0 insertions, 29 deletions
diff --git a/src/library/scala/collection/mutable/ArrayOps.scala b/src/library/scala/collection/mutable/ArrayOps.scala index 6b778b26f5..bb938a7aeb 100644 --- a/src/library/scala/collection/mutable/ArrayOps.scala +++ b/src/library/scala/collection/mutable/ArrayOps.scala @@ -52,20 +52,6 @@ trait ArrayOps[T] extends Any with ArrayLike[T, Array[T]] with CustomParalleliza super.toArray[U] } - def :+[B >: T: scala.reflect.ClassTag](elem: B): Array[B] = { - val result = Array.ofDim[B](repr.length + 1) - Array.copy(repr, 0, result, 0, repr.length) - result(repr.length) = elem - result - } - - def +:[B >: T: scala.reflect.ClassTag](elem: B): Array[B] = { - val result = Array.ofDim[B](repr.length + 1) - result(0) = elem - Array.copy(repr, 0, result, 1, repr.length) - result - } - override def par = ParArray.handoff(repr) /** Flattens a two-dimensional array by concatenating all its rows diff --git a/test/files/run/array-addition.check b/test/files/run/array-addition.check deleted file mode 100644 index 7bfbd9c711..0000000000 --- a/test/files/run/array-addition.check +++ /dev/null @@ -1,4 +0,0 @@ -Array(1, 2, 3, 4) -Array(1, 2, 3, 4) -Array(1) -Array(1) diff --git a/test/files/run/array-addition.scala b/test/files/run/array-addition.scala deleted file mode 100644 index 8def48e85c..0000000000 --- a/test/files/run/array-addition.scala +++ /dev/null @@ -1,11 +0,0 @@ -object Test { - def prettyPrintArray(x: Array[_]) = println("Array(" + x.mkString(", ") + ")") - - def main(args: Array[String]): Unit = { - prettyPrintArray(Array(1,2,3) :+ 4) - prettyPrintArray(1 +: Array(2,3,4)) - prettyPrintArray(Array() :+ 1) - prettyPrintArray(1 +: Array()) - } -} - |