---

yaml
---
r: 30143
b: refs/heads/incoming
c: 5792244
h: refs/heads/master
i:
  30141: ea2321b
  30139: 869b2cd
  30135: 074706c
  30127: 2c29598
  30111: c833aba
  30079: 9d50a83
v: v3

Author: pcwalton

[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: 161a82e433fbfbc0bd57a4d951ac37656a8a30f6
+refs/heads/incoming: 5792244d03149fafdf65fc1bbc05b24323fbfa1a
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/option.rs

@@ -8,6 +8,8 @@
  * type.
  */
 
+use cmp::Eq;
+
 /// The option type
 enum Option<T> {
     None,
@@ -247,6 +249,25 @@ impl<T: copy> Option<T> {
     pure fn while_some(blk: fn(+T) -> Option<T>) { while_some(self, blk) }
 }
 
+impl<T: Eq> Option<T> : Eq {
+    pure fn eq(&&other: Option<T>) -> bool {
+        match self {
+            None => {
+                match other {
+                    None => true,
+                    Some(_) => false
+                }
+            }
+            Some(self_contents) => {
+                match other {
+                    None => false,
+                    Some(other_contents) => self_contents.eq(other_contents)
+                }
+            }
+        }
+    }
+}
+
 #[test]
 fn test_unwrap_ptr() {
     let x = ~0;