about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-08-10 19:53:06 -0700
committerbors <bors@rust-lang.org>2013-08-10 19:53:06 -0700
commiteebcff1493a98524e72bbf0c79b004fc286d58d7 (patch)
tree637114f8bbc1e06156ee2785eb6e5f3e2df45aed /src
parentbf809768ee8ff3ea4ef434721ff82b09a4df261a (diff)
parentb9945f83c90ad1e28686de483be03cbfc34080be (diff)
downloadrust-eebcff1493a98524e72bbf0c79b004fc286d58d7.tar.gz
rust-eebcff1493a98524e72bbf0c79b004fc286d58d7.zip
auto merge of #8404 : stepancheg/rust/zero-unit-inline, r=alexcrichton
Follow-up to #8155
Diffstat (limited to 'src')
-rw-r--r--src/libstd/nil.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libstd/nil.rs b/src/libstd/nil.rs
index 3507dc9d2b2..d2e9cf9ae7e 100644
--- 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 }
 }