From f107718a9b09daeedb5c0a3ea9b4ecb044afff44 Mon Sep 17 00:00:00 2001
From: Erick Tryzelaar <erick.tryzelaar@gmail.com>
Date: Wed, 11 Sep 2013 22:19:19 -0700
Subject: [PATCH] std: Remove Zero impl for Option

Options are not numeric types, so it doesn't make sense for them to
implement Zero.
---
 src/libstd/option.rs               | 5 -----
 src/test/run-pass/deriving-zero.rs | 1 -
 2 files changed, 6 deletions(-)

diff --git a/src/libstd/option.rs b/src/libstd/option.rs
index dd5b71c6dd48..968330a18a85 100644
--- a/src/libstd/option.rs
+++ b/src/libstd/option.rs
@@ -483,11 +483,6 @@ impl<T:Zero> Option<T> {
     }
 }
 
-impl<T> Zero for Option<T> {
-    fn zero() -> Option<T> { None }
-    fn is_zero(&self) -> bool { self.is_none() }
-}
-
 /// An iterator that yields either one or zero elements
 #[deriving(Clone, DeepClone)]
 pub struct OptionIterator<A> {
diff --git a/src/test/run-pass/deriving-zero.rs b/src/test/run-pass/deriving-zero.rs
index 9d92e2400ef4..fb4ffb2c3c15 100644
--- a/src/test/run-pass/deriving-zero.rs
+++ b/src/test/run-pass/deriving-zero.rs
@@ -24,7 +24,6 @@ struct E { a: int, b: int }
 
 #[deriving(Zero)]
 struct Lots {
-    c: Option<util::NonCopyable>,
     d: u8,
     e: char,
     f: float,