auto merge of #8772 : thestinger/rust/option, r=anasazi

Closes #6002 

There is consensus that the current implementation should be changed or
removed, so removing it seems like the right decision for now.

1 files changed, 0 insertions, 13 deletions

diff --git a/src/libstd/option.rs b/src/libstd/option.rs
index 34c47d9f61e..f99a595f2eb 100644
--- a/src/libstd/option.rs
+++ b/src/libstd/option.rs
@@ -43,7 +43,6 @@ let unwrapped_msg = match msg {
 
 use clone::Clone;
 use cmp::{Eq,Ord};
-use ops::Add;
 use util;
 use num::Zero;
 use iterator;
@@ -77,18 +76,6 @@ impl<T: Eq + Ord> Ord for Option<T> {
     }
 }
 
-impl<T: Add<T, T>> Add<Option<T>, Option<T>> for Option<T> {
-    #[inline]
-    fn add(&self, other: &Option<T>) -> Option<T> {
-        match (&*self, &*other) {
-            (&None, &None) => None,
-            (_, &None) => None,
-            (&None, _) => None,
-            (&Some(ref lhs), &Some(ref rhs)) => Some(*lhs + *rhs)
-        }
-    }
-}
-
 // FIXME: #8242 implementing manually because deriving doesn't work for some reason
 impl<T: ToStr> ToStr for Option<T> {
     fn to_str(&self) -> ~str {