Some @experimental cleanups/removals I missed o...

Some @experimental cleanups/removals I missed on the last pass.

10 files changed, 3 insertions, 17 deletions

diff --git a/src/compiler/scala/tools/nsc/io/Process.scala b/src/compiler/scala/tools/nsc/io/Process.scala
index 5b22028741..7b10672699 100644
--- a/src/compiler/scala/tools/nsc/io/Process.scala
+++ b/src/compiler/scala/tools/nsc/io/Process.scala
@@ -5,7 +5,6 @@
 package scala.tools.nsc
 package io
 
-import annotation.experimental
 import concurrent.ThreadRunner
 import scala.util.Properties.{ isWin, isMac }
 import scala.util.control.Exception.catching
diff --git a/src/compiler/scala/tools/nsc/symtab/Definitions.scala b/src/compiler/scala/tools/nsc/symtab/Definitions.scala
index 97df429445..365bff38e6 100644
--- a/src/compiler/scala/tools/nsc/symtab/Definitions.scala
+++ b/src/compiler/scala/tools/nsc/symtab/Definitions.scala
@@ -96,7 +96,6 @@ trait Definitions {
     lazy val UncheckedClass             = getClass("scala.unchecked")
     lazy val TailrecClass               = getClass("scala.annotation.tailrec")
     lazy val SwitchClass                = getClass("scala.annotation.switch")
-    lazy val ExperimentalClass          = getClass("scala.annotation.experimental")
     lazy val ElidableMethodClass        = getClass("scala.annotation.elidable")
     lazy val FieldClass                 = getClass("scala.annotation.target.field")
     lazy val GetterClass                = getClass("scala.annotation.target.getter")
diff --git a/src/library/scala/Function.scala b/src/library/scala/Function.scala
index 4d4d21c1c6..e333959550 100644
--- a/src/library/scala/Function.scala
+++ b/src/library/scala/Function.scala
@@ -11,8 +11,6 @@
 
 package scala
 
-import annotation.experimental
-
 /** A module defining utility methods for higher-order functional programming.
  *
  *  @author  Martin Odersky
diff --git a/src/library/scala/Option.scala b/src/library/scala/Option.scala
index feacfd6acd..6f9ba306ad 100644
--- a/src/library/scala/Option.scala
+++ b/src/library/scala/Option.scala
@@ -11,8 +11,6 @@
 
 package scala
 
-import annotation.experimental
-
 object Option
 {
   /** An implicit conversion that converts an option to an iterable value
@@ -25,7 +23,6 @@ object Option
    *  @param  x the value
    *  @return   Some(value) if value != null, None if value == null
    */
-  @experimental
   def apply[A](x: A): Option[A] = if (x == null) None else Some(x)
 }
 
@@ -71,7 +68,6 @@ sealed abstract class Option[+A] extends Product {
    *  The use of null of course is discouraged, but code written to use Options
    *  often must interface with code which expects and returns nulls.
    */
-  @experimental
   def orNull[A1 >: A](implicit ev: Null <:< A1): A1 = this getOrElse null
 
   /** If the option is nonempty, return a function applied to its value,
@@ -120,7 +116,6 @@ sealed abstract class Option[+A] extends Product {
    *
    *  @param  pf   the partial function.
    */
-  @experimental
   def partialMap[B](pf: PartialFunction[Any, B]): Option[B] =
     if (!isEmpty && pf.isDefinedAt(this.get)) Some(pf(this.get)) else None
 
diff --git a/src/library/scala/PartialFunction.scala b/src/library/scala/PartialFunction.scala
index 0801917aed..0ba7527976 100644
--- a/src/library/scala/PartialFunction.scala
+++ b/src/library/scala/PartialFunction.scala
@@ -11,8 +11,6 @@
 
 package scala
 
-import annotation.experimental
-
 /** A partial function of type <code>PartialFunction[A, B]</code> is a
  *  unary function where the domain does not include all values of type
  *  <code>A</code>. The function <code>isDefinedAt</code> allows to
diff --git a/src/library/scala/UninitializedFieldError.scala b/src/library/scala/UninitializedFieldError.scala
index 97e5815b06..730b6d32d5 100644
--- a/src/library/scala/UninitializedFieldError.scala
+++ b/src/library/scala/UninitializedFieldError.scala
@@ -17,8 +17,8 @@ package scala
  *  Such runtime checks are not emitted by default. See the
  *  compiler documentation for knowing how to turn them on.
  *
- *  Note: This check requires the new initialization order,
- *    planned for 2.8.0 and available under -Xexperimental.
+ *  Note: This check requires the initialization order
+ *  first implemented in scala 2.8.
  *
  *  @since 2.7
  */
diff --git a/src/library/scala/collection/Iterator.scala b/src/library/scala/collection/Iterator.scala
index 6617216e65..22b8328b1e 100644
--- a/src/library/scala/collection/Iterator.scala
+++ b/src/library/scala/collection/Iterator.scala
@@ -13,7 +13,7 @@ package scala.collection
 
 import mutable.{Buffer, ArrayBuffer, ListBuffer, StringBuilder}
 import immutable.{List, Stream}
-import annotation.{ tailrec, experimental }
+import annotation.{ tailrec }
 // import immutable.{List, Nil, ::, Stream}
 
 /** The <code>Iterator</code> object provides various functions for
diff --git a/src/library/scala/collection/SeqLike.scala b/src/library/scala/collection/SeqLike.scala
index cf88c134f6..708764e958 100644
--- a/src/library/scala/collection/SeqLike.scala
+++ b/src/library/scala/collection/SeqLike.scala
@@ -13,7 +13,6 @@ package scala.collection
 import generic._
 import mutable.{ListBuffer, HashMap, GenericArray}
 import immutable.{List, Range}
-import annotation.experimental
 
 // import immutable.{List, Nil, ::}
 import generic._
diff --git a/src/library/scala/collection/TraversableLike.scala b/src/library/scala/collection/TraversableLike.scala
index 4fdaa6fee2..a0e330831f 100644
--- a/src/library/scala/collection/TraversableLike.scala
+++ b/src/library/scala/collection/TraversableLike.scala
@@ -15,7 +15,6 @@ import generic._
 import scala.reflect.ClassManifest
 import mutable.{Builder, StringBuilder, Buffer, ArrayBuffer, ListBuffer}
 import immutable.{List, Stream, Nil, ::}
-import annotation.experimental
 
 /** <p>
  *    A template trait for traversable collections.
diff --git a/src/library/scala/collection/immutable/NumericRange.scala b/src/library/scala/collection/immutable/NumericRange.scala
index 9d47cc13c1..9c70ba3ca6 100644
--- a/src/library/scala/collection/immutable/NumericRange.scala
+++ b/src/library/scala/collection/immutable/NumericRange.scala
@@ -11,7 +11,6 @@
 package scala.collection
 package immutable
 
-import annotation.experimental
 import mutable.{ Builder, ListBuffer }
 import generic._