---

yaml
---
r: 67514
b: refs/heads/master
c: 9824d90
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 5c6069c7a90761c120cecbd8e18317bce21dd213
+refs/heads/master: 9824d90ffd7684eca7171c4e019fd85b9317904e
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 18e3db7392d2d0697b7e27d6d986139960144d85
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9

trunk/src/libstd/nil.rs

@@ -16,6 +16,10 @@ Functions for the unit type.
 
 #[cfg(not(test))]
 use prelude::*;
+#[cfg(not(test))]
+use num::Zero;
+
+
 
 #[cfg(not(test))]
 impl Eq for () {
@@ -48,3 +52,10 @@ impl TotalEq for () {
     #[inline]
     fn equals(&self, _other: &()) -> bool { true }
 }
+
+#[cfg(not(test))]
+impl Zero for () {
+    fn zero() -> () { () }
+    fn is_zero(&self) -> bool { true }
+}
+

trunk/src/test/run-pass/deriving-zero.rs

@@ -34,6 +34,7 @@ struct Lots {
     h: ~[util::NonCopyable],
     i: @mut (int, int),
     j: bool,
+    k: (),
 }
 
 fn main() {