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.

3 files changed, 3 insertions, 18 deletions

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/_$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
index fab43b48a7..8d423c10bc 100755
--- a/src/library/scala/UncheckedStable.scala
+++ b/src/library/scala/uncheckedStable.scala
@@ -7,6 +7,7 @@
 \*                                                                      */
 package scala
 
-/** A marker class for types that are assumed to be stable
+/** An annotation for values that are assumed to be stable even though their
+ *  types are volatile.
  */
-abstract final class UncheckedStable {}
+final class uncheckedStable extends StaticAnnotation {}