summaryrefslogtreecommitdiff
path: root/src/library/scala/collection
diff options
context:
space:
mode:
authorEugene Burmako <xeno.by@gmail.com>2012-06-06 09:43:05 +0200
committerEugene Burmako <xeno.by@gmail.com>2012-06-08 15:31:45 +0200
commit252a44864786b6832b9da4c29d1ac9aad48c4291 (patch)
treeaef048d8a210d38f116b8875d99e3c13c703d685 /src/library/scala/collection
parent6bb5975289c5b11cb8c88dd4629286956b5d3d27 (diff)
downloadscala-252a44864786b6832b9da4c29d1ac9aad48c4291.tar.gz
scala-252a44864786b6832b9da4c29d1ac9aad48c4291.tar.bz2
scala-252a44864786b6832b9da4c29d1ac9aad48c4291.zip
ClassTag.erasure => ClassTag.runtimeClass
This change is made to be consistent with JavaMirrors. And, in my opinion, a technology-neutral term is better here.
Diffstat (limited to 'src/library/scala/collection')
-rw-r--r--src/library/scala/collection/mutable/ArrayBuilder.scala4
-rw-r--r--src/library/scala/collection/mutable/WrappedArrayBuilder.scala4
-rw-r--r--src/library/scala/collection/parallel/ParIterableLike.scala2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/library/scala/collection/mutable/ArrayBuilder.scala b/src/library/scala/collection/mutable/ArrayBuilder.scala
index 293e85a97e..ff69778772 100644
--- a/src/library/scala/collection/mutable/ArrayBuilder.scala
+++ b/src/library/scala/collection/mutable/ArrayBuilder.scala
@@ -36,8 +36,8 @@ object ArrayBuilder {
*/
def make[T: ArrayTag](): ArrayBuilder[T] = {
val tag = implicitly[ArrayTag[T]]
- val erasure = ScalaRunTime.arrayElementClass(tag)
- erasure match {
+ val runtimeClass = ScalaRunTime.arrayElementClass(tag)
+ runtimeClass match {
case java.lang.Byte.TYPE => new ArrayBuilder.ofByte().asInstanceOf[ArrayBuilder[T]]
case java.lang.Short.TYPE => new ArrayBuilder.ofShort().asInstanceOf[ArrayBuilder[T]]
case java.lang.Character.TYPE => new ArrayBuilder.ofChar().asInstanceOf[ArrayBuilder[T]]
diff --git a/src/library/scala/collection/mutable/WrappedArrayBuilder.scala b/src/library/scala/collection/mutable/WrappedArrayBuilder.scala
index 99a0b0ede3..abd46500fa 100644
--- a/src/library/scala/collection/mutable/WrappedArrayBuilder.scala
+++ b/src/library/scala/collection/mutable/WrappedArrayBuilder.scala
@@ -32,8 +32,8 @@ class WrappedArrayBuilder[A](tag: ArrayTag[A]) extends Builder[A, WrappedArray[A
private var size: Int = 0
private def mkArray(size: Int): WrappedArray[A] = {
- val erasure = arrayElementClass(tag)
- val newelems = erasure match {
+ val runtimeClass = arrayElementClass(tag)
+ val newelems = runtimeClass match {
case java.lang.Byte.TYPE => new WrappedArray.ofByte(new Array[Byte](size)).asInstanceOf[WrappedArray[A]]
case java.lang.Short.TYPE => new WrappedArray.ofShort(new Array[Short](size)).asInstanceOf[WrappedArray[A]]
case java.lang.Character.TYPE => new WrappedArray.ofChar(new Array[Char](size)).asInstanceOf[WrappedArray[A]]
diff --git a/src/library/scala/collection/parallel/ParIterableLike.scala b/src/library/scala/collection/parallel/ParIterableLike.scala
index 321f259f5d..c1d0e9c3a6 100644
--- a/src/library/scala/collection/parallel/ParIterableLike.scala
+++ b/src/library/scala/collection/parallel/ParIterableLike.scala
@@ -303,7 +303,7 @@ self: ParIterableLike[T, Repr, Sequential] =>
protected implicit def builder2ops[Elem, To](cb: Builder[Elem, To]) = new BuilderOps[Elem, To] {
def ifIs[Cmb](isbody: Cmb => Unit) = new Otherwise[Cmb] {
def otherwise(notbody: => Unit)(implicit t: ClassTag[Cmb]) {
- if (cb.getClass == t.erasure) isbody(cb.asInstanceOf[Cmb]) else notbody
+ if (cb.getClass == t.runtimeClass) isbody(cb.asInstanceOf[Cmb]) else notbody
}
}
def isCombiner = cb.isInstanceOf[Combiner[_, _]]