diff options
Diffstat (limited to 'src/library')
| -rw-r--r-- | src/library/scala/Array.scala | 7 | ||||
| -rw-r--r-- | src/library/scala/collection/mutable/LinkedHashMap.scala | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/src/library/scala/Array.scala b/src/library/scala/Array.scala index b72bdb01e7..7f42ada4b1 100644 --- a/src/library/scala/Array.scala +++ b/src/library/scala/Array.scala @@ -171,13 +171,6 @@ object Array extends SequenceFactory[Array] { def ofDim[A](n1: Int, n2: Int, n3: Int, n4: Int, n5: Int): Array[Array[Array[Array[Array[A]]]]] = tabulate(n1)(_ => ofDim[A](n2, n3, n4, n5)) - /** Create array with given dimensions */ - @deprecated("use `ofDim' instead") def withDims[A](n1: Int): Array[A] = ofDim(n1) - @deprecated("use `ofDim' instead") def withDims[A](n1: Int, n2: Int): Array[Array[A]] = ofDim(n1, n2) - @deprecated("use `ofDim' instead") def withDims[A](n1: Int, n2: Int, n3: Int): Array[Array[Array[A]]] = ofDim(n1, n2, n3) - @deprecated("use `ofDim' instead") def withDims[A](n1: Int, n2: Int, n3: Int, n4: Int): Array[Array[Array[Array[A]]]] = ofDim(n1, n2, n3, n4) - @deprecated("use `ofDim' instead") def withDims[A](n1: Int, n2: Int, n3: Int, n4: Int, n5: Int): Array[Array[Array[Array[Array[A]]]]] = ofDim(n1, n2, n3, n4, n5) - /** Create an array containing several copies of an element. * * @param n the length of the resulting array diff --git a/src/library/scala/collection/mutable/LinkedHashMap.scala b/src/library/scala/collection/mutable/LinkedHashMap.scala index fb19a7e84e..4a64b9e8ce 100644 --- a/src/library/scala/collection/mutable/LinkedHashMap.scala +++ b/src/library/scala/collection/mutable/LinkedHashMap.scala @@ -94,7 +94,7 @@ class LinkedHashMap[A, B] extends Map[A, B] override def valuesIterator: Iterator[B] = new Iterator[B] { private var cur = firstEntry def hasNext = cur ne null - def next = { val res = cur.value; cur = cur.later; res } + def next = if (hasNext) { val res = cur.value; cur = cur.later; res } else Iterator.empty.next } |