summaryrefslogtreecommitdiff
path: root/src/library/scala/package.scala
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2010-12-02 05:53:25 +0000
committerMartin Odersky <odersky@gmail.com>2010-12-02 05:53:25 +0000
commitd7de71e9d31dae56b5afc62e3777fa03112ee1e1 (patch)
tree9f73d08e117755a5cb8e822858cde3de9961a3ed /src/library/scala/package.scala
parentb9a25c8acf843c015b2313f9ca66b1b264672d34 (diff)
downloadscala-d7de71e9d31dae56b5afc62e3777fa03112ee1e1.tar.gz
scala-d7de71e9d31dae56b5afc62e3777fa03112ee1e1.tar.bz2
scala-d7de71e9d31dae56b5afc62e3777fa03112ee1e1.zip
delayed init now supported
Diffstat (limited to 'src/library/scala/package.scala')
-rw-r--r--src/library/scala/package.scala23
1 files changed, 23 insertions, 0 deletions
diff --git a/src/library/scala/package.scala b/src/library/scala/package.scala
index 86efe7c379..a6b974b4d3 100644
--- a/src/library/scala/package.scala
+++ b/src/library/scala/package.scala
@@ -102,6 +102,23 @@ package object scala {
type PartialOrdering[T] = scala.math.PartialOrdering[T]
type PartiallyOrdered[T] = scala.math.PartiallyOrdered[T]
+ // Annotations which we might move to annotation.*
+/*
+ type SerialVersionUID = annotation.SerialVersionUID
+ type cloneable = annotation.cloneable
+ type deprecated = annotation.deprecated
+ type deprecatedName = annotation.deprecatedName
+ type inline = annotation.inline
+ type native = annotation.native
+ type noinline = noannotation.inline
+ type remote = annotation.remote
+ type serializable = annotation.serializable
+ type specialized = annotation.specialized
+ type transient = annotation.transient
+ type throws = annotation.throws
+ type unchecked = annotation.unchecked.unchecked
+ type volatile = annotation.volatile
+ */
@deprecated("Use Tuple1(x) to create a 1-tuple.")
def Tuple[A1](x1: A1) = Tuple1(x1)
@deprecated("Use ((x1, x2, ...)) syntax to create Tuples")
@@ -160,4 +177,10 @@ package object scala {
@deprecated("use IndexedSeq instead") type RandomAccessSeq[+A] = scala.collection.IndexedSeq[A]
@deprecated("use IndexedSeq instead") val RandomAccessSeq = scala.collection.IndexedSeq
+/* the following classes should be moved to annotation and the aliases should be enabled
+ @deprecated("use annotation.Annotation instead") type Annotation = annotation.Annotation
+ @deprecated("use annotation.ClassfileAnnotation instead") type ClassfileAnnotation = annotation.Annotation
+ @deprecated("use annotation.StaticAnnotation instead") type StaticAnnotation = annotation.Annotation
+ @deprecated("use annotation.TypeConstraint instead") type TypeConstraint = annotation.TypeConstraint
+*/
}