SI-4763 Deprecated the cloneable annotation

Author: lrytz

src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala

@@ -1322,7 +1322,7 @@ abstract class GenASM extends SubComponent with BytecodeWriters {
         // Additional interface parents based on annotations and other cues
         def newParentForAttr(attr: Symbol): Option[Symbol] = attr match {
           case SerializableAttr => Some(SerializableClass)
-          case CloneableAttr    => Some(JavaCloneableClass)
+          case CloneableAttr    => Some(CloneableClass)
           case RemoteAttr       => Some(RemoteInterfaceClass)
           case _                => None
         }

src/library/scala/Cloneable.scala

@@ -0,0 +1,14 @@
+/*                     __                                               *\
+**     ________ ___   / /  ___     Scala API                            **
+**    / __/ __// _ | / /  / _ |    (c) 2002-2011, LAMP/EPFL             **
+**  __\ \/ /__/ __ |/ /__/ __ |    http://scala-lang.org/               **
+** /____/\___/_/ |_/____/_/ | |                                         **
+**                          |/                                          **
+\*                                                                      */
+
+package scala
+
+/**
+ * Classes extending this trait are cloneable across platforms (Java, .NET).
+ */
+trait Cloneable extends java.lang.Cloneable

src/library/scala/annotation/cloneable.scala

@@ -6,11 +6,10 @@
 **                          |/                                          **
 \*                                                                      */
 
-
-
 package scala.annotation
 
 /**
  * An annotation that designates the class to which it is applied as cloneable
  */
+@deprecated("instead of `@cloneable class C`, use `class C extends Cloneable`", "2.10.0")
 class cloneable extends annotation.StaticAnnotation

src/library/scala/collection/mutable/ArrayStack.scala

@@ -59,7 +59,7 @@ object ArrayStack extends SeqFactory[ArrayStack] {
  *  @define mayNotTerminateInf
  *  @define willNotTerminateInf
  */
-@cloneable @SerialVersionUID(8565219180626620510L)
+@SerialVersionUID(8565219180626620510L)
 class ArrayStack[T] private(private var table : Array[AnyRef],
                             private var index : Int)
 extends AbstractSeq[T]

src/library/scala/collection/mutable/Buffer.scala

@@ -28,10 +28,10 @@ import generic._
  *  @define Coll `Buffer`
  *  @define coll buffer
  */
-@cloneable
 trait Buffer[A] extends Seq[A]
                    with GenericTraversableTemplate[A, Buffer]
-                   with BufferLike[A, Buffer[A]] {
+                   with BufferLike[A, Buffer[A]]
+                   with scala.Cloneable {
   override def companion: GenericCompanion[Buffer] = Buffer
 }
 

src/library/scala/collection/mutable/BufferLike.scala

@@ -58,13 +58,13 @@ import annotation.{migration, bridge}
  *  mutates the collection in place, unlike similar but
  *  undeprecated methods throughout the collections hierarchy.
  */
-@cloneable
 trait BufferLike[A, +This <: BufferLike[A, This] with Buffer[A]]
                 extends Growable[A]
                    with Shrinkable[A]
                    with Scriptable[A]
                    with Subtractable[A, This]
                    with SeqLike[A, This]
+                   with scala.Cloneable
 { self : This =>
 
   // Abstract methods from Seq:

src/library/scala/collection/mutable/Cloneable.scala

@@ -17,9 +17,6 @@ package mutable
  *
  *  @tparam A    Type of the elements contained in the collection, covariant and with reference types as upperbound.
  */
-@cloneable
-trait Cloneable[+A <: AnyRef] {
-  // !!! why doesn't this extend java.lang.Cloneable?
-  //     because neither did @serializable, then we changed it to Serializable
+trait Cloneable[+A <: AnyRef] extends scala.Cloneable {
   override def clone: A = super.clone().asInstanceOf[A]
 }

src/library/scala/collection/mutable/PriorityQueue.scala

@@ -31,7 +31,6 @@ import generic._
  *  @define mayNotTerminateInf
  *  @define willNotTerminateInf
  */
-@cloneable
 class PriorityQueue[A](implicit val ord: Ordering[A])
    extends AbstractIterable[A]
       with Iterable[A]
@@ -40,6 +39,7 @@ class PriorityQueue[A](implicit val ord: Ordering[A])
       with Growable[A]
       with Builder[A, PriorityQueue[A]]
       with Serializable
+      with scala.Cloneable
 {
   import ord._
 

src/library/scala/collection/mutable/Queue.scala

@@ -30,7 +30,6 @@ import generic._
  *  @define mayNotTerminateInf
  *  @define willNotTerminateInf
  */
-@cloneable
 class Queue[A]
 extends MutableList[A]
    with GenericTraversableTemplate[A, Queue]

src/library/scala/collection/mutable/Stack.scala

@@ -53,7 +53,6 @@ object Stack extends SeqFactory[Stack] {
  *  @define mayNotTerminateInf
  *  @define willNotTerminateInf
  */
-@cloneable
 class Stack[A] private (var elems: List[A])
 extends AbstractSeq[A]
    with Seq[A]