diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs index 6730c252f52..8b3124b0166 100644 --- a/src/libcore/lib.rs +++ b/src/libcore/lib.rs @@ -38,6 +38,7 @@ pub mod container; /* Core types and methods on primitives */ +mod unit; pub mod any; pub mod finally; pub mod raw; diff --git a/src/libstd/unit.rs b/src/libcore/unit.rs similarity index 90% rename from src/libstd/unit.rs rename to src/libcore/unit.rs index 38307f415ac..f55cb2d2236 100644 --- a/src/libstd/unit.rs +++ b/src/libcore/unit.rs @@ -14,7 +14,6 @@ use default::Default; #[cfg(not(test))] use cmp::{Eq, Equal, Ord, Ordering, TotalEq, TotalOrd}; -use fmt; #[cfg(not(test))] impl Eq for () { @@ -44,9 +43,3 @@ impl Default for () { #[inline] fn default() -> () { () } } - -impl fmt::Show for () { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.pad("()") - } -} diff --git a/src/libstd/fmt/mod.rs b/src/libstd/fmt/mod.rs index 8c999c2e2e3..7623da8734e 100644 --- a/src/libstd/fmt/mod.rs +++ b/src/libstd/fmt/mod.rs @@ -1250,6 +1250,12 @@ impl<'a> Show for &'a any::Any { fn fmt(&self, f: &mut Formatter) -> Result { f.pad("&Any") } } +impl Show for () { + fn fmt(&self, f: &mut Formatter) -> Result { + f.pad("()") + } +} + impl Show for TypeId { fn fmt(&self, f: &mut Formatter) -> Result { write!(f.buf, "TypeId \\{ {} \\}", self.hash()) diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index ef07fc2f995..5e71fc72dc9 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -190,7 +190,6 @@ pub mod prelude; #[path = "num/f32.rs"] pub mod f32; #[path = "num/f64.rs"] pub mod f64; -pub mod unit; pub mod bool; pub mod tuple;