auto merge of #8404 : stepancheg/rust/zero-unit-inline, r=alexcrichton

Follow-up to #8155
2013-08-10 19:53:06 -07:00 · 2013-08-10 19:53:06 -07:00 · eebcff1493
commit eebcff1493
parent bf809768ee b9945f83c9
1 changed files with 2 additions and 0 deletions
--- a/src/libstd/nil.rs
+++ b/src/libstd/nil.rs
@ -49,7 +49,9 @@ impl TotalEq for () {

 #[cfg(not(test))]
 impl Zero for () {
+    #[inline]
    fn zero() -> () { () }
+    #[inline]
    fn is_zero(&self) -> bool { true }
 }