diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-02-08 15:05:03 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-02-09 18:10:15 -0800 |
| commit | f9550c6ab8b72221ff68bbadcbcc423ebd37f4d5 (patch) | |
| tree | 47fbb515c45922179d6cd4784b1431892bed72bd | |
| parent | af0da51e1bf81c4ea1a28af227179141604f9dfe (diff) | |
| download | scala-f9550c6ab8b72221ff68bbadcbcc423ebd37f4d5.tar.gz scala-f9550c6ab8b72221ff68bbadcbcc423ebd37f4d5.tar.bz2 scala-f9550c6ab8b72221ff68bbadcbcc423ebd37f4d5.zip | |
[nomaster] Revert "Fixes SI-6521, overrides Range#head to be faster"
This reverts commit a557a973608a75c7a02f251bbcf49fe6f6b6655e.
This is necessary to maintain binary compatibility with 2.10.0.
Mima says:
matchName="scala.collection.immutable.Range.head"
problemName=IncompatibleResultTypeProblem
The bridge method appeared because result is now Int, whereas
the super-method's result type erases to Object
| -rw-r--r-- | bincompat-forward.whitelist.conf | 8 | ||||
| -rw-r--r-- | src/library/scala/collection/immutable/Range.scala | 1 |
2 files changed, 4 insertions, 5 deletions
diff --git a/bincompat-forward.whitelist.conf b/bincompat-forward.whitelist.conf index 28c8a33fa2..1ff6cc6012 100644 --- a/bincompat-forward.whitelist.conf +++ b/bincompat-forward.whitelist.conf @@ -21,10 +21,10 @@ filter { problemName=MissingMethodProblem }, # TODO: revert a557a97360: bridge method appeared because result is now Int but the super-method's result type erases to Object - { - matchName="scala.collection.immutable.Range.head" - problemName=IncompatibleResultTypeProblem - }, + # { + # matchName="scala.collection.immutable.Range.head" + # problemName=IncompatibleResultTypeProblem + # }, # TODO: revert 0b92073a38 2aa66bec86: SI-4664 [Make scala.util.Random Serializable] Add test case { matchName="scala.util.Random" diff --git a/src/library/scala/collection/immutable/Range.scala b/src/library/scala/collection/immutable/Range.scala index 02c10700b1..802e16605d 100644 --- a/src/library/scala/collection/immutable/Range.scala +++ b/src/library/scala/collection/immutable/Range.scala @@ -77,7 +77,6 @@ extends scala.collection.AbstractSeq[Int] final val terminalElement = start + numRangeElements * step override def last = if (isEmpty) Nil.last else lastElement - override def head = if (isEmpty) Nil.head else start override def min[A1 >: Int](implicit ord: Ordering[A1]): Int = if (ord eq Ordering.Int) { |