summaryrefslogtreecommitdiff
path: root/src/library/scala/Option.scala
diff options
context:
space:
mode:
Diffstat (limited to 'src/library/scala/Option.scala')
-rw-r--r--src/library/scala/Option.scala5
1 files changed, 0 insertions, 5 deletions
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