Skip to content

Commit cd217b8

Browse files
committed
Merge remote-tracking branch 'origin/2.12.x' into perf-backport/omnibus-first-pr
2 parents 43c64cd + 8a07944 commit cd217b8

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

library/src/scala/Array.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ object Array extends FallbackArrayBuilding {
482482
*
483483
* @author Martin Odersky
484484
* @since 1.0
485-
* @see [[http://www.scala-lang.org/files/archive/spec/2.11/ Scala Language Specification]], for in-depth information on the transformations the Scala compiler makes on Arrays (Sections 6.6 and 6.15 respectively.)
485+
* @see [[http://www.scala-lang.org/files/archive/spec/2.12/ Scala Language Specification]], for in-depth information on the transformations the Scala compiler makes on Arrays (Sections 6.6 and 6.15 respectively.)
486486
* @see [[http://docs.scala-lang.org/sips/completed/scala-2-8-arrays.html "Scala 2.8 Arrays"]] the Scala Improvement Document detailing arrays since Scala 2.8.
487487
* @see [[http://docs.scala-lang.org/overviews/collections/arrays.html "The Scala 2.8 Collections' API"]] section on `Array` by Martin Odersky for more information.
488488
* @hideImplicitConversion scala.Predef.booleanArrayOps

library/src/scala/UninitializedError.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,6 @@ package scala
1515
* @author Martin Odersky
1616
* @since 2.5
1717
*/
18+
// TODO: remove in 2.14
19+
@deprecated("will be removed in a future release", since = "2.12.7")
1820
final class UninitializedError extends RuntimeException("uninitialized value")

library/src/scala/collection/mutable/WrappedArray.scala

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,6 @@ object WrappedArray {
129129
def apply(index: Int): T = array(index).asInstanceOf[T]
130130
def update(index: Int, elem: T) { array(index) = elem }
131131
override def hashCode = MurmurHash3.wrappedArrayHash(array)
132-
override def equals(that: Any) = that match {
133-
case that: ofRef[_] => Arrays.equals(array.asInstanceOf[Array[AnyRef]], that.array.asInstanceOf[Array[AnyRef]])
134-
case _ => super.equals(that)
135-
}
136132
}
137133

138134
final class ofByte(val array: Array[Byte]) extends WrappedArray[Byte] with Serializable {

0 commit comments

Comments
 (0)