From 7369338a6e9cbd43e547e4c4cb2123c34b60f6c6 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Sat, 6 Sep 2008 11:41:37 +0000 Subject: One more attempt to be sound and at the same ti... One more attempt to be sound and at the same time let the plugin build go through. --- src/library/scala/Predef.scala | 3 --- src/library/scala/UncheckedStable.scala | 12 ------------ src/library/scala/_$Stable.scala | 13 ------------- src/library/scala/uncheckedStable.scala | 13 +++++++++++++ 4 files changed, 13 insertions(+), 28 deletions(-) delete mode 100755 src/library/scala/UncheckedStable.scala delete mode 100644 src/library/scala/_$Stable.scala create mode 100755 src/library/scala/uncheckedStable.scala (limited to 'src/library') diff --git a/src/library/scala/Predef.scala b/src/library/scala/Predef.scala index ce3b05771c..f1bff1f990 100644 --- a/src/library/scala/Predef.scala +++ b/src/library/scala/Predef.scala @@ -114,9 +114,6 @@ object Predef { // tupling ------------------------------------------------------------ - def uncheckedStable[A](x: A): A with UncheckedStable = - x.asInstanceOf[A with UncheckedStable] - type Pair[+A, +B] = Tuple2[A, B] object Pair { def apply[A, B](x: A, y: B) = Tuple2(x, y) diff --git a/src/library/scala/UncheckedStable.scala b/src/library/scala/UncheckedStable.scala deleted file mode 100755 index fab43b48a7..0000000000 --- a/src/library/scala/UncheckedStable.scala +++ /dev/null @@ -1,12 +0,0 @@ -/* __ *\ -** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002-2007, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** -** /____/\___/_/ |_/____/_/ | | ** -** |/ ** -\* */ -package scala - -/** A marker class for types that are assumed to be stable - */ -abstract final class UncheckedStable {} diff --git a/src/library/scala/_$Stable.scala b/src/library/scala/_$Stable.scala deleted file mode 100644 index d98cbaec7b..0000000000 --- a/src/library/scala/_$Stable.scala +++ /dev/null @@ -1,13 +0,0 @@ -/* __ *\ -** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002-2007, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** -** /____/\___/_/ |_/____/_/ | | ** -** |/ ** -\* */ -package scala - -/** A marker thread for types that are assumed to be stable - * todo: internalize in Definitions - */ -trait _$Stable {} diff --git a/src/library/scala/uncheckedStable.scala b/src/library/scala/uncheckedStable.scala new file mode 100755 index 0000000000..8d423c10bc --- /dev/null +++ b/src/library/scala/uncheckedStable.scala @@ -0,0 +1,13 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2002-2007, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ +package scala + +/** An annotation for values that are assumed to be stable even though their + * types are volatile. + */ +final class uncheckedStable extends StaticAnnotation {} -- cgit v1.2.3