summaryrefslogtreecommitdiff
path: root/src/library
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@epfl.ch>2012-07-10 15:49:19 +0200
committerLukas Rytz <lukas.rytz@epfl.ch>2012-07-11 20:13:54 +0200
commitbbd48868a44a1336db8ff4b02ac78d8c6d497448 (patch)
tree8823d06ec712bfe7c1e1395f8ec77c5a793fc43e /src/library
parente5765db5e9fe6e082f10164ea6d7c7a5325f31a1 (diff)
downloadscala-bbd48868a44a1336db8ff4b02ac78d8c6d497448.tar.gz
scala-bbd48868a44a1336db8ff4b02ac78d8c6d497448.tar.bz2
scala-bbd48868a44a1336db8ff4b02ac78d8c6d497448.zip
Moved cloneable class to package `scala.annotation`.
Requires a new starr.
Diffstat (limited to 'src/library')
-rw-r--r--src/library/scala/cloneable.scala16
-rw-r--r--src/library/scala/package.scala2
2 files changed, 2 insertions, 16 deletions
diff --git a/src/library/scala/cloneable.scala b/src/library/scala/cloneable.scala
deleted file mode 100644
index 32a1ea640d..0000000000
--- a/src/library/scala/cloneable.scala
+++ /dev/null
@@ -1,16 +0,0 @@
-/* __ *\
-** ________ ___ / / ___ Scala API **
-** / __/ __// _ | / / / _ | (c) 2002-2011, LAMP/EPFL **
-** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
-** /____/\___/_/ |_/____/_/ | | **
-** |/ **
-\* */
-
-
-
-package scala
-
-/**
- * An annotation that designates the class to which it is applied as cloneable
- */
-class cloneable extends annotation.StaticAnnotation
diff --git a/src/library/scala/package.scala b/src/library/scala/package.scala
index 5f90c32e22..070ae26862 100644
--- a/src/library/scala/package.scala
+++ b/src/library/scala/package.scala
@@ -37,6 +37,8 @@ package object scala {
@deprecated("instead of `@serializable class C`, use `class C extends Serializable`", "2.9.0")
type serializable = annotation.serializable
+ type cloneable = annotation.cloneable
+
type TraversableOnce[+A] = scala.collection.TraversableOnce[A]
type Traversable[+A] = scala.collection.Traversable[A]