---

erickt · erickt · commit 493f8f628403 · 2013-09-12T18:54:13.000-07:00
yaml --- r: 80734 b: refs/heads/try c: f107718 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -2,7 +2,7 @@
 refs/heads/master: 4c6bf4872012c010f84dc7fa2cdfe87522533f89
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cbd1eefbd350797b783df119fed7956d7e1c74ad
-refs/heads/try: 43aba856b4a8d1b2068f1f5c5017934442d2aedd
+refs/heads/try: f107718a9b09daeedb5c0a3ea9b4ecb044afff44
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
diff --git a/branches/try/src/libstd/option.rs b/branches/try/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/branches/try/src/test/run-pass/deriving-zero.rs b/branches/try/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,

Original file line number	Diff line number	Diff line change
`@@ -483,11 +483,6 @@ impl<T:Zero> Option<T> {`
`483`	`483`	`}`
`484`	`484`	`}`
`485`	`485`
`486`		`-impl<T> Zero for Option<T> {`
`487`		`- fn zero() -> Option<T> { None }`
`488`		`- fn is_zero(&self) -> bool { self.is_none() }`
`489`		`-}`
`490`		`-`
`491`	`486`	`/// An iterator that yields either one or zero elements`
`492`	`487`	`#[deriving(Clone, DeepClone)]`
`493`	`488`	`pub struct OptionIterator<A> {`