---

yaml
---
r: 12231
b: refs/heads/master
c: f65ea0c
h: refs/heads/master
i:
  12229: 2e90bb4
  12227: a44297d
  12223: 09bdeb9
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 392d3c8d444721b726c3e593651737b989a8df02
+refs/heads/master: f65ea0c8123d02c61f3a15188470711d49fa2b6d
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/libcore/core.rs

@@ -7,6 +7,7 @@ import option = option::option;
 import path = path::path;
 import vec::vec_len;
 import str::extensions;
+import option::extensions;
 export path, option, some, none, vec_len, unreachable;
 export extensions;
 

trunk/src/libcore/option.rs

@@ -87,6 +87,34 @@ fn unwrap<T>(-opt: option<T>) -> T unsafe {
     ret liberated_value;
 }
 
+impl extensions<T:copy> for option<T> {
+    #[doc = "
+    Update an optional value by optionally running its content through a
+    function that returns an option.
+    "]
+    fn chain<U>(f: fn(T) -> option<U>) -> option<U> { chain(self, f) }
+    #[doc = "Returns the contained value or a default"]
+    fn from_maybe(def: T) -> T { from_maybe(self, def) }
+    #[doc = "Applies a function to the contained value or returns a default"]
+    fn maybe<U: copy>(def: U, f: fn(T) -> U) -> U { maybe(self, def, f) }
+    #[doc = "Performs an operation on the contained value or does nothing"]
+    fn may(f: fn(T)) { may(self, f) }
+    #[doc = "
+    Gets the value out of an option
+
+    # Failure
+
+    Fails if the value equals `none`
+    "]
+    fn get() -> T { get(self) }
+    #[doc = "Returns true if the option equals `none`"]
+    fn is_none() -> bool { is_none(self) }
+    #[doc = "Returns true if the option contains some value"]
+    fn is_some() -> bool { is_some(self) }
+    #[doc = "Maps a `some` value from one type to another"]
+    fn map<U:copy>(f: fn(T) -> U) -> option<U> { map(self, f) }
+}
+
 #[test]
 fn test_unwrap_ptr() {
     let x = ~0;