diff options
author | Paul Phillips <paulp@improving.org> | 2011-05-01 05:10:58 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2011-05-01 05:10:58 +0000 |
commit | 269ea9ab579f0e7ff14df31caa0981627f051958 (patch) | |
tree | 962682a6522e59ee96fb66724d4a48cf24069868 /src/library | |
parent | a02b2daa2a46661a3c108d26c738b4dbb836ea4d (diff) | |
download | scala-269ea9ab579f0e7ff14df31caa0981627f051958.tar.gz scala-269ea9ab579f0e7ff14df31caa0981627f051958.tar.bz2 scala-269ea9ab579f0e7ff14df31caa0981627f051958.zip |
Since I don't want to commit anything "interest...
Since I don't want to commit anything "interesting" until we ship 2.9, a
few uninteresting cleanups involving how types are printed, getting some
debugging code in shape to prepare for the long winter ahead, etc. No
review.
Diffstat (limited to 'src/library')
-rw-r--r-- | src/library/scala/collection/immutable/Range.scala | 2 | ||||
-rw-r--r-- | src/library/scala/collection/immutable/TrieIterator.scala | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/library/scala/collection/immutable/Range.scala b/src/library/scala/collection/immutable/Range.scala index 2b1e4bff13..7bd3764e3e 100644 --- a/src/library/scala/collection/immutable/Range.scala +++ b/src/library/scala/collection/immutable/Range.scala @@ -328,7 +328,7 @@ object Range { def inclusive(start: Int, end: Int, step: Int) = NumericRange.inclusive(start, end, step) } - @deprecated("use Range instead") + @deprecated("use Range instead", "2.9.0") trait ByOne extends Range { @bridge override def foreach[@specialized(Unit) U](f: Int => U) = super.foreach(f) diff --git a/src/library/scala/collection/immutable/TrieIterator.scala b/src/library/scala/collection/immutable/TrieIterator.scala index 088b280b8a..c2cd0b2efd 100644 --- a/src/library/scala/collection/immutable/TrieIterator.scala +++ b/src/library/scala/collection/immutable/TrieIterator.scala @@ -37,8 +37,8 @@ private[collection] abstract class TrieIterator[+T](elems: Array[Iterable[T]]) e private[this] var subIter = initSubIter private[this] def getElems(x: Iterable[T]): Array[Iterable[T]] = (x match { - case x: HashTrieMap[a, b] => x.elems - case x: HashTrieSet[T] => x.elems + case x: HashTrieMap[_, _] => x.elems + case x: HashTrieSet[_] => x.elems }).asInstanceOf[Array[Iterable[T]]] private[this] def collisionToArray(x: Iterable[T]): Array[Iterable[T]] = (x match { |