---

yaml
---
r: 29938
b: refs/heads/incoming
c: 62ea688
h: refs/heads/master
v: v3

Author: Daniel Patterson

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: c321cdbac6c4ddd9fedb89e1cc8bce1569347c5a
+refs/heads/incoming: 62ea688e508fdd265eff5207acf2191cc2a715e8
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/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.