---

yaml
---
r: 23293
b: refs/heads/master
c: 0e3825d
h: refs/heads/master
i:
  23291: ce1172c
v: v3

Author: bblum

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: a076c287de55bd69328fbf542bf769ca20a12ab4
+refs/heads/master: 0e3825d38cc459f9fcb24f1e95d4f6e867265300
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/libcore/option.rs

@@ -29,6 +29,20 @@ pure fn get<T: copy>(opt: option<T>) -> T {
     }
 }
 
+pure fn get_ref<T>(opt: &option<T>) -> &T {
+    /*!
+     * Gets an immutable reference to the value inside an option.
+     *
+     * # Failure
+     *
+     * Fails if the value equals `none`
+     */
+    match *opt {
+        some(ref x) => x,
+        none => fail ~"option::get_ref none"
+    }
+}
+
 pure fn expect<T: copy>(opt: option<T>, reason: ~str) -> T {
     #[doc = "
     Gets the value out of an option, printing a specified message on failure
@@ -201,6 +215,8 @@ impl<T> &option<T> {
     pure fn iter_ref(f: fn(x: &T)) { iter_ref(self, f) }
     /// Maps a `some` value from one type to another by reference
     pure fn map_ref<U>(f: fn(x: &T) -> U) -> option<U> { map_ref(self, f) }
+    /// Gets an immutable reference to the value inside a `some`.
+    pure fn get_ref() -> &self/T { get_ref(self) }
 }
 
 impl<T: copy> option<T> {