---

yaml
---
r: 21230
b: refs/heads/snap-stage3
c: 62ea688
h: refs/heads/master
v: v3

Author: Daniel Patterson

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: c321cdbac6c4ddd9fedb89e1cc8bce1569347c5a
+refs/heads/snap-stage3: 62ea688e508fdd265eff5207acf2191cc2a715e8
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libcore/option.rs

@@ -93,6 +93,16 @@ pure fn chain_ref<T, U>(opt: &option<T>,
     match *opt { some(ref x) => f(x), none => none }
 }
 
+pure fn or<T>(+opta: option<T>, +optb: option<T>) -> option<T> {
+    /*!
+     * Returns the leftmost some() value, or none if both are none.
+     */
+    match opta {
+        some(_) => opta,
+        _ => optb
+    }
+}
+
 #[inline(always)]
 pure fn while_some<T>(+x: option<T>, blk: fn(+T) -> option<T>) {
     //! Applies a function zero or more times until the result is none.