---

yaml
---
r: 23543
b: refs/heads/master
c: 5792244
h: refs/heads/master
i:
  23541: c395846
  23539: fa4e05f
  23535: 23898a8
v: v3

Author: pcwalton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 161a82e433fbfbc0bd57a4d951ac37656a8a30f6
+refs/heads/master: 5792244d03149fafdf65fc1bbc05b24323fbfa1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/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;