diff options
| -rw-r--r-- | src/libstd/option.rs | 5 | ||||
| -rw-r--r-- | src/test/run-pass/deriving-zero.rs | 1 |
2 files changed, 0 insertions, 6 deletions
diff --git a/src/libstd/option.rs b/src/libstd/option.rs index dd5b71c6dd4..968330a18a8 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 9d92e2400ef..fb4ffb2c3c1 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, |